fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-06-02 18:52 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/src/pp/pplib.c
  * harbour/src/vm/estack.c
  * harbour/src/common/hbver.c
  * harbour/src/common/hbdate.c
  * harbour/src/rtl/gtcrs/gtcrs.c
  * harbour/src/rtl/hbgtcore.c
  * harbour/src/rdd/wafunc.c
  * harbour/src/compiler/hbmain.c
  * harbour/src/compiler/cmdcheck.c
  * harbour/src/compiler/genhrb.c
  * harbour/src/compiler/genobj32.c
  * harbour/src/compiler/hbusage.c
  * harbour/src/compiler/hbgenerr.c
  * harbour/contrib/hbct/ctnet.c
  * harbour/contrib/xhb/datesxhb.c
  * harbour/contrib/hbfbird/firebird.c
  * harbour/contrib/hbpgsql/postgres.c
  * harbour/contrib/rddads/adsfunc.c
  * harbour/contrib/rddads/ads1.c
  * harbour/contrib/hbtip/utils.c
    * formatting
This commit is contained in:
Przemyslaw Czerpak
2010-06-02 16:53:20 +00:00
parent 1e1fdcc70d
commit 324e27ef99
21 changed files with 96 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
harbour/ChangeLog
View File

@@ -17,6 +17,29 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-06-02 18:52 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/src/pp/pplib.c
* harbour/src/vm/estack.c
* harbour/src/common/hbver.c
* harbour/src/common/hbdate.c
* harbour/src/rtl/gtcrs/gtcrs.c
* harbour/src/rtl/hbgtcore.c
* harbour/src/rdd/wafunc.c
* harbour/src/compiler/hbmain.c
* harbour/src/compiler/cmdcheck.c
* harbour/src/compiler/genhrb.c
* harbour/src/compiler/genobj32.c
* harbour/src/compiler/hbusage.c
* harbour/src/compiler/hbgenerr.c
* harbour/contrib/hbct/ctnet.c
* harbour/contrib/xhb/datesxhb.c
* harbour/contrib/hbfbird/firebird.c
* harbour/contrib/hbpgsql/postgres.c
* harbour/contrib/rddads/adsfunc.c
* harbour/contrib/rddads/ads1.c
* harbour/contrib/hbtip/utils.c
* formatting
2010-06-02 17:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
% Using precompiled regexp.

2
harbour/contrib/hbct/ctnet.c
View File

@@ -193,7 +193,7 @@ HB_FUNC( NETREDIR )
char szFunction[ 128 ];
hb_snprintf( szFunction, sizeof( szFunction ), "NETREDIR( \"%s\", \"%s\", \"%s\" )",
hb_parcx( 1 ), hb_parcx( 2 ), hb_parcx( 3 ) );
hb_parcx( 1 ), hb_parcx( 2 ), hb_parcx( 3 ) );
pError = hb_errRT_New( ES_ERROR,
"CT",

28
harbour/contrib/hbfbird/firebird.c
View File

@@ -137,8 +137,8 @@ HB_FUNC( FBCREATEDB )
unsigned short dialect = ( unsigned short ) hb_parni( 6 );
hb_snprintf( create_db, sizeof( create_db ),
"CREATE DATABASE '%s' USER '%s' PASSWORD '%s' PAGE_SIZE = %i DEFAULT CHARACTER SET %s",
db_name, user, pass, page, charset );
"CREATE DATABASE '%s' USER '%s' PASSWORD '%s' PAGE_SIZE = %i DEFAULT CHARACTER SET %s",
db_name, user, pass, page, charset );
if( isc_dsql_execute_immediate( status, &newdb, &trans, 0, create_db, dialect, NULL ) )
hb_retnl( isc_sqlcode( status ) );
@@ -651,22 +651,22 @@ HB_FUNC( FBGETDATA )
if( value >= 0 )
hb_snprintf( data, sizeof( data ), "%*" ISC_INT64_FORMAT "d.%0*" ISC_INT64_FORMAT "d",
field_width - 1 + dscale,
( ISC_INT64 ) value / tens,
-dscale,
( ISC_INT64 ) value % tens );
field_width - 1 + dscale,
( ISC_INT64 ) value / tens,
-dscale,
( ISC_INT64 ) value % tens );
else if( ( value / tens ) != 0 )
hb_snprintf( data, sizeof( data ), "%*" ISC_INT64_FORMAT "d.%0*" ISC_INT64_FORMAT "d",
field_width - 1 + dscale,
( ISC_INT64 ) ( value / tens ),
-dscale,
( ISC_INT64 ) -( value % tens ) );
field_width - 1 + dscale,
( ISC_INT64 ) ( value / tens ),
-dscale,
( ISC_INT64 ) -( value % tens ) );
else
hb_snprintf( data, sizeof( data ), "%*s.%0*" ISC_INT64_FORMAT "d",
field_width - 1 + dscale,
"-0",
-dscale,
( ISC_INT64 ) -( value % tens ) );
field_width - 1 + dscale,
"-0",
-dscale,
( ISC_INT64 ) -( value % tens ) );
}
else if( dscale )
hb_snprintf( data, sizeof( data ), "%*" ISC_INT64_FORMAT "d%0*d", field_width, ( ISC_INT64 ) value, dscale, 0 );

13
harbour/contrib/hbpgsql/postgres.c
View File

@@ -275,12 +275,13 @@ HB_FUNC( PQCONNECT )
{
char conninfo[ 512 ];
hb_snprintf( conninfo, sizeof( conninfo ), "dbname = %s host = %s user = %s password = %s port = %i",
hb_parcx( 1 ),
hb_parcx( 2 ),
hb_parcx( 3 ),
hb_parcx( 4 ),
hb_parni( 5 ) );
hb_snprintf( conninfo, sizeof( conninfo ),
"dbname = %s host = %s user = %s password = %s port = %i",
hb_parcx( 1 ),
hb_parcx( 2 ),
hb_parcx( 3 ),
hb_parcx( 4 ),
hb_parni( 5 ) );
hb_PGconn_ret( PQconnectdb( conninfo ) );
}

9
harbour/contrib/hbtip/utils.c
View File

@@ -103,10 +103,11 @@ HB_FUNC( TIP_TIMESTAMP )
}
hb_snprintf( szRet, sizeof( szRet ), "%s, %d %s %d %02d:%02d:%02d %+03d%02d",
s_days[ hb_dateDOW( iYear, iMonth, iDay ) - 1 ], iDay, s_months[ iMonth - 1 ],
iYear, iHour, iMinute, iSecond,
( int ) lOffset / 3600,
( int ) ( lOffset % 3600 ) / 60 );
s_days[ hb_dateDOW( iYear, iMonth, iDay ) - 1 ],
iDay, s_months[ iMonth - 1 ], iYear,
iHour, iMinute, iSecond,
( int ) ( lOffset / 3600 ),
( int ) ( ( lOffset % 3600 ) / 60 ) );
hb_retc( szRet );
}

14
harbour/contrib/rddads/ads1.c
View File

@@ -2971,16 +2971,16 @@ static HB_ERRCODE adsCreate( ADSAREAP pArea, LPDBOPENINFO pCreateInfo )
case HB_FT_MEMO:
case HB_FT_VARLENGTH:
uiFldLen = hb_snprintf( ( char * ) ucBuffer, MAX_STR_LEN, "%.*s,%s,%d;",
( int ) pArea->area.uiMaxFieldNameLength,
hb_dynsymName( ( PHB_DYNS ) pField->sym ),
cType, pField->uiLen );
( int ) pArea->area.uiMaxFieldNameLength,
hb_dynsymName( ( PHB_DYNS ) pField->sym ),
cType, pField->uiLen );
break;
default:
uiFldLen = hb_snprintf( ( char * ) ucBuffer, MAX_STR_LEN, "%.*s,%s,%d,%d;",
( int ) pArea->area.uiMaxFieldNameLength,
hb_dynsymName( ( PHB_DYNS ) pField->sym ),
cType, pField->uiLen, pField->uiDec );
( int ) pArea->area.uiMaxFieldNameLength,
hb_dynsymName( ( PHB_DYNS ) pField->sym ),
cType, pField->uiLen, pField->uiDec );
break;
}
@@ -3168,7 +3168,7 @@ static HB_ERRCODE adsInfo( ADSAREAP pArea, HB_USHORT uiIndex, PHB_ITEM pItem )
AdsGetVersion( &ulMajor, &ulMinor, &ucLetter, ucDesc, &usDescLen);
hb_snprintf( ( char * ) ucVersion, sizeof( ucVersion ), "%s, v%lu.%lu%c",
( char * ) ucDesc, ( HB_ULONG ) ulMajor, ( HB_ULONG ) ulMinor, ucLetter );
( char * ) ucDesc, ( HB_ULONG ) ulMajor, ( HB_ULONG ) ulMinor, ucLetter );
hb_itemPutC( pItem, ( char * ) ucVersion );
break;
}

4
harbour/contrib/rddads/adsfunc.c
View File

@@ -1584,11 +1584,11 @@ HB_FUNC( ADSVERSION )
{
case 0:
hb_snprintf( ucVersion, sizeof( ucVersion ), "%lu.%lu%c",
( HB_ULONG ) ulMajor, ( HB_ULONG ) ulMinor, ucLetter );
( HB_ULONG ) ulMajor, ( HB_ULONG ) ulMinor, ucLetter );
break;
case 3:
hb_snprintf( ucVersion, sizeof( ucVersion ), "%s, v%lu.%lu%c",
( char * ) ucDesc, ( HB_ULONG ) ulMajor, ( HB_ULONG ) ulMinor, ucLetter );
( char * ) ucDesc, ( HB_ULONG ) ulMajor, ( HB_ULONG ) ulMinor, ucLetter );
break;
default:
ucVersion[ 0 ] = '\0';

2
harbour/contrib/xhb/datesxhb.c
View File

@@ -97,7 +97,7 @@ HB_FUNC( TIMEOFDAY )
int iSeconds = hb_parni(1);
iSeconds %= 3600*24;
hb_snprintf( szResult, sizeof( szResult ), "%02d:%02d:%02d",
iSeconds/3600 , (iSeconds % 3600)/60, iSeconds % 60 );
iSeconds/3600 , (iSeconds % 3600)/60, iSeconds % 60 );
}
hb_retclen( szResult, 8 );
}

2
harbour/src/common/hbdate.c
View File

@@ -681,7 +681,7 @@ char * hb_timeStampStr( char * szDateTime, long lJulian, long lMilliSec )
hb_dateDecode( lJulian, &iYear, &iMonth, &iDay );
hb_timeDecode( lMilliSec, &iHour, &iMinutes, &iSeconds, &iMSec );
hb_snprintf( szDateTime, 24, "%04d-%02d-%02d %02d:%02d:%02d.%03d",
iYear, iMonth, iDay, iHour, iMinutes, iSeconds, iMSec );
iYear, iMonth, iDay, iHour, iMinutes, iSeconds, iMSec );
szDateTime[ 23 ] = '\0';
return szDateTime;

22
harbour/src/common/hbver.c
View File

@@ -246,12 +246,12 @@ char * hb_verPlatform( void )
if( aulQSV[ QSV_VERSION_MINOR - 1 ] < 30 )
{
hb_snprintf( pszPlatform, PLATFORM_BUF_SIZE + 1, "OS/2 %ld.%02ld",
aulQSV[ QSV_VERSION_MAJOR - 1 ] / 10,
aulQSV[ QSV_VERSION_MINOR - 1 ] );
aulQSV[ QSV_VERSION_MAJOR - 1 ] / 10,
aulQSV[ QSV_VERSION_MINOR - 1 ] );
}
else
hb_snprintf( pszPlatform, PLATFORM_BUF_SIZE + 1, "OS/2 %2.2f",
( float ) aulQSV[ QSV_VERSION_MINOR - 1 ] / 10 );
( float ) aulQSV[ QSV_VERSION_MINOR - 1 ] / 10 );
}
else
hb_snprintf( pszPlatform, PLATFORM_BUF_SIZE + 1, "OS/2" );
@@ -374,11 +374,11 @@ char * hb_verPlatform( void )
}
hb_snprintf( pszPlatform, PLATFORM_BUF_SIZE + 1, "Windows%s%s %lu.%lu.%04u",
pszName,
pszWine,
osVer.dwMajorVersion,
osVer.dwMinorVersion,
LOWORD( osVer.dwBuildNumber ) );
pszName,
pszWine,
osVer.dwMajorVersion,
osVer.dwMinorVersion,
LOWORD( osVer.dwBuildNumber ) );
/* Add service pack/other info */
@@ -857,8 +857,8 @@ char * hb_verHarbour( void )
pszVersion = ( char * ) hb_xgrab( 80 );
hb_snprintf( pszVersion, 80, "Harbour %d.%d.%d%s (Rev. %d)",
HB_VER_MAJOR, HB_VER_MINOR, HB_VER_RELEASE, HB_VER_STATUS,
hb_verSvnID() );
HB_VER_MAJOR, HB_VER_MINOR, HB_VER_RELEASE, HB_VER_STATUS,
hb_verSvnID() );
return pszVersion;
}
@@ -871,7 +871,7 @@ char * hb_verPCode( void )
pszPCode = ( char * ) hb_xgrab( 24 );
hb_snprintf( pszPCode, 24, "PCode version: %d.%d",
HB_PCODE_VER >> 8, HB_PCODE_VER & 0xFF );
HB_PCODE_VER >> 8, HB_PCODE_VER & 0xFF );
return pszPCode;
}

6
harbour/src/compiler/cmdcheck.c
View File

@@ -105,7 +105,7 @@ static void hb_notSupportedInfo( HB_COMP_DECL, const char *szSwitch )
char buffer[ 512 ];
hb_snprintf( buffer, sizeof( buffer ),
"Not yet supported command line option: %s\n", szSwitch );
"Not yet supported command line option: %s\n", szSwitch );
hb_compOutStd( HB_COMP_PARAM, buffer );
}
@@ -667,8 +667,8 @@ static void hb_compChkEnvironVar( HB_COMP_DECL, const char *szSwitch )
else
{
hb_snprintf( HB_COMP_PARAM->szPrefix,
sizeof( HB_COMP_PARAM->szPrefix ),
"%08lX_", PackDateTime() );
sizeof( HB_COMP_PARAM->szPrefix ),
"%08lX_", PackDateTime() );
}
break;
}

2
harbour/src/compiler/genhrb.c
View File

@@ -159,7 +159,7 @@ void hb_compGenPortObj( HB_COMP_DECL, PHB_FNAME pFileName )
{
char buffer[ 80 + HB_PATH_MAX - 1 ];
hb_snprintf( buffer, sizeof( buffer ),
"Generating Harbour Portable Object output to \'%s\'... ", szFileName );
"Generating Harbour Portable Object output to \'%s\'... ", szFileName );
hb_compOutStd( HB_COMP_PARAM, buffer );
}

2
harbour/src/compiler/genobj32.c
View File

@@ -632,7 +632,7 @@ void hb_compGenObj32( HB_COMP_DECL, PHB_FNAME pFileName )
{
char buffer[ 80 + HB_PATH_MAX - 1 ];
hb_snprintf( buffer, sizeof( buffer ),
"Generating Windows/DOS OBJ32 output to \'%s\'... ", szFileName );
"Generating Windows/DOS OBJ32 output to \'%s\'... ", szFileName );
hb_compOutStd( HB_COMP_PARAM, buffer );
}

4
harbour/src/compiler/hbgenerr.c
View File

@@ -161,10 +161,10 @@ static void hb_compDispMessage( HB_COMP_DECL, char cPrefix, int iValue,
HB_COMP_PARAM->currModule, HB_COMP_PARAM->currLine );
else if( HB_COMP_PARAM->currLine )
hb_snprintf( buffer, sizeof( buffer ), "\n%s:%i: ",
HB_COMP_PARAM->currModule, HB_COMP_PARAM->currLine );
HB_COMP_PARAM->currModule, HB_COMP_PARAM->currLine );
else
hb_snprintf( buffer, sizeof( buffer ), "\n%s:%s ",
HB_COMP_PARAM->currModule, szPar2 );
HB_COMP_PARAM->currModule, szPar2 );
hb_compOutErr( HB_COMP_PARAM, buffer );
}

12
harbour/src/compiler/hbmain.c
View File

@@ -204,7 +204,7 @@ static int hb_compReadClpFile( HB_COMP_DECL, const char * szClpFile )
{
/* TODO: Clipper compatible error */
hb_snprintf( buffer, sizeof( buffer ),
"Cannot open input file: %s\n", szClpFile );
"Cannot open input file: %s\n", szClpFile );
hb_compOutErr( HB_COMP_PARAM, buffer );
iStatus = EXIT_FAILURE;
}
@@ -439,8 +439,8 @@ void hb_compVariableAdd( HB_COMP_DECL, const char * szVarName, PHB_VARTYPE pVarT
{
char buffer[ 80 ];
hb_snprintf( buffer, sizeof( buffer ),
"Wrong type of codeblock parameter, is: %d, should be: %d\n",
HB_COMP_PARAM->iVarScope, VS_PARAMETER );
"Wrong type of codeblock parameter, is: %d, should be: %d\n",
HB_COMP_PARAM->iVarScope, VS_PARAMETER );
hb_compOutErr( HB_COMP_PARAM, buffer );
/* variable defined in a codeblock */
HB_COMP_PARAM->iVarScope = VS_PARAMETER;
@@ -4275,9 +4275,9 @@ static int hb_compCompile( HB_COMP_DECL, const char * szPrg, const char * szBuff
iStatus = EXIT_FAILURE;
fGenCode = HB_FALSE;
hb_snprintf( buffer, sizeof( buffer ),
"\r%i error%s\n",
HB_COMP_PARAM->iErrorCount,
HB_COMP_PARAM->iErrorCount > 1 ? "s" : "" );
"\r%i error%s\n",
HB_COMP_PARAM->iErrorCount,
HB_COMP_PARAM->iErrorCount > 1 ? "s" : "" );
hb_compOutStd( HB_COMP_PARAM, buffer );
}
else if( HB_COMP_PARAM->iExitLevel == HB_EXITLEVEL_SETEXIT )

2
harbour/src/compiler/hbusage.c
View File

@@ -117,7 +117,7 @@ void hb_compPrintUsage( HB_COMP_DECL, const char * szSelf )
int iLine;
hb_snprintf( buffer, sizeof( buffer ),
"\nSyntax: %s <file[s][.prg]|@file> [options]\n", szSelf );
"\nSyntax: %s <file[s][.prg]|@file> [options]\n", szSelf );
hb_compOutStd( HB_COMP_PARAM, buffer );
for( iLine = 0; iLine < ( int ) ( sizeof( szOptions ) / sizeof( char * ) ); iLine++ )

2
harbour/src/pp/pplib.c
View File

@@ -74,7 +74,7 @@ static void hb_pp_ErrorMessage( void * cargo, const char * szMsgTable[],
char szMsgBuf[ 1024 ];
PHB_ITEM pError;
hb_snprintf( szMsgBuf, sizeof( szMsgBuf ), szMsgTable[ iCode - 1 ],
szParam1, szParam2 );
szParam1, szParam2 );
pError = hb_errRT_New( ES_ERROR, "PP", 1001, ( HB_ULONG ) iCode, szMsgBuf,
NULL, 0, EF_NONE | EF_CANDEFAULT );
hb_errLaunch( pError );

2
harbour/src/rdd/wafunc.c
View File

@@ -154,7 +154,7 @@ HB_ERRCODE hb_rddGetTempAlias( char * szAliasTmp )
for( i = 1; i < 1000; i++ )
{
hb_snprintf( szAliasTmp, 11, "__HBTMP%03i", i);
hb_snprintf( szAliasTmp, 11, "__HBTMP%03i", i );
if( hb_rddGetAliasNumber( szAliasTmp, &iArea ) != HB_SUCCESS )
return HB_SUCCESS;
}

6
harbour/src/rtl/gtcrs/gtcrs.c
View File

@@ -1340,7 +1340,7 @@ static void disp_cursor( InOutBase * ioBase )
if ( ioBase->terminal_type == TERM_LINUX )
{
hb_snprintf( escseq, sizeof( escseq ), "\033[?25%c\033[?%hdc",
ioBase->cursor == SC_NONE ? 'l' : 'h', lcurs );
ioBase->cursor == SC_NONE ? 'l' : 'h', lcurs );
write_ttyseq( ioBase, escseq );
}
else if ( cv != NULL )
@@ -1704,8 +1704,8 @@ static void gt_tone( InOutBase * ioBase, double dFrequency, double dDuration )
if ( ioBase->terminal_type == TERM_LINUX && ioBase->beep != NULL )
{
hb_snprintf( escseq, sizeof( escseq ), "\033[10;%hd]\033[11;%hd]%s",
( int ) dFrequency,
( int ) ( dDuration * 1000.0 / 18.2 ), ioBase->beep );
( int ) dFrequency,
( int ) ( dDuration * 1000.0 / 18.2 ), ioBase->beep );
write_ttyseq( ioBase, escseq );
}
else

2
harbour/src/rtl/hbgtcore.c
View File

@@ -3164,7 +3164,7 @@ static const char * hb_gt_FindDefault( void )
for( iPos = 0; iPos < s_iGtCount; iPos++ )
{
hb_snprintf( szFuncName, sizeof( szFuncName ),
"HB_GT_%s_DEFAULT", s_gtInit[ iPos ]->id );
"HB_GT_%s_DEFAULT", s_gtInit[ iPos ]->id );
if( hb_dynsymFind( szFuncName ) )
return s_gtInit[ iPos ]->id;
}

8
harbour/src/vm/estack.c
View File

@@ -688,8 +688,8 @@ static void hb_stackDispLocal( void )
hb_conOutErr( hb_conNewLine(), 0 );
hb_snprintf( buffer, sizeof( buffer ), HB_I_("Virtual Machine Stack Dump at %s(%i):"),
( *hb_stack.pBase )->item.asSymbol.value->szName,
( *hb_stack.pBase )->item.asSymbol.stackstate->uiLineNo );
( *hb_stack.pBase )->item.asSymbol.value->szName,
( *hb_stack.pBase )->item.asSymbol.stackstate->uiLineNo );
hb_conOutErr( buffer, 0 );
hb_conOutErr( hb_conNewLine(), 0 );
hb_conOutErr( "--------------------------", 0 );
@@ -726,8 +726,8 @@ static void hb_stackDispLocal( void )
{
char szDateTime[ 24 ];
hb_snprintf( buffer, sizeof( buffer ), HB_I_("TIMESTAMP = \"%s\" "),
hb_timeStampStr( szDateTime, ( *pBase )->item.asDateTime.julian,
( *pBase )->item.asDateTime.time ) );
hb_timeStampStr( szDateTime, ( *pBase )->item.asDateTime.julian,
( *pBase )->item.asDateTime.time ) );
}
break;