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

2010-01-15 15:10 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* include/hbexprb.c
    ! s&r error bug in recent change.

  * utils/hbmk2/hbmk2.prg
    + Accepting name=, description=, verison= .hbc lines.
      Just a step, no real purpose.

  * contrib/hbodbc/odbc.c
    * long -> HB_SIZE
    * ULONG -> HB_SIZE
This commit is contained in:
Viktor Szakats
2010-01-15 14:12:58 +00:00
parent af966c6e85
commit 17a7f91323
4 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
harbour/ChangeLog
View File

@@ -17,6 +17,18 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-01-15 15:10 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* include/hbexprb.c
! s&r error bug in recent change.
* utils/hbmk2/hbmk2.prg
+ Accepting name=, description=, verison= .hbc lines.
Just a step, no real purpose.
* contrib/hbodbc/odbc.c
* long -> HB_SIZE
* ULONG -> HB_SIZE
2010-01-15 12:17 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* include/hbdefs.h
+ Marked BOOL, TRUE and FALSE as HB_LEGACY_LEVEL3.

16
harbour/contrib/hbodbc/odbc.c
View File

@@ -222,7 +222,7 @@ HB_FUNC( SQLGETDATA ) /* hStmt, nField, nType, nLen, @cBuffer --> nRetCode */
lLen = ( SQLLEN ) hb_parnint( 4 );
if( ! lLen )
lLen = 64;
bBuffer = hb_xgrab( ( ULONG ) lLen + 1 );
bBuffer = hb_xgrab( ( HB_SIZE ) lLen + 1 );
bOut = NULL;
lInitBuff = lLen;
lBuffLen = 0;
@@ -239,7 +239,7 @@ HB_FUNC( SQLGETDATA ) /* hStmt, nField, nType, nLen, @cBuffer --> nRetCode */
if( result == SQL_SUCCESS && iReallocs == 0 )
{
hb_storclen( ( char * ) bBuffer, ( long ) ( lLen < 0 ? 0 : ( lLen < hb_parnl( 4 ) ? lLen : hb_parnl( 4 ) ) ), 5 );
hb_storclen( ( char * ) bBuffer, ( HB_SIZE ) ( lLen < 0 ? 0 : ( lLen < hb_parnl( 4 ) ? lLen : hb_parnl( 4 ) ) ), 5 );
break;
}
else if( result == SQL_SUCCESS_WITH_INFO && iReallocs == 0 )
@@ -249,22 +249,22 @@ HB_FUNC( SQLGETDATA ) /* hStmt, nField, nType, nLen, @cBuffer --> nRetCode */
{
/* data right truncated! */
lBuffLen = lLen;
bOut = ( char * ) hb_xgrab( ( ULONG ) lBuffLen + 1 );
bOut = ( char * ) hb_xgrab( ( HB_SIZE ) lBuffLen + 1 );
hb_strncpy( ( char * ) bOut, ( char * ) bBuffer, lLen );
lLen = lLen - lInitBuff + 2;
bBuffer = ( char * ) hb_xrealloc( bBuffer, ( ULONG ) lLen );
bBuffer = ( char * ) hb_xrealloc( bBuffer, ( HB_SIZE ) lLen );
iReallocs++;
}
else
{
hb_storclen( ( char * ) bBuffer, ( long ) ( lLen < 0 ? 0 : ( lLen < hb_parnl( 4 ) ? lLen : hb_parnl( 4 ) ) ), 5 );
hb_storclen( ( char * ) bBuffer, ( HB_SIZE ) ( lLen < 0 ? 0 : ( lLen < hb_parnl( 4 ) ? lLen : hb_parnl( 4 ) ) ), 5 );
break;
}
}
else if( ( result == SQL_SUCCESS || result == SQL_SUCCESS_WITH_INFO ) && iReallocs > 0 )
{
hb_strncat( ( char * ) bOut, ( char * ) bBuffer, lBuffLen );
hb_storclen( ( char * ) bOut, ( long ) ( lLen + lInitBuff - 1 ), 5 );
hb_storclen( ( char * ) bOut, ( HB_SIZE ) ( lLen + lInitBuff - 1 ), 5 );
result = SQL_SUCCESS;
break;
}
@@ -314,7 +314,7 @@ HB_FUNC( SQLDESCRIBECOL ) /* hStmt, nCol, @cName, nLen, @nBufferLen, @nDataType,
if( HB_ISBYREF( 3 ) )
{
char * szStr = HB_TCHAR_CONVNFROM( buffer, wBufLen );
hb_storclen( szStr, ( long ) wBufLen, 3 );
hb_storclen( szStr, ( HB_SIZE ) wBufLen, 3 );
HB_TCHAR_FREE( szStr );
}
hb_storni( ( int ) wBufLen, 5 );
@@ -355,7 +355,7 @@ HB_FUNC( SQLCOLATTRIBUTE ) /* hStmt, nCol, nField, @cName, nLen, @nBufferLen, @n
if( result == SQL_SUCCESS || result == SQL_SUCCESS_WITH_INFO )
{
hb_storclen( ( char * ) bBuffer, ( long ) wBufLen, 4 );
hb_storclen( ( char * ) bBuffer, ( HB_SIZE ) wBufLen, 4 );
hb_storni( ( int ) wBufLen, 6 );
hb_stornint( wNumPtr, 7 );
}

4
harbour/include/hbexprb.c
View File

@@ -976,13 +976,13 @@ static HB_EXPR_FUNC( hb_compExprUseIIF )
#if defined( HB_MACRO_SUPPORT )
if( HB_PCODE_DATA->lPCodePos == ulPosFalse + 3 )
{
HB_PCODE_DATA->pCode[ ulPosFalse - 1 ] = HB_P_JUMPHB_TRUEFAR;
HB_PCODE_DATA->pCode[ ulPosFalse - 1 ] = HB_P_JUMPTRUEFAR;
ulPosEnd = ulPosFalse;
}
#else
if( HB_COMP_PARAM->functions.pLast->lPCodePos == ulPosFalse + 3 )
{
HB_COMP_PARAM->functions.pLast->pCode[ ulPosFalse - 1 ] = HB_P_JUMPHB_TRUEFAR;
HB_COMP_PARAM->functions.pLast->pCode[ ulPosFalse - 1 ] = HB_P_JUMPTRUEFAR;
ulPosEnd = ulPosFalse;
}
#endif

13
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -6390,6 +6390,19 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
ENDIF
ENDIF
/* .hbc identification strings. Similar to pkgconfig ones. */
CASE Lower( Left( cLine, Len( "name=" ) ) ) == "name=" ; cLine := SubStr( cLine, Len( "name=" ) + 1 )
/* Silently ignore */
CASE Lower( Left( cLine, Len( "description=" ) ) ) == "description=" ; cLine := SubStr( cLine, Len( "description=" ) + 1 )
/* Silently ignore */
CASE Lower( Left( cLine, Len( "version=" ) ) ) == "version=" ; cLine := SubStr( cLine, Len( "version=" ) + 1 )
/* Silently ignore */
ENDCASE
NEXT