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

2009-07-03 09:47 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/hbct/screen2.c
  * contrib/hbct/token2.c
  * contrib/hbct/charsprd.c
  * contrib/hbct/charonly.c
  * contrib/hbct/atadjust.c
  * contrib/hbct/ctmath.c
  * contrib/hbct/charsort.c
  * contrib/hbct/charmix.c
  * contrib/hbct/charevod.c
  * contrib/hbct/wordrepl.c
  * contrib/hbct/charrepl.c
  * contrib/hbct/strswap.c
  * contrib/hbct/charswap.c
  * contrib/hbct/charop.c
  * contrib/hbct/cursor.c
  * contrib/hbct/misc2.c
  * contrib/hbct/color.c
  * contrib/hbct/charone.c
  * contrib/hbct/screen1.c
  * contrib/hbct/token1.c
  * contrib/hbct/charmirr.c
  * contrib/hbct/ctwfunc.c
  * contrib/hbct/relation.c
  * contrib/hbct/setlast.c
  * contrib/hbct/setrc.c
  * contrib/hbct/atnum.c
  * contrib/hbct/ctcrypt.c
  * contrib/hbct/ctstrfil.c
  * contrib/hbct/range.c
  * contrib/hbct/addascii.c
  * contrib/hbct/tab.c
  * contrib/hbct/dattime2.c
  * contrib/hbct/replace.c
  * contrib/hbct/expand.c
  * contrib/hbct/pos2.c
  * contrib/hbct/wordtoch.c
  * contrib/hbct/ctpad.c
  * contrib/hbct/justify.c
  * contrib/hbct/remove.c
  * contrib/xhb/xstrdel.c
  * contrib/xhb/xhbtrim.c
  * contrib/hbnf/n2color.c
  * contrib/hbnf/ftattr.c
  * contrib/gtwvg/wvgutils.c
  * contrib/hbclipsm/environ.c
  * contrib/hbmisc/spd.c
  * contrib/hbtip/utils.c
  * contrib/hbtip/encmthd.c
  * examples/hbgf/hbgfgtk/creabutt.c
  * examples/hbgf/hbgfgtk/creawin.c
  * examples/hbwhat/whtclpb.c
  * examples/hbwhat/whtcdlg.c
  * examples/hbwhat/whttree.c
    % hb_retc( NULL ) -> hb_retc_null()
This commit is contained in:
Viktor Szakats
2009-07-03 07:56:51 +00:00
parent beaaf5fb58
commit 6276c852a7
54 changed files with 181 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
harbour/ChangeLog
View File

@@ -17,6 +17,62 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-07-03 09:47 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbct/screen2.c
* contrib/hbct/token2.c
* contrib/hbct/charsprd.c
* contrib/hbct/charonly.c
* contrib/hbct/atadjust.c
* contrib/hbct/ctmath.c
* contrib/hbct/charsort.c
* contrib/hbct/charmix.c
* contrib/hbct/charevod.c
* contrib/hbct/wordrepl.c
* contrib/hbct/charrepl.c
* contrib/hbct/strswap.c
* contrib/hbct/charswap.c
* contrib/hbct/charop.c
* contrib/hbct/cursor.c
* contrib/hbct/misc2.c
* contrib/hbct/color.c
* contrib/hbct/charone.c
* contrib/hbct/screen1.c
* contrib/hbct/token1.c
* contrib/hbct/charmirr.c
* contrib/hbct/ctwfunc.c
* contrib/hbct/relation.c
* contrib/hbct/setlast.c
* contrib/hbct/setrc.c
* contrib/hbct/atnum.c
* contrib/hbct/ctcrypt.c
* contrib/hbct/ctstrfil.c
* contrib/hbct/range.c
* contrib/hbct/addascii.c
* contrib/hbct/tab.c
* contrib/hbct/dattime2.c
* contrib/hbct/replace.c
* contrib/hbct/expand.c
* contrib/hbct/pos2.c
* contrib/hbct/wordtoch.c
* contrib/hbct/ctpad.c
* contrib/hbct/justify.c
* contrib/hbct/remove.c
* contrib/xhb/xstrdel.c
* contrib/xhb/xhbtrim.c
* contrib/hbnf/n2color.c
* contrib/hbnf/ftattr.c
* contrib/gtwvg/wvgutils.c
* contrib/hbclipsm/environ.c
* contrib/hbmisc/spd.c
* contrib/hbtip/utils.c
* contrib/hbtip/encmthd.c
* examples/hbgf/hbgfgtk/creabutt.c
* examples/hbgf/hbgfgtk/creawin.c
* examples/hbwhat/whtclpb.c
* examples/hbwhat/whtcdlg.c
* examples/hbwhat/whttree.c
% hb_retc( NULL ) -> hb_retc_null()
2009-07-03 09:35 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* include/hbdefs.h
! hbUChar, hbSChar fixed to not depend on legacy types.

4
harbour/contrib/gtwvg/wvgutils.c
View File

@@ -1531,7 +1531,7 @@ HB_FUNC( WVT__GETOPENFILENAME )
}
else
{
hb_retc( NULL );
hb_retc_null();
}
hb_xfree( lpFileName );
HB_PARTFREE( lpstrTitle );
@@ -1577,7 +1577,7 @@ HB_FUNC( WVT__GETSAVEFILENAME )
}
else
{
hb_retc( NULL );
hb_retc_null();
}
HB_PARTFREE( lpstrTitle );

10
harbour/contrib/hbclipsm/environ.c
View File

@@ -66,7 +66,7 @@ HB_FUNC( FILEPATH )
hb_xfree( pFileName );
}
else
hb_retc( NULL );
hb_retc_null();
}
/* FileBase( <cFile> ) --> cFileBase
@@ -80,7 +80,7 @@ HB_FUNC( FILEBASE )
hb_xfree( pFileName );
}
else
hb_retc( NULL );
hb_retc_null();
}
/* FileExt( <cFile> ) --> cFileExt
@@ -93,11 +93,11 @@ HB_FUNC( FILEEXT )
if( pFileName->szExtension != NULL )
hb_retc( ( pFileName->szExtension ) + 1 ); /* Skip the dot */
else
hb_retc( NULL );
hb_retc_null();
hb_xfree( pFileName );
}
else
hb_retc( NULL );
hb_retc_null();
}
/* FileDrive( <cFile> ) --> cFileDrive
@@ -111,5 +111,5 @@ HB_FUNC( FILEDRIVE )
hb_xfree( pFileName );
}
else
hb_retc( NULL );
hb_retc_null();
}

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

@@ -217,6 +217,6 @@ HB_FUNC( ADDASCII )
else if( iNoRet )
hb_retl( 0 );
else
hb_retc( NULL );
hb_retc_null();
}
}

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

@@ -318,6 +318,6 @@ HB_FUNC( ATADJUST )
else if( HB_ISCHAR( 2 ) )
hb_retclen( hb_parc( 2 ), hb_parclen( 2 ) );
else
hb_retc( NULL );
hb_retc_null();
}
}

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

@@ -98,7 +98,7 @@ static void do_atnum( int iSwitch )
ct_error( ( USHORT ) iArgErrorMode, EG_ARG, CT_ERROR_AFTERATNUM, NULL,
HB_ERR_FUNCNAME, 0, EF_CANDEFAULT, HB_ERR_ARGS_BASEPARAMS );
}
hb_retc( NULL );
hb_retc_null();
break;
}
case DO_ATNUM_BEFORATNUM:
@@ -111,7 +111,7 @@ static void do_atnum( int iSwitch )
ct_error( ( USHORT ) iArgErrorMode, EG_ARG, CT_ERROR_BEFORATNUM, NULL,
HB_ERR_FUNCNAME, 0, EF_CANDEFAULT, HB_ERR_ARGS_BASEPARAMS );
}
hb_retc( NULL );
hb_retc_null();
break;
}
case DO_ATNUM_ATNUM:
@@ -175,7 +175,7 @@ static void do_atnum( int iSwitch )
case DO_ATNUM_BEFORATNUM:
/* AFTERATNUM */
/* BEFORATNUM */
hb_retc( NULL );
hb_retc_null();
break;
case DO_ATNUM_ATNUM:
@@ -222,7 +222,7 @@ static void do_atnum( int iSwitch )
case DO_ATNUM_BEFORATNUM:
/* AFTERATNUM */
/* BEFORATNUM */
hb_retc( NULL );
hb_retc_null();
break;
case DO_ATNUM_ATNUM:
@@ -239,7 +239,7 @@ static void do_atnum( int iSwitch )
case DO_ATNUM_AFTERATNUM:
/* AFTERATNUM */
if( pc + sMatchStrLen >= pcString + sStrLen )
hb_retc( NULL );
hb_retc_null();
else
hb_retclen( pc + sMatchStrLen, sStrLen - ( pc + sMatchStrLen - pcString ) );
break;
@@ -284,7 +284,7 @@ static void do_atnum( int iSwitch )
if( pSubst != NULL )
hb_itemReturnRelease( pSubst );
else
hb_retc( NULL );
hb_retc_null();
break;
}
case DO_ATNUM_ATNUM:

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

@@ -84,7 +84,7 @@ static void do_charevod( int iSwitch )
NULL, HB_ERR_FUNCNAME, 0, EF_CANDEFAULT,
HB_ERR_ARGS_BASEPARAMS );
}
hb_retc( NULL );
hb_retc_null();
return;
}
@@ -100,7 +100,7 @@ static void do_charevod( int iSwitch )
pcResult[sResultPos++] = pcString[sPos];
if( sResultPos == 0 )
hb_retc( NULL );
hb_retc_null();
else
hb_retclen( pcResult, sResultPos );
@@ -123,7 +123,7 @@ static void do_charevod( int iSwitch )
if( pSubst != NULL )
hb_itemReturnRelease( pSubst );
else
hb_retc( NULL );
hb_retc_null();
}
}

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

@@ -134,7 +134,7 @@ HB_FUNC( CHARMIRR )
if( iNoRet )
hb_retl( 0 );
else
hb_retc( NULL );
hb_retc_null();
return;
}
@@ -188,6 +188,6 @@ HB_FUNC( CHARMIRR )
else if( iNoRet )
hb_retl( 0 );
else
hb_retc( NULL );
hb_retc_null();
}
}

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

@@ -127,7 +127,7 @@ HB_FUNC( CHARMIX )
ct_error( ( USHORT ) iArgErrorMode, EG_ARG, CT_ERROR_CHARMIX, NULL, HB_ERR_FUNCNAME, 0,
EF_CANDEFAULT, HB_ERR_ARGS_BASEPARAMS );
}
hb_retc( NULL );
hb_retc_null();
return;
}
@@ -182,6 +182,6 @@ HB_FUNC( CHARMIX )
if( pSubst != NULL )
hb_itemReturnRelease( pSubst );
else
hb_retc( NULL );
hb_retc_null();
}
}

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

@@ -200,7 +200,7 @@ static void do_charone( int iSwitch )
if( pSubst != NULL )
hb_itemReturnRelease( pSubst );
else
hb_retc( NULL );
hb_retc_null();
}
}

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

@@ -88,7 +88,7 @@ static void do_charonly( int iSwitch )
case DO_CHARONLY_WORDONLY:
if( ( sStrLen == 0 ) || ( sOnlySetLen == 0 ) )
{
hb_retc( NULL );
hb_retc_null();
return;
}
break;
@@ -97,7 +97,7 @@ static void do_charonly( int iSwitch )
case DO_CHARONLY_WORDREM:
if( sStrLen == 0 )
{
hb_retc( NULL );
hb_retc_null();
return;
}
if( sOnlySetLen == 0 )
@@ -171,7 +171,7 @@ static void do_charonly( int iSwitch )
if( pSubst != NULL )
hb_itemReturnRelease( pSubst );
else
hb_retc( NULL );
hb_retc_null();
}
}

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

@@ -100,7 +100,7 @@ static void do_charop( int iSwitch )
}
else
{
hb_retc( NULL );
hb_retc_null();
}
return;
}

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

@@ -150,7 +150,7 @@ HB_FUNC( CHARREPL )
}
else
{
hb_retc( NULL );
hb_retc_null();
}
return;
}
@@ -241,6 +241,6 @@ HB_FUNC( CHARREPL )
else if( HB_ISCHAR( 2 ) )
hb_retclen( hb_parc( 2 ), hb_parclen( 2 ) );
else
hb_retc( NULL );
hb_retc_null();
}
}

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

@@ -237,7 +237,7 @@ HB_FUNC( CHARSORT )
if( iNoRet )
hb_retl( 0 );
else
hb_retc( NULL );
hb_retc_null();
return;
}
@@ -278,6 +278,6 @@ HB_FUNC( CHARSORT )
else if( iNoRet )
hb_retl( 0 );
else
hb_retc( NULL );
hb_retc_null();
}
}

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

@@ -59,7 +59,7 @@ HB_FUNC( CHARSPREAD )
ULONG ulLen = hb_parclen( 1 );
if( ulLen == 0 )
hb_retc( NULL );
hb_retc_null();
else
{
long lSize = hb_parnl( 2 );

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

@@ -86,7 +86,7 @@ static void do_charswap( int iSwitch )
if( iNoRet )
hb_ret();
else
hb_retc( NULL );
hb_retc_null();
return;
}
@@ -181,7 +181,7 @@ static void do_charswap( int iSwitch )
else if( iNoRet )
hb_retl( 0 );
else
hb_retc( NULL );
hb_retc_null();
}
}

8
harbour/contrib/hbct/color.c
View File

@@ -207,7 +207,7 @@ HB_FUNC( NTOCOLOR )
hb_retc( szColorString );
}
else
hb_retc( NULL );
hb_retc_null();
}
@@ -242,7 +242,7 @@ HB_FUNC( NTOCOLOR )
HB_FUNC( ENHANCED )
{
hb_gtColorSelect( HB_CLR_ENHANCED );
hb_retc( NULL );
hb_retc_null();
}
@@ -277,7 +277,7 @@ HB_FUNC( ENHANCED )
HB_FUNC( STANDARD )
{
hb_gtColorSelect( HB_CLR_STANDARD );
hb_retc( NULL );
hb_retc_null();
}
@@ -312,5 +312,5 @@ HB_FUNC( STANDARD )
HB_FUNC( UNSELECTED )
{
hb_gtColorSelect( HB_CLR_UNSELECTED );
hb_retc( NULL );
hb_retc_null();
}

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

@@ -128,5 +128,5 @@ HB_FUNC( CRYPT )
hb_retclen_buffer( ( char * ) pbyResult, ulStringLen );
}
else
hb_retc( NULL );
hb_retc_null();
}

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

@@ -131,7 +131,7 @@ HB_FUNC( SETPREC )
ct_error( ( USHORT ) iArgErrorMode, EG_ARG, CT_ERROR_SETPREC, NULL,
HB_ERR_FUNCNAME, 0, EF_CANDEFAULT, HB_ERR_ARGS_BASEPARAMS );
}
hb_retc( NULL );
hb_retc_null();
}

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

@@ -83,7 +83,7 @@ static void do_pad( int iSwitch )
HB_ERR_FUNCNAME, 0, EF_CANDEFAULT,
HB_ERR_ARGS_BASEPARAMS );
}
hb_retc( NULL );
hb_retc_null();
return;
}
sRetLen = ( size_t ) lRetLen;
@@ -140,7 +140,7 @@ static void do_pad( int iSwitch )
if( pSubst != NULL )
hb_itemReturnRelease( pSubst );
else
hb_retc( NULL );
hb_retc_null();
}
}

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

@@ -186,10 +186,10 @@ HB_FUNC( FILESTR )
hb_retclen_buffer( pcResult, lLength );
}
else
hb_retc( NULL );
hb_retc_null();
}
else
hb_retc( NULL );
hb_retc_null();
}
HB_FUNC( SCREENFILE )

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

@@ -90,7 +90,7 @@ HB_FUNC( SETCLEARA )
if( iColor >= 0 )
hb_gtSetClearColor( iColor & 0xff );
hb_retc( NULL );
hb_retc_null();
}
HB_FUNC( SETCLEARB )
@@ -106,7 +106,7 @@ HB_FUNC( SETCLEARB )
hb_gtSetClearChar( iNew & 0xff );
hb_retc( NULL );
hb_retc_null();
}
HB_FUNC( GETCLEARB )

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

@@ -81,5 +81,5 @@ HB_FUNC( RESTCURSOR )
hb_gtSetCursor( ( USHORT ) ( ( lCursor >> 16 ) & 0xff ) );
#endif
hb_retc( NULL );
hb_retc_null();
}

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

@@ -302,7 +302,7 @@ HB_FUNC( DMY )
}
else
{
hb_retc( NULL );
hb_retc_null();
}
}
@@ -386,7 +386,7 @@ HB_FUNC( MDY )
}
else
{
hb_retc( NULL );
hb_retc_null();
}
}

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

@@ -103,5 +103,5 @@ HB_FUNC( EXPAND )
}
}
else
hb_retc( NULL );
hb_retc_null();
}

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

@@ -83,7 +83,7 @@ static void do_justify( int iSwitch )
if( iNoRet )
hb_ret();
else
hb_retc( NULL );
hb_retc_null();
return;
}
@@ -159,7 +159,7 @@ static void do_justify( int iSwitch )
else if( iNoRet )
hb_ret();
else
hb_retc( NULL );
hb_retc_null();
}
}

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

@@ -73,7 +73,7 @@ HB_FUNC( COMPLEMENT )
hb_retclen_buffer( szBuffer, ulLen );
}
else
hb_retc( NULL );
hb_retc_null();
}
else if( HB_IS_DATE( pItem ) )
hb_retdl( 4537847 - hb_itemGetDL( pItem ) );
@@ -102,5 +102,5 @@ HB_FUNC( COMPLEMENT )
HB_FUNC( NUL )
{
hb_retc( NULL );
hb_retc_null();
}

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

@@ -166,7 +166,7 @@ HB_FUNC( POSCHAR )
else if( iNoRet )
hb_ret();
else
hb_retc( NULL );
hb_retc_null();
}
}
@@ -224,7 +224,7 @@ HB_FUNC( POSDEL )
if( sStrLen <= sDelLen )
{
hb_retc( NULL );
hb_retc_null();
return;
}
@@ -260,7 +260,7 @@ HB_FUNC( POSDEL )
if( pSubst != NULL )
hb_itemReturnRelease( pSubst );
else
hb_retc( NULL );
hb_retc_null();
}
}
@@ -369,7 +369,7 @@ HB_FUNC( POSINS )
if( pSubst != NULL )
hb_itemReturnRelease( pSubst );
else
hb_retc( NULL );
hb_retc_null();
}
}
@@ -532,6 +532,6 @@ HB_FUNC( POSREPL )
else if( iNoRet )
hb_ret();
else
hb_retc( NULL );
hb_retc_null();
}
}

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

@@ -154,7 +154,7 @@ HB_FUNC( RANGEREM )
else if( HB_ISCHAR( 3 ) )
hb_retclen( hb_parc( 3 ), hb_parclen( 3 ) );
else
hb_retc( NULL );
hb_retc_null();
}
}
@@ -284,6 +284,6 @@ HB_FUNC( RANGEREPL )
else if( HB_ISCHAR( 3 ) )
hb_retclen( hb_parc( 3 ), hb_parclen( 3 ) );
else
hb_retc( NULL );
hb_retc_null();
}
}

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

@@ -322,6 +322,6 @@ HB_FUNC( CHARRELREP )
else if( iNoRet )
hb_ret();
else
hb_retc( NULL );
hb_retc_null();
}
}

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

@@ -110,7 +110,7 @@ static void do_remove( int iSwitch )
}
if( sRetLen == 0 )
hb_retc( NULL );
hb_retc_null();
else
hb_retclen( pcRet, sRetLen );
}
@@ -130,7 +130,7 @@ static void do_remove( int iSwitch )
if( pSubst != NULL )
hb_itemReturnRelease( pSubst );
else
hb_retc( NULL );
hb_retc_null();
}
}

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

@@ -87,7 +87,7 @@ static void do_replace( int iSwitch )
if( iNoRet )
hb_ret();
else
hb_retc( NULL );
hb_retc_null();
return;
}
@@ -155,7 +155,7 @@ static void do_replace( int iSwitch )
else if( iNoRet )
hb_ret();
else
hb_retc( NULL );
hb_retc_null();
}
}

18
harbour/contrib/hbct/screen1.c
View File

@@ -189,7 +189,7 @@ HB_FUNC( SCREENMIX )
}
}
hb_retc( NULL );
hb_retc_null();
}
@@ -262,7 +262,7 @@ HB_FUNC( SAYSCREEN )
}
}
hb_retc( NULL );
hb_retc_null();
}
static BOOL hb_ctGetWinCord( int * piTop, int * piLeft,
@@ -344,7 +344,7 @@ HB_FUNC( CLEARWIN )
hb_gtScrollEx( iTop, iLeft, iBottom, iRight, bColor, bChar, 0, 0 );
}
hb_retc( NULL );
hb_retc_null();
}
@@ -402,7 +402,7 @@ HB_FUNC( INVERTWIN )
hb_gtEndWrite();
}
hb_retc( NULL );
hb_retc_null();
}
@@ -497,7 +497,7 @@ HB_FUNC( UNTEXTWIN )
hb_gtEndWrite();
}
hb_retc( NULL );
hb_retc_null();
}
/* $DOC$
@@ -575,7 +575,7 @@ HB_FUNC( CHARWIN )
hb_gtEndWrite();
}
hb_retc( NULL );
hb_retc_null();
}
@@ -654,7 +654,7 @@ HB_FUNC( COLORWIN )
hb_gtEndWrite();
}
hb_retc( NULL );
hb_retc_null();
}
@@ -715,7 +715,7 @@ HB_FUNC( SCREENTEXT )
hb_retclen_buffer( pBuffer, ulSize );
}
else
hb_retc( NULL );
hb_retc_null();
}
/* $DOC$
@@ -782,5 +782,5 @@ HB_FUNC( COLORREPL )
}
hb_gtEndWrite();
hb_retc( NULL );
hb_retc_null();
}

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

@@ -97,7 +97,7 @@ HB_FUNC( SAYDOWN )
}
}
hb_retc( NULL );
hb_retc_null();
}
HB_FUNC( SAYSPREAD )
@@ -151,7 +151,7 @@ HB_FUNC( SAYSPREAD )
}
}
hb_retc( NULL );
hb_retc_null();
}
HB_FUNC( SAYMOVEIN )
@@ -222,7 +222,7 @@ HB_FUNC( SAYMOVEIN )
}
}
hb_retc( NULL );
hb_retc_null();
}
HB_FUNC( CLEARSLOW )
@@ -351,7 +351,7 @@ HB_FUNC( SCREENSTR )
hb_retclen_buffer( pBuffer, ulSize );
}
else
hb_retc( NULL );
hb_retc_null();
}
HB_FUNC( STRSCREEN )
@@ -394,7 +394,7 @@ HB_FUNC( STRSCREEN )
}
}
hb_retc( NULL );
hb_retc_null();
}
/*

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

@@ -56,5 +56,5 @@
HB_FUNC( SETLASTKEY )
{
hb_inkeySetLast( hb_parni( 1 ) );
hb_retc( NULL );
hb_retc_null();
}

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

@@ -65,5 +65,5 @@ HB_FUNC( SETRC )
hb_gtSetPos( fRow ? ( SHORT ) hb_parni( 1 ) : sRow, fCol ? ( SHORT ) hb_parni( 2 ) : sCol );
}
hb_retc( NULL );
hb_retc_null();
}

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

@@ -143,7 +143,7 @@ HB_FUNC( STRSWAP )
hb_xfree( pcRet2 );
}
hb_retc( NULL );
hb_retc_null();
}
else /* ( sStrLen1 = ( size_t ) hb_parclen( 1 ) ) > 0 &&
( sStrLen2 = ( size_t ) hb_parclen( 2 ) ) > 0 */
@@ -161,6 +161,6 @@ HB_FUNC( STRSWAP )
if( pSubst != NULL )
hb_itemReturnRelease( pSubst );
else
hb_retc( NULL );
hb_retc_null();
}
}

6
harbour/contrib/hbct/tab.c
View File

@@ -259,7 +259,7 @@ HB_FUNC( TABEXPAND )
if( pSubst != NULL )
hb_itemReturnRelease( pSubst );
else
hb_retc( NULL );
hb_retc_null();
}
}
@@ -361,7 +361,7 @@ HB_FUNC( TABPACK )
if( sStrLen == 0 )
{
hb_retc( NULL );
hb_retc_null();
return;
}
/* estimate maximum return length by assuming that there's
@@ -494,6 +494,6 @@ HB_FUNC( TABPACK )
if( pSubst != NULL )
hb_itemReturnRelease( pSubst );
else
hb_retc( NULL );
hb_retc_null();
}
}

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

@@ -156,7 +156,7 @@ static void do_token1( int iSwitch )
if( iNoRef )
hb_retl( 0 );
else
hb_retc( NULL );
hb_retc_null();
return;
}
sRetStrLen = sStrLen;
@@ -205,7 +205,7 @@ static void do_token1( int iSwitch )
{
char cRet;
hb_retc( NULL );
hb_retc_null();
if( HB_ISBYREF( 5 ) )
{
cRet = ( char ) siPreSeparator;
@@ -311,7 +311,7 @@ static void do_token1( int iSwitch )
( ulToken == ulTokenCounter ) )
hb_retclen( pcSubStr, pc - pcSubStr );
else
hb_retc( NULL );
hb_retc_null();
if( HB_ISBYREF( 5 ) )
{
@@ -384,7 +384,7 @@ static void do_token1( int iSwitch )
if( pSubst != NULL )
hb_itemReturnRelease( pSubst );
else if( !iNoRef )
hb_retc( NULL );
hb_retc_null();
else
hb_retl( 0 );
break;
@@ -407,7 +407,7 @@ static void do_token1( int iSwitch )
if( pSubst != NULL )
hb_itemReturnRelease( pSubst );
else if( !iNoRef )
hb_retc( NULL );
hb_retc_null();
else
hb_retl( 0 );
break;
@@ -801,7 +801,7 @@ HB_FUNC( TOKENSEP )
hb_retclen( &cRet, 1 );
}
else
hb_retc( NULL );
hb_retc_null();
}
else
{
@@ -812,6 +812,6 @@ HB_FUNC( TOKENSEP )
hb_retclen( &cRet, 1 );
}
else
hb_retc( NULL );
hb_retc_null();
}
}

16
harbour/contrib/hbct/token2.c
View File

@@ -598,7 +598,7 @@ HB_FUNC( TOKENNEXT )
NULL, HB_ERR_FUNCNAME, 0, EF_CANDEFAULT,
HB_ERR_ARGS_BASEPARAMS );
}
hb_retc( NULL );
hb_retc_null();
return;
}
sTokenEnvironment = ( TOKEN_ENVIRONMENT ) hb_xgrab( sStrLen3 );
@@ -617,7 +617,7 @@ HB_FUNC( TOKENNEXT )
NULL, HB_ERR_FUNCNAME, 0, EF_CANDEFAULT,
HB_ERR_ARGS_BASEPARAMS );
}
hb_retc( NULL );
hb_retc_null();
return;
}
sTokenEnvironment = s_sTokenEnvironment;
@@ -650,7 +650,7 @@ HB_FUNC( TOKENNEXT )
hb_storclen( ( char * ) sTokenEnvironment, sTokEnvGetSize( sTokenEnvironment ), 3 );
hb_xfree( ( char * ) sTokenEnvironment );
}
hb_retc( NULL );
hb_retc_null();
return;
}
@@ -683,7 +683,7 @@ HB_FUNC( TOKENNEXT )
if( pSubst != NULL )
hb_itemReturnRelease( pSubst );
else
hb_retc( NULL );
hb_retc_null();
}
}
@@ -1025,7 +1025,7 @@ HB_FUNC( SAVETOKEN )
if( s_sTokenEnvironment != NULL )
hb_retclen( ( char * ) s_sTokenEnvironment, sTokEnvGetSize( s_sTokenEnvironment ) );
else
hb_retc( NULL );
hb_retc_null();
}
@@ -1088,7 +1088,7 @@ HB_FUNC( RESTTOKEN )
NULL, HB_ERR_FUNCNAME, 0, EF_CANDEFAULT,
HB_ERR_ARGS_BASEPARAMS );
}
hb_retc( NULL );
hb_retc_null();
return;
}
hb_xmemcpy( sTokenEnvironment, env, sStrLen );
@@ -1102,7 +1102,7 @@ HB_FUNC( RESTTOKEN )
if( s_sTokenEnvironment != NULL )
hb_retclen( ( char * ) s_sTokenEnvironment, sTokEnvGetSize( s_sTokenEnvironment ) );
else
hb_retc( NULL );
hb_retc_null();
sTokSet( sTokenEnvironment );
}
@@ -1120,6 +1120,6 @@ HB_FUNC( RESTTOKEN )
if( pSubst != NULL )
hb_itemReturnRelease( pSubst );
else
hb_retc( NULL );
hb_retc_null();
}
}

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

@@ -234,6 +234,6 @@ HB_FUNC( WORDREPL )
else if( HB_ISCHAR( 2 ) )
hb_retclen( hb_parc( 2 ), hb_parclen( 2 ) );
else
hb_retc( NULL );
hb_retc_null();
}
}

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

@@ -168,6 +168,6 @@ HB_FUNC( WORDTOCHAR )
else if( HB_ISCHAR( 2 ) )
hb_retclen( hb_parc( 2 ), hb_parclen( 2 ) );
else
hb_retc( NULL );
hb_retc_null();
}
}

2
harbour/contrib/hbmisc/spd.c
View File

@@ -189,7 +189,7 @@ HB_FUNC( SQL_SPRINTF )
if( !pItmFrm || (cItmFrm = hb_itemGetCPtr( pItmFrm )) == NULL ){
hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
}else if( (ulItmFrm = hb_itemGetCLen( pItmFrm )) == 0 ){
hb_retc( NULL );
hb_retc_null();
}else if( !argc ){
cRes = (char *)hb_xgrab( ulItmFrm + sizeof(char) );
memcpy( cRes, cItmFrm, ulItmFrm + sizeof(char) );

2
harbour/contrib/hbnf/ftattr.c
View File

@@ -209,7 +209,7 @@ HB_FUNC( FT_SAVEATT )
hb_retclen_buffer( pAttrib, ulSize );
}
else
hb_retc( NULL );
hb_retc_null();
}
/*

2
harbour/contrib/hbnf/n2color.c
View File

@@ -65,5 +65,5 @@ HB_FUNC( FT_N2COLOR )
hb_retc( szColorString );
}
else
hb_retc( NULL );
hb_retc_null();
}

12
harbour/contrib/hbtip/encmthd.c
View File

@@ -77,7 +77,7 @@ HB_FUNC( TIPENCODERBASE64_ENCODE )
if( ! nLen )
{
hb_retc( NULL );
hb_retc_null();
return;
}
@@ -203,7 +203,7 @@ HB_FUNC( TIPENCODERBASE64_DECODE )
if( ! nLen )
{
hb_retc( NULL );
hb_retc_null();
return;
}
@@ -301,7 +301,7 @@ HB_FUNC( TIPENCODERQP_ENCODE )
if( ! nLen )
{
hb_retc( NULL );
hb_retc_null();
return;
}
@@ -374,7 +374,7 @@ HB_FUNC( TIPENCODERQP_DECODE )
if( ! nLen )
{
hb_retc( NULL );
hb_retc_null();
return;
}
@@ -456,7 +456,7 @@ HB_FUNC( TIPENCODERURL_ENCODE )
if( ! nLen )
{
hb_retc( NULL );
hb_retc_null();
return;
}
@@ -517,7 +517,7 @@ HB_FUNC( TIPENCODERURL_DECODE )
if( ! nLen )
{
hb_retc( NULL );
hb_retc_null();
return;
}

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

@@ -846,7 +846,7 @@ HB_FUNC( TIP_HTMLSPECIALCHARS )
if ( ! nLen )
{
hb_retc( NULL );
hb_retc_null();
return;
}

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

@@ -117,6 +117,6 @@ HB_FUNC( XHB_ALLTRIM )
hb_errRT_BASE_SubstR( EG_ARG, 2022, NULL, "ALLTRIM", HB_ERR_ARGS_BASEPARAMS );
#endif
#else
hb_retc( NULL );
hb_retc_null();
#endif
}

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

@@ -88,5 +88,5 @@ HB_FUNC( STRDEL )
hb_retc( szText );
}
else
hb_retc( NULL );
hb_retc_null();
}

4
harbour/examples/hbgf/hbgfgtk/creabutt.c
View File

@@ -109,10 +109,10 @@ HB_FUNC( HB_GTKBUTTONGETTEXT )
if( Label )
hb_retc( ( char * )Label->label );
else
hb_retc( NULL );
hb_retc_null();
}
else
hb_retc( NULL );
hb_retc_null();
}
/* ********************************************************************* */

2
harbour/examples/hbgf/hbgfgtk/creawin.c
View File

@@ -224,7 +224,7 @@ HB_FUNC( HB_GTKWINDOWGETTEXT )
hb_retc( ( char * )Win->title );
}
else
hb_retc( NULL );
hb_retc_null();
}
/* ********************************************************************* */

6
harbour/examples/hbwhat/whtcdlg.c
View File

@@ -226,7 +226,7 @@ HB_FUNC( VWN__GETOPENFILENAME )
}
else
{
hb_retc( NULL );
hb_retc_null();
}
}
@@ -260,7 +260,7 @@ HB_FUNC( VWN__GETSAVEFILENAME )
}
else
{
hb_retc( NULL );
hb_retc_null();
}
}
@@ -293,7 +293,7 @@ HB_FUNC( VWN_SHBROWSEFORFOLDER )
}
else
{
hb_retc( NULL );
hb_retc_null();
}
hb_xfree( lpBuffer);

4
harbour/examples/hbwhat/whtclpb.c
View File

@@ -190,7 +190,7 @@ HB_FUNC( VWN_GETCLIPBOARDDATA )
GlobalUnlock( hMem );
}
else
hb_retc( NULL );
hb_retc_null();
break;
case CF_BITMAP:
@@ -271,7 +271,7 @@ HB_FUNC( VWN_SETCLIPBOARDDATA )
GlobalUnlock( hMem );
}
else
hb_retc( NULL );
hb_retc_null();
break;
case CF_BITMAP:

2
harbour/examples/hbwhat/whttree.c
View File

@@ -67,7 +67,7 @@ HB_FUNC( VWN_TVGETSELTEXT ) // ( hWnd ) --> cText
hb_retc( tvi.pszText );
}
else
hb_retc( NULL );
hb_retc_null();
}
//-------------------------------------------------------------------------//