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

2008-06-22 22:49 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* include/hbapierr.h
   * source/rtl/errorapi.c
   * source/rdd/hbsix/sxtable.c
   * contrib/hbct/charonly.c
   * contrib/hbct/charevod.c
   * contrib/hbct/charone.c
   * contrib/hbct/pos1.c
   * contrib/hbct/ascpos.c
   * contrib/hbct/token1.c
   * contrib/hbct/atnum.c
   * contrib/hbct/count.c
   * contrib/hbct/replace.c
   * contrib/hbct/ctpad.c
   * contrib/hbct/justify.c
   * contrib/hbct/remove.c
   * contrib/xhb/hbxml.c
   * contrib/hbmzip/hbmzip.c
   * contrib/hbtip/utils.c
     * Changed remaining &hb_errFuncName -> HB_ERR_FUNCNAME
     + Added compatibility comments.
     ! Fixed hb_errFuncName value (changed to 1 to be the 
       same as HB_ERR_FUNCNAME).
     ; NOTE: 3rd party developers are encouraged to use 
             HB_ERR_FUNCNAME instead of hb_errFuncName. 
             There is no change in functionality.
       [TOMERGE 1.0.0RC1]
This commit is contained in:
Viktor Szakats
2008-06-22 20:55:06 +00:00
parent 9f905d7f01
commit e1a143f6e9
19 changed files with 66 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
harbour/ChangeLog
View File

@@ -8,6 +8,34 @@
2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2008-06-22 22:49 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* include/hbapierr.h
* source/rtl/errorapi.c
* source/rdd/hbsix/sxtable.c
* contrib/hbct/charonly.c
* contrib/hbct/charevod.c
* contrib/hbct/charone.c
* contrib/hbct/pos1.c
* contrib/hbct/ascpos.c
* contrib/hbct/token1.c
* contrib/hbct/atnum.c
* contrib/hbct/count.c
* contrib/hbct/replace.c
* contrib/hbct/ctpad.c
* contrib/hbct/justify.c
* contrib/hbct/remove.c
* contrib/xhb/hbxml.c
* contrib/hbmzip/hbmzip.c
* contrib/hbtip/utils.c
* Changed remaining &hb_errFuncName -> HB_ERR_FUNCNAME
+ Added compatibility comments.
! Fixed hb_errFuncName value (changed to 1 to be the
same as HB_ERR_FUNCNAME).
; NOTE: 3rd party developers are encouraged to use
HB_ERR_FUNCNAME instead of hb_errFuncName.
There is no change in functionality.
[TOMERGE 1.0.0RC1]
2008-06-22 22:28 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* contrib/xhb/hbcompat.ch
+ Added HB_SYMBOL_UNUSED() to xhb branch.

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

@@ -106,7 +106,7 @@ static void do_ascpos( int iSwitch )
pSubst = ct_error_subst( ( USHORT ) iArgErrorMode, EG_ARG,
iSwitch == DO_ASCPOS_VALPOS ?
CT_ERROR_VALPOS : CT_ERROR_ASCPOS, NULL,
&hb_errFuncName, 0, EF_CANSUBSTITUTE,
HB_ERR_FUNCNAME, 0, EF_CANSUBSTITUTE,
HB_ERR_ARGS_BASEPARAMS );
}

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

@@ -271,7 +271,7 @@ static void do_atnum( int iSwitch )
pSubst = ct_error_subst( ( USHORT ) iArgErrorMode, EG_ARG,
iSwitch ==
DO_ATNUM_AFTERATNUM ? CT_ERROR_AFTERATNUM :
CT_ERROR_BEFORATNUM, NULL, &hb_errFuncName, 0,
CT_ERROR_BEFORATNUM, NULL, HB_ERR_FUNCNAME, 0,
EF_CANSUBSTITUTE, HB_ERR_ARGS_BASEPARAMS );
}

4
harbour/contrib/hbct/charevod.c
View File

@@ -81,7 +81,7 @@ static void do_charevod( int iSwitch )
ct_error( ( USHORT ) iArgErrorMode, EG_ARG,
iSwitch == DO_CHAREVOD_CHAREVEN ?
CT_ERROR_CHAREVEN : CT_ERROR_CHARODD,
NULL, &hb_errFuncName, 0, EF_CANDEFAULT,
NULL, HB_ERR_FUNCNAME, 0, EF_CANDEFAULT,
HB_ERR_ARGS_BASEPARAMS );
}
hb_retc( NULL );
@@ -116,7 +116,7 @@ static void do_charevod( int iSwitch )
pSubst = ct_error_subst( ( USHORT ) iArgErrorMode, EG_ARG,
iSwitch == DO_CHAREVOD_CHAREVEN ?
CT_ERROR_CHAREVEN : CT_ERROR_CHARODD, NULL,
&hb_errFuncName, 0, EF_CANSUBSTITUTE,
HB_ERR_FUNCNAME, 0, EF_CANSUBSTITUTE,
HB_ERR_ARGS_BASEPARAMS );
}

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

@@ -195,7 +195,7 @@ static void do_charone( int iSwitch )
pSubst = ct_error_subst( ( USHORT ) iArgErrorMode, EG_ARG,
iSwitch == DO_CHARONE_CHARONE ?
CT_ERROR_CHARONE : CT_ERROR_WORDONE,
NULL, &hb_errFuncName, 0, EF_CANSUBSTITUTE,
NULL, HB_ERR_FUNCNAME, 0, EF_CANSUBSTITUTE,
HB_ERR_ARGS_BASEPARAMS );
if( pSubst != NULL )
hb_itemReturnRelease( pSubst );

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

@@ -164,7 +164,7 @@ static void do_charonly( int iSwitch )
break;
}
pSubst = ct_error_subst( ( USHORT ) iArgErrorMode, EG_ARG, iError,
NULL, &hb_errFuncName, 0, EF_CANSUBSTITUTE,
NULL, HB_ERR_FUNCNAME, 0, EF_CANSUBSTITUTE,
HB_ERR_ARGS_BASEPARAMS );
}

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

@@ -112,7 +112,7 @@ static void do_count( int iSwitch )
pSubst = ct_error_subst( ( USHORT ) iArgErrorMode, EG_ARG,
iSwitch == DO_COUNT_COUNTLEFT ?
CT_ERROR_COUNTLEFT : CT_ERROR_COUNTRIGHT,
NULL, &hb_errFuncName, 0, EF_CANSUBSTITUTE,
NULL, HB_ERR_FUNCNAME, 0, EF_CANSUBSTITUTE,
HB_ERR_ARGS_BASEPARAMS );
}

4
harbour/contrib/hbct/ctpad.c
View File

@@ -80,7 +80,7 @@ static void do_pad( int iSwitch )
ct_error( ( USHORT ) iArgErrorMode, EG_ARG,
iSwitch == DO_PAD_PADLEFT ?
CT_ERROR_PADLEFT : CT_ERROR_PADRIGHT, NULL,
&hb_errFuncName, 0, EF_CANDEFAULT,
HB_ERR_FUNCNAME, 0, EF_CANDEFAULT,
HB_ERR_ARGS_BASEPARAMS );
}
hb_retc( NULL );
@@ -133,7 +133,7 @@ static void do_pad( int iSwitch )
pSubst = ct_error_subst( ( USHORT ) iArgErrorMode, EG_ARG,
iSwitch == DO_PAD_PADLEFT ?
CT_ERROR_PADLEFT : CT_ERROR_PADRIGHT, NULL,
&hb_errFuncName, 0, EF_CANSUBSTITUTE,
HB_ERR_FUNCNAME, 0, EF_CANSUBSTITUTE,
HB_ERR_ARGS_BASEPARAMS );
}

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

@@ -149,7 +149,7 @@ static void do_justify( int iSwitch )
pSubst = ct_error_subst( ( USHORT ) iArgErrorMode, EG_ARG,
iSwitch == DO_JUSTIFY_JUSTLEFT ?
CT_ERROR_JUSTLEFT : CT_ERROR_JUSTRIGHT,
NULL, &hb_errFuncName, 0,
NULL, HB_ERR_FUNCNAME, 0,
EF_CANSUBSTITUTE, HB_ERR_ARGS_BASEPARAMS );
}

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

@@ -188,7 +188,7 @@ static void do_pos1( int iSwitch )
break;
}
pSubst = ct_error_subst( ( USHORT ) iArgErrorMode, EG_ARG, iError,
NULL, &hb_errFuncName, 0,
NULL, HB_ERR_FUNCNAME, 0,
EF_CANSUBSTITUTE, HB_ERR_ARGS_BASEPARAMS );
}

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

@@ -122,7 +122,7 @@ static void do_remove( int iSwitch )
{
pSubst = ct_error_subst( ( USHORT ) iArgErrorMode, EG_ARG,
sulErrorSubcodes[iSwitch],
NULL, ( char * ) &hb_errFuncName, 0,
NULL, ( char * ) HB_ERR_FUNCNAME, 0,
EF_CANSUBSTITUTE, HB_ERR_ARGS_BASEPARAMS );
}

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

@@ -146,7 +146,7 @@ static void do_replace( int iSwitch )
{
pSubst = ct_error_subst( ( USHORT ) iArgErrorMode, EG_ARG,
sulErrorSubcodes[iSwitch],
NULL, &hb_errFuncName, 0,
NULL, HB_ERR_FUNCNAME, 0,
EF_CANSUBSTITUTE, HB_ERR_ARGS_BASEPARAMS );
}

4
harbour/contrib/hbct/token1.c
View File

@@ -401,7 +401,7 @@ static void do_token1( int iSwitch )
pSubst = ct_error_subst( ( USHORT ) iArgErrorMode, EG_ARG,
iSwitch == DO_TOKEN1_TOKENLOWER ?
CT_ERROR_TOKENLOWER : CT_ERROR_TOKENUPPER,
NULL, &hb_errFuncName, 0,
NULL, HB_ERR_FUNCNAME, 0,
EF_CANSUBSTITUTE,
HB_ERR_ARGS_BASEPARAMS );
}
@@ -424,7 +424,7 @@ static void do_token1( int iSwitch )
pSubst = ct_error_subst( ( USHORT ) iArgErrorMode, EG_ARG,
iSwitch == DO_TOKEN1_NUMTOKEN ?
CT_ERROR_NUMTOKEN : CT_ERROR_ATTOKEN,
NULL, &hb_errFuncName, 0,
NULL, HB_ERR_FUNCNAME, 0,
EF_CANSUBSTITUTE, HB_ERR_ARGS_BASEPARAMS );
}
if( pSubst != NULL )

20
harbour/contrib/hbmzip/hbmzip.c
View File

@@ -90,7 +90,7 @@ static gzFile hb_zipfileParam( int iParam )
if( phZip && * phZip )
return * phZip;
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS );
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
return NULL;
}
@@ -114,7 +114,7 @@ static gzFile hb_unzipfileParam( int iParam )
if( phUnzip && * phUnzip )
return * phUnzip;
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS );
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
return NULL;
}
@@ -138,7 +138,7 @@ HB_FUNC( HB_ZIPOPEN )
}
}
else
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS );
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
@@ -155,7 +155,7 @@ HB_FUNC( HB_ZIPCLOSE )
hb_retni( zipClose( hZip, NULL ) );
}
else
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS );
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
@@ -198,7 +198,7 @@ HB_FUNC( HB_ZIPFILECREATE )
}
}
else
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS );
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
@@ -219,7 +219,7 @@ HB_FUNC( HB_ZIPFILEWRITE )
hb_retni( zipWriteInFileInZip( hZip, (void*) pData, ulLen ) );
}
else
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS );
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
@@ -250,7 +250,7 @@ HB_FUNC( HB_UNZIPOPEN )
}
}
else
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS );
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
@@ -267,7 +267,7 @@ HB_FUNC( HB_UNZIPCLOSE )
hb_retni( unzClose( hUnzip ) );
}
else
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS );
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
@@ -405,7 +405,7 @@ HB_FUNC( HB_UNZIPFILEREAD )
}
}
else
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS );
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
@@ -632,7 +632,7 @@ HB_FUNC( HB_ZIPSTOREFILE )
hb_retni( hb_zipStoreFile( hZip, szFileName, hb_parc( 3 ), hb_parc( 4 ) ) );
}
else
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS );
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}

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

@@ -729,7 +729,7 @@ HB_FUNC( PSTRCOMPI )
hb_retl( hb_strnicmp( pcBase + uStart - 1, pcSub, uSublen ) == 0 );
}
else
hb_errRT_BASE_SubstR( EG_ARG, 1099, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS );
hb_errRT_BASE_SubstR( EG_ARG, 1099, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
/* Case insensitive hb_strAt() function */
@@ -806,7 +806,7 @@ HB_FUNC( ATI )
}
else
{
hb_errRT_BASE_SubstR( EG_ARG, 1108, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS );
hb_errRT_BASE_SubstR( EG_ARG, 1108, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
}
@@ -830,7 +830,7 @@ HB_FUNC( HB_EXEC )
hb_vmDo( ( USHORT ) iParams );
}
else
hb_errRT_BASE_SubstR( EG_ARG, 1099, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS );
hb_errRT_BASE_SubstR( EG_ARG, 1099, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
HB_FUNC( TIP_HTMLSPECIALCHARS )

8
harbour/contrib/xhb/hbxml.c
View File

@@ -2302,7 +2302,7 @@ HB_FUNC( HBXML_DATAREAD )
if( pDoc == NULL || pParam == NULL ||
( !HB_IS_STRING( pParam ) && !HB_IS_NUMERIC( pParam ) ) )
{
hb_errRT_BASE( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS );
hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
return;
}
@@ -2340,7 +2340,7 @@ HB_FUNC( HB_XMLERRORDESC )
if( pNum )
hb_retc( mxml_error_desc( (MXML_ERROR_CODE) hb_itemGetNI( pNum ) ) );
else
hb_errRT_BASE( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS );
hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
}
@@ -2361,7 +2361,7 @@ HB_FUNC( HBXML_NODE_TO_STRING )
if( pNode == NULL )
{
hb_errRT_BASE( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS );
hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
return;
}
@@ -2409,7 +2409,7 @@ HB_FUNC( HBXML_NODE_WRITE )
if( pNode == NULL || pHandle == NULL )
{
hb_errRT_BASE( EG_ARG, 3012, NULL, &hb_errFuncName, HB_ERR_ARGS_BASEPARAMS );
hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
return;
}

3
harbour/include/hbapierr.h
View File

@@ -95,7 +95,8 @@ HB_EXTERN_BEGIN
#define HB_ERR_ARGS_BASEPARAMS 0xFFFFFFFF
#define HB_ERR_ARGS_SELFPARAMS 0xFFFFFFFE
/* pseudo function name in operation description */
/* pseudo function name in operation description
(deprecated, kept for compatibility, use HB_ERR_FUNCNAME instead) */
extern const char hb_errFuncName;
#define HB_ERR_FUNCNAME ( ( char * ) 1 )

2
harbour/source/rdd/hbsix/sxtable.c
View File

@@ -440,7 +440,7 @@ HB_FUNC( SX_SETTURBO )
pRDDNode = hb_rddFindNode( szDriver, &uiRddID ); /* find the RDDNODE */
if( !pRDDNode )
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, &hb_errFuncName,
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME,
HB_ERR_ARGS_BASEPARAMS );
else
{

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

@@ -108,7 +108,9 @@
#define HB_TERROR_IVARCOUNT 12
const char hb_errFuncName = 0;
/* pseudo function name in operation description
(deprecated, kept for compatibility, use HB_ERR_FUNCNAME instead) */
const char hb_errFuncName = 1;
static HB_ERROR_INFO_PTR s_errorHandler = NULL;
static PHB_ITEM s_errorBlock = NULL;