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

2008-01-28 12:10 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* include/hbapierr.h
   * source/rtl/errorapi.c
     ! Removed HB_ERR_SS_TOOLS non-core #define (formerly used by 
       /contrib/hbct from core header.
     ! Removed non-core related error API call hb_errRT_TOOLS()
       (functionality was similar to hb_errRT_BASE())

   * contrib/hbct/ctnet.c
     ! Fixed RTE calls to use unique IDs instead of 9999.
       Subcode changed to 0 from 999.

   * utils/hbpp/hbpplib.c
     ! Replaced RTE code 9999 with 1001.
This commit is contained in:
Viktor Szakats
2008-01-28 11:12:35 +00:00
parent 367c5a6264
commit eb89862ecf
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
harbour/ChangeLog
View File

@@ -8,6 +8,21 @@
2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2008-01-28 12:10 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* include/hbapierr.h
* source/rtl/errorapi.c
! Removed HB_ERR_SS_TOOLS non-core #define (formerly used by
/contrib/hbct from core header.
! Removed non-core related error API call hb_errRT_TOOLS()
(functionality was similar to hb_errRT_BASE())
* contrib/hbct/ctnet.c
! Fixed RTE calls to use unique IDs instead of 9999.
Subcode changed to 0 from 999.
* utils/hbpp/hbpplib.c
! Replaced RTE code 9999 with 1001.
2008-01-28 09:28 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* source/rdd/dbfntx/Makefile
* source/rdd/dbfdbt/Makefile

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

@@ -102,9 +102,9 @@ BOOL WINAPI WNetErrorHandler( DWORD dwErrorCode, LPSTR lpszFunction )
if( dwErrorCode != ERROR_EXTENDED_ERROR )
{
pError = hb_errRT_New( ES_ERROR,
HB_ERR_SS_TOOLS,
9999,
9999,
"CT",
9001,
0,
"Windows Network operation failed",
lpszFunction, ( USHORT ) dwErrorCode, EF_NONE );
hb_errLaunch( pError );
@@ -121,7 +121,7 @@ BOOL WINAPI WNetErrorHandler( DWORD dwErrorCode, LPSTR lpszFunction )
if( dwWNetResult != NO_ERROR )
{
pError = hb_errRT_New( ES_ERROR, HB_ERR_SS_TOOLS, 9999, 9999,
pError = hb_errRT_New( ES_ERROR, "CT", 9002, 0,
"WNetGetLastError failed", "see OS error",
( USHORT ) dwWNetResult, EF_NONE );
hb_errLaunch( pError );
@@ -131,7 +131,7 @@ BOOL WINAPI WNetErrorHandler( DWORD dwErrorCode, LPSTR lpszFunction )
szDescription = HB_TCHAR_CONVFROM( lpDescription );
szProvider = HB_TCHAR_CONVFROM( lpProvider );
pError = hb_errRT_New( ES_ERROR, HB_ERR_SS_TOOLS, 9999, 9999,
pError = hb_errRT_New( ES_ERROR, "CT", 9003, 0,
szDescription, szProvider,
( USHORT ) dwLastError, EF_NONE );
HB_TCHAR_FREE( szDescription );

2
harbour/include/hbapierr.h
View File

@@ -80,7 +80,6 @@ HB_EXTERN_BEGIN
#define HB_ERR_SS_BASE "BASE"
#define HB_ERR_SS_TERMINAL "TERM"
#define HB_ERR_SS_DBCMD "DBCMD"
#define HB_ERR_SS_TOOLS "TOOLS"
/* oError:GenCode */
@@ -164,7 +163,6 @@ extern HB_EXPORT void hb_errRT_BASE_SubstR ( ULONG ulGenCode, ULONG ulSubCo
extern HB_EXPORT USHORT hb_errRT_TERM ( ULONG ulGenCode, ULONG ulSubCode, const char * szDescription, const char * szOperation, USHORT uiOSCode, USHORT uiFlags );
extern HB_EXPORT USHORT hb_errRT_DBCMD ( ULONG ulGenCode, ULONG ulSubCode, const char * szDescription, const char * szOperation );
extern HB_EXPORT USHORT hb_errRT_DBCMD_Ext ( ULONG ulGenCode, ULONG ulSubCode, const char * szDescription, const char * szOperation, USHORT uiFlags );
extern HB_EXPORT USHORT hb_errRT_TOOLS ( ULONG ulGenCode, ULONG ulSubCode, const char * szDescription, const char * szOperation );
extern HB_EXPORT void hb_errInternal ( ULONG ulIntCode, const char * szText, const char * szPar1, const char * szPar2 );

13
harbour/source/rtl/errorapi.c
View File

@@ -1269,16 +1269,3 @@ USHORT hb_errRT_DBCMD_Ext( ULONG ulGenCode, ULONG ulSubCode, const char * szDesc
return uiAction;
}
USHORT hb_errRT_TOOLS( ULONG ulGenCode, ULONG ulSubCode, const char * szDescription, const char * szOperation )
{
USHORT uiAction;
PHB_ITEM pError =
hb_errRT_New( ES_ERROR, HB_ERR_SS_BASE, ulGenCode, ulSubCode, szDescription, szOperation, 0, EF_NONE );
uiAction = hb_errLaunch( pError );
hb_errRelease( pError );
return uiAction;
}

2
harbour/utils/hbpp/hbpplib.c
View File

@@ -226,7 +226,7 @@ void hb_compGenError( HB_COMP_DECL, char * szErrors[], char cPrefix, int iError,
deallocated here */
snprintf( buffer, sizeof( buffer ), szErrors[ iError - 1 ], szError1, szError2 );
pError = hb_errRT_New( ES_ERROR, "PP", 9999, ( ULONG ) iError, buffer, NULL, 0, EF_NONE | EF_CANDEFAULT );
pError = hb_errRT_New( ES_ERROR, "PP", 1001, ( ULONG ) iError, buffer, NULL, 0, EF_NONE | EF_CANDEFAULT );
hb_errLaunch( pError );
hb_errRelease( pError );