2008-01-27 17:24 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

* contrib/hbmysql/make_b32.bat
   * contrib/hbmysql/make_vc.bat
   * contrib/hbodbc/make_b32.bat
   * contrib/hbodbc/make_vc.bat
   * contrib/hbfbird/make_b32.bat
   * contrib/hbfbird/make_vc.bat
   * contrib/hbapollo/make_b32.bat
   * contrib/hbapollo/make_vc.bat
   * contrib/hbzlib/make_b32.bat
   * contrib/hbzlib/make_vc.bat
   * contrib/hbpgsql/make_b32.bat
   * contrib/hbpgsql/make_vc.bat
   * contrib/rddads/make_b32.bat
   * contrib/rddads/make_vc.bat
   * contrib/hbfimage/make_b32.bat
   * contrib/hbfimage/make_vc.bat
   * contrib/hbgd/make_b32.bat
   * contrib/hbgd/make_vc.bat
     ! Minor formatting.

   * contrib/hbzlib/make_b32.bat
     ! -a added to implib until a better fix is found 
       for the problem.

   * source/rdd/dbfntx/dbfntx1.c
   * source/rdd/dbfcdx/dbfcdx1.c
     ! Changed previously used internal error code 
       ranges to better fit in already used ones.
       (70??/71?? -> 93??)

   * contrib/hbbmcdx/bmdbfcdx1.c
     ! 9999 internal error codes synced with CDX RDD.
This commit is contained in:
Viktor Szakats
2008-01-27 16:25:45 +00:00
parent b1df0448bf
commit 6ba9eae6c2
22 changed files with 77 additions and 43 deletions

View File

@@ -8,6 +8,40 @@
2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2008-01-27 17:24 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbmysql/make_b32.bat
* contrib/hbmysql/make_vc.bat
* contrib/hbodbc/make_b32.bat
* contrib/hbodbc/make_vc.bat
* contrib/hbfbird/make_b32.bat
* contrib/hbfbird/make_vc.bat
* contrib/hbapollo/make_b32.bat
* contrib/hbapollo/make_vc.bat
* contrib/hbzlib/make_b32.bat
* contrib/hbzlib/make_vc.bat
* contrib/hbpgsql/make_b32.bat
* contrib/hbpgsql/make_vc.bat
* contrib/rddads/make_b32.bat
* contrib/rddads/make_vc.bat
* contrib/hbfimage/make_b32.bat
* contrib/hbfimage/make_vc.bat
* contrib/hbgd/make_b32.bat
* contrib/hbgd/make_vc.bat
! Minor formatting.
* contrib/hbzlib/make_b32.bat
! -a added to implib until a better fix is found
for the problem.
* source/rdd/dbfntx/dbfntx1.c
* source/rdd/dbfcdx/dbfcdx1.c
! Changed previously used internal error code
ranges to better fit in already used ones.
(70??/71?? -> 93??)
* contrib/hbbmcdx/bmdbfcdx1.c
! 9999 internal error codes synced with CDX RDD.
2008-01-27 15:26 UTC+0200 Chen Kedem <niki@synel.co.il>
* source/rtl/objfunc.prg
! Change hb_ISPOINTER() -> hb_ISSYMBOL()

View File

@@ -45,7 +45,7 @@ if "%1" == "INSTALL" goto POST_INSTALL
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
goto POST_EXIT
:POST_INSTALL

View File

@@ -61,7 +61,7 @@ if "%1" == "INSTALL" goto POST_INSTALL
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
goto POST_EXIT
:POST_INSTALL

View File

@@ -9443,7 +9443,7 @@ static void hb_cdxSortWritePage( LPCDXSORTINFO pSort )
pSort->hTempFile = hb_fsCreateTemp( NULL, NULL, FC_NORMAL, szName );
if ( pSort->hTempFile == FS_ERROR )
{
hb_errInternal( 9999, "hb_cdxSortWritePage: Can't create temporary file.", "", "" );
hb_errInternal( 9301, "hb_cdxSortWritePage: Can't create temporary file.", "", "" );
}
pSort->szTempFileName = hb_strdup( ( char * ) szName );
}
@@ -9451,7 +9451,7 @@ static void hb_cdxSortWritePage( LPCDXSORTINFO pSort )
pSort->pSwapPage[ pSort->ulCurPage ].nOffset = hb_fsSeekLarge( pSort->hTempFile, 0, FS_END );
if ( hb_fsWriteLarge( pSort->hTempFile, pSort->pKeyPool, ulSize ) != ulSize )
{
hb_errInternal( 9999, "hb_cdxSortWritePage: Write error in temporary file.", "", "" );
hb_errInternal( 9302, "hb_cdxSortWritePage: Write error in temporary file.", "", "" );
}
pSort->ulKeys = 0;
pSort->ulCurPage++;
@@ -9470,7 +9470,7 @@ static void hb_cdxSortGetPageKey( LPCDXSORTINFO pSort, ULONG ulPage,
if ( hb_fsSeekLarge( pSort->hTempFile, pSort->pSwapPage[ ulPage ].nOffset, SEEK_SET ) != pSort->pSwapPage[ ulPage ].nOffset ||
hb_fsReadLarge( pSort->hTempFile, pSort->pSwapPage[ ulPage ].pKeyPool, ulSize ) != ulSize )
{
hb_errInternal( 9999, "hb_cdxSortGetPageKey: Read error from temporary file.", "", "" );
hb_errInternal( 9303, "hb_cdxSortGetPageKey: Read error from temporary file.", "", "" );
}
pSort->pSwapPage[ ulPage ].nOffset += ulSize;
pSort->pSwapPage[ ulPage ].ulKeyBuf = ulKeys;
@@ -9803,7 +9803,7 @@ static void hb_cdxSortOut( LPCDXSORTINFO pSort )
{
if ( ! hb_cdxSortKeyGet( pSort, &pKeyVal, &ulRec ) )
{
hb_errInternal( 9999, "hb_cdxSortOut: memory structure corrupted.", "", "" );
hb_errInternal( 9304, "hb_cdxSortOut: memory structure corrupted.", "", "" );
}
if ( fUnique )
{
@@ -9824,7 +9824,7 @@ static void hb_cdxSortOut( LPCDXSORTINFO pSort )
{
printf("\r\nulKey=%ld, pKeyVal=[%s][%ld], pKeyLast=[%s][%ld]\r\n",
ulKey, pKeyVal, ulRec, pSort->pLastKey, pSort->ulLastRec); fflush(stdout);
hb_errInternal( 9999, "hb_cdxSortOut: sorting fails.", "", "" );
hb_errInternal( 9305, "hb_cdxSortOut: sorting fails.", "", "" );
}
}
#endif
@@ -9836,7 +9836,7 @@ static void hb_cdxSortOut( LPCDXSORTINFO pSort )
#ifdef HB_CDX_DBGCODE
if ( hb_cdxSortKeyGet( pSort, &pKeyVal, &ulRec ) )
{
hb_errInternal( 9999, "hb_cdxSortOut: memory structure corrupted(2).", "", "" );
hb_errInternal( 9306, "hb_cdxSortOut: memory structure corrupted(2).", "", "" );
}
#endif

View File

@@ -45,7 +45,7 @@ if "%1" == "INSTALL" goto POST_INSTALL
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
goto POST_EXIT
:POST_INSTALL

View File

@@ -61,7 +61,7 @@ if "%1" == "INSTALL" goto POST_INSTALL
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
goto POST_EXIT
:POST_INSTALL

View File

@@ -46,7 +46,7 @@ if "%1" == "INSTALL" goto POST_INSTALL
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
goto POST_EXIT
:POST_INSTALL

View File

@@ -62,7 +62,7 @@ if "%1" == "INSTALL" goto POST_INSTALL
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
goto POST_EXIT
:POST_INSTALL

View File

@@ -45,7 +45,7 @@ if "%1" == "INSTALL" goto POST_INSTALL
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
goto POST_EXIT
:POST_INSTALL

View File

@@ -61,7 +61,7 @@ if "%1" == "INSTALL" goto POST_INSTALL
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
goto POST_EXIT
:POST_INSTALL

View File

@@ -45,7 +45,7 @@ if "%1" == "INSTALL" goto POST_INSTALL
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
goto POST_EXIT
:POST_INSTALL

View File

@@ -61,7 +61,7 @@ if "%1" == "INSTALL" goto POST_INSTALL
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
goto POST_EXIT
:POST_INSTALL

View File

@@ -33,7 +33,7 @@ if "%1" == "INSTALL" goto POST_INSTALL
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
goto POST_EXIT
:POST_INSTALL

View File

@@ -50,7 +50,7 @@ if "%1" == "INSTALL" goto POST_INSTALL
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
goto POST_EXIT
:POST_INSTALL

View File

@@ -46,7 +46,7 @@ if "%1" == "INSTALL" goto POST_INSTALL
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
goto POST_EXIT
:POST_INSTALL

View File

@@ -62,7 +62,7 @@ if "%1" == "INSTALL" goto POST_INSTALL
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
goto POST_EXIT
:POST_INSTALL

View File

@@ -38,14 +38,14 @@ if "%1" == "INSTALL" goto POST_INSTALL
:POST_BUILD
implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %HB_DLL_DIR%\%HB_DLL_NAME%.dll
implib -a ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %HB_DLL_DIR%\%HB_DLL_NAME%.dll
goto POST_EXIT
:POST_CLEAN
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
goto POST_EXIT
:POST_INSTALL

View File

@@ -61,7 +61,7 @@ if "%1" == "INSTALL" goto POST_INSTALL
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
goto POST_EXIT
:POST_INSTALL

View File

@@ -55,7 +55,7 @@ if "%1" == "INSTALL" goto POST_INSTALL
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
goto POST_EXIT
:POST_INSTALL

View File

@@ -71,7 +71,7 @@ if "%1" == "INSTALL" goto POST_INSTALL
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib > nul
goto POST_EXIT
:POST_INSTALL

View File

@@ -8784,7 +8784,7 @@ static void hb_cdxSortWritePage( LPCDXSORTINFO pSort )
pSort->hTempFile = hb_fsCreateTemp( NULL, NULL, FC_NORMAL, szName );
if ( pSort->hTempFile == FS_ERROR )
{
hb_errInternal( 7001, "hb_cdxSortWritePage: Can't create temporary file.", "", "" );
hb_errInternal( 9301, "hb_cdxSortWritePage: Can't create temporary file.", "", "" );
}
pSort->szTempFileName = hb_strdup( ( char * ) szName );
}
@@ -8792,7 +8792,7 @@ static void hb_cdxSortWritePage( LPCDXSORTINFO pSort )
pSort->pSwapPage[ pSort->ulCurPage ].nOffset = hb_fsSeekLarge( pSort->hTempFile, 0, FS_END );
if ( hb_fsWriteLarge( pSort->hTempFile, pSort->pKeyPool, ulSize ) != ulSize )
{
hb_errInternal( 7002, "hb_cdxSortWritePage: Write error in temporary file.", "", "" );
hb_errInternal( 9302, "hb_cdxSortWritePage: Write error in temporary file.", "", "" );
}
pSort->ulKeys = 0;
pSort->ulCurPage++;
@@ -8811,7 +8811,7 @@ static void hb_cdxSortGetPageKey( LPCDXSORTINFO pSort, ULONG ulPage,
if ( hb_fsSeekLarge( pSort->hTempFile, pSort->pSwapPage[ ulPage ].nOffset, SEEK_SET ) != pSort->pSwapPage[ ulPage ].nOffset ||
hb_fsReadLarge( pSort->hTempFile, pSort->pSwapPage[ ulPage ].pKeyPool, ulSize ) != ulSize )
{
hb_errInternal( 7003, "hb_cdxSortGetPageKey: Read error from temporary file.", "", "" );
hb_errInternal( 9303, "hb_cdxSortGetPageKey: Read error from temporary file.", "", "" );
}
pSort->pSwapPage[ ulPage ].nOffset += ulSize;
pSort->pSwapPage[ ulPage ].ulKeyBuf = ulKeys;
@@ -9144,7 +9144,7 @@ static void hb_cdxSortOut( LPCDXSORTINFO pSort )
{
if ( ! hb_cdxSortKeyGet( pSort, &pKeyVal, &ulRec ) )
{
hb_errInternal( 7004, "hb_cdxSortOut: memory structure corrupted.", "", "" );
hb_errInternal( 9304, "hb_cdxSortOut: memory structure corrupted.", "", "" );
}
if ( fUnique )
{
@@ -9165,7 +9165,7 @@ static void hb_cdxSortOut( LPCDXSORTINFO pSort )
{
printf("\r\nulKey=%ld, pKeyVal=[%s][%ld], pKeyLast=[%s][%ld]\r\n",
ulKey, pKeyVal, ulRec, pSort->pLastKey, pSort->ulLastRec); fflush(stdout);
hb_errInternal( 7005, "hb_cdxSortOut: sorting fails.", "", "" );
hb_errInternal( 9305, "hb_cdxSortOut: sorting fails.", "", "" );
}
}
#endif
@@ -9177,7 +9177,7 @@ static void hb_cdxSortOut( LPCDXSORTINFO pSort )
#ifdef HB_CDX_DBGCODE
if ( hb_cdxSortKeyGet( pSort, &pKeyVal, &ulRec ) )
{
hb_errInternal( 7006, "hb_cdxSortOut: memory structure corrupted(2).", "", "" );
hb_errInternal( 9306, "hb_cdxSortOut: memory structure corrupted(2).", "", "" );
}
#endif

View File

@@ -856,15 +856,15 @@ static void hb_ntxTagCheckBuffers( LPTAGINFO pTag )
ULONG i;
if( ( pTag->HdrChanged || pTag->Owner->Changed ) && !pTag->Owner->lockWrite )
hb_errInternal( 7101, "hb_ntxTagCheckBuffers: tag modified in unlocked index", "", "" );
hb_errInternal( 9301, "hb_ntxTagCheckBuffers: tag modified in unlocked index", "", "" );
for( i = 0; i < pTag->Owner->ulPages; i++ )
{
pPage = pTag->Owner->pages[ i ];
if( pPage->Changed && !pTag->Owner->lockWrite )
hb_errInternal( 7102, "hb_ntxTagCheckBuffers: page modified in unlocked index", "", "" );
hb_errInternal( 9302, "hb_ntxTagCheckBuffers: page modified in unlocked index", "", "" );
if( pPage->iUsed )
hb_errInternal( 7103, "hb_ntxTagCheckBuffers: page still allocated", "", "" );
hb_errInternal( 9303, "hb_ntxTagCheckBuffers: page still allocated", "", "" );
}
}
@@ -886,7 +886,7 @@ static void hb_ntxPageCheckKeys( LPPAGEINFO pPage, LPTAGINFO pTag, int iPos, int
u - 1, pTag->KeyLength, hb_ntxGetKeyVal( pPage, u - 1 ),
u, pTag->KeyLength, hb_ntxGetKeyVal( pPage, u ) );
fflush(stdout);
hb_errInternal( 7104, "hb_ntxPageCheckKeys: keys sorted wrong.", "", "" );
hb_errInternal( 9304, "hb_ntxPageCheckKeys: keys sorted wrong.", "", "" );
}
}
}
@@ -1093,9 +1093,9 @@ static LPPAGEINFO hb_ntxPageGetBuffer( LPTAGINFO pTag, ULONG ulPage )
LPPAGEINFO pPage = pIndex->pFirst;
if( pPage->iUsed )
hb_errInternal( 7105, "hb_ntxPageGetBuffer: page used.", "", "" );
hb_errInternal( 9305, "hb_ntxPageGetBuffer: page used.", "", "" );
if( pPage->Changed )
hb_errInternal( 7106, "hb_ntxPageGetBuffer: page changed.", "", "" );
hb_errInternal( 9306, "hb_ntxPageGetBuffer: page changed.", "", "" );
pIndex->pFirst = pPage->pNext;
if( pIndex->pFirst )
@@ -1207,7 +1207,7 @@ static void hb_ntxPageRelease( LPTAGINFO pTag, LPPAGEINFO pPage )
}
}
else if( pPage->iUsed < 0 )
hb_errInternal( 7107, "hb_ntxPageRelease: unused page freed.", "", "" );
hb_errInternal( 9307, "hb_ntxPageRelease: unused page freed.", "", "" );
}
/*
@@ -1950,7 +1950,7 @@ static void hb_ntxIndexFlush( LPNTXINDEX pIndex )
hb_ntxPageRelease( pIndex->lpTags[0], pPage );
}
else
hb_errInternal( 7108, "hb_ntxIndexFlush: unchaged page in the list.", "", "" );
hb_errInternal( 9308, "hb_ntxIndexFlush: unchaged page in the list.", "", "" );
}
if( pIndex->Compound )
@@ -5082,7 +5082,7 @@ static void hb_ntxSortOut( LPNTXSORTINFO pSort )
{
if( hb_vmRequestQuery() != 0 )
return;
hb_errInternal( 7109, "hb_ntxSortOut: memory structure corrupted.", "", "" );
hb_errInternal( 9309, "hb_ntxSortOut: memory structure corrupted.", "", "" );
}
if( fUnique )
{
@@ -5111,7 +5111,7 @@ static void hb_ntxSortOut( LPNTXSORTINFO pSort )
ulKey, pKeyVal, ulRec, pSort->pLastKey, pSort->ulLastRec); fflush(stdout);
if( hb_vmRequestQuery() != 0 )
return;
hb_errInternal( 7110, "hb_ntxSortOut: sorting fails.", "", "" );
hb_errInternal( 9310, "hb_ntxSortOut: sorting fails.", "", "" );
}
}
memcpy( pSort->pLastKey, pKeyVal, iLen );
@@ -5125,7 +5125,7 @@ static void hb_ntxSortOut( LPNTXSORTINFO pSort )
{
if( hb_vmRequestQuery() != 0 )
return;
hb_errInternal( 7111, "hb_ntxSortOut: memory structure corrupted(2).", "", "" );
hb_errInternal( 9311, "hb_ntxSortOut: memory structure corrupted(2).", "", "" );
}
#endif
@@ -5780,7 +5780,7 @@ static ERRCODE ntxGoCold( NTXAREAP pArea )
if( fAppend && pArea->fShared )
{
if( pArea->fNtxAppend )
hb_errInternal( 7112, "ntxGoCold: multiple appending without GOCOLD.", "", "" );
hb_errInternal( 9312, "ntxGoCold: multiple appending without GOCOLD.", "", "" );
pArea->fNtxAppend = TRUE;
}
else