From 6276c852a76bd3720500ec779ad8d4c9ae0bb89f Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 3 Jul 2009 07:56:51 +0000 Subject: [PATCH] 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() --- harbour/ChangeLog | 56 ++++++++++++++++++++++++ harbour/contrib/gtwvg/wvgutils.c | 4 +- harbour/contrib/hbclipsm/environ.c | 10 ++--- harbour/contrib/hbct/addascii.c | 2 +- harbour/contrib/hbct/atadjust.c | 2 +- harbour/contrib/hbct/atnum.c | 12 ++--- harbour/contrib/hbct/charevod.c | 6 +-- harbour/contrib/hbct/charmirr.c | 4 +- harbour/contrib/hbct/charmix.c | 4 +- harbour/contrib/hbct/charone.c | 2 +- harbour/contrib/hbct/charonly.c | 6 +-- harbour/contrib/hbct/charop.c | 2 +- harbour/contrib/hbct/charrepl.c | 4 +- harbour/contrib/hbct/charsort.c | 4 +- harbour/contrib/hbct/charsprd.c | 2 +- harbour/contrib/hbct/charswap.c | 4 +- harbour/contrib/hbct/color.c | 8 ++-- harbour/contrib/hbct/ctcrypt.c | 2 +- harbour/contrib/hbct/ctmath.c | 2 +- harbour/contrib/hbct/ctpad.c | 4 +- harbour/contrib/hbct/ctstrfil.c | 4 +- harbour/contrib/hbct/ctwfunc.c | 4 +- harbour/contrib/hbct/cursor.c | 2 +- harbour/contrib/hbct/dattime2.c | 4 +- harbour/contrib/hbct/expand.c | 2 +- harbour/contrib/hbct/justify.c | 4 +- harbour/contrib/hbct/misc2.c | 4 +- harbour/contrib/hbct/pos2.c | 10 ++--- harbour/contrib/hbct/range.c | 4 +- harbour/contrib/hbct/relation.c | 2 +- harbour/contrib/hbct/remove.c | 4 +- harbour/contrib/hbct/replace.c | 4 +- harbour/contrib/hbct/screen1.c | 18 ++++---- harbour/contrib/hbct/screen2.c | 10 ++--- harbour/contrib/hbct/setlast.c | 2 +- harbour/contrib/hbct/setrc.c | 2 +- harbour/contrib/hbct/strswap.c | 4 +- harbour/contrib/hbct/tab.c | 6 +-- harbour/contrib/hbct/token1.c | 14 +++--- harbour/contrib/hbct/token2.c | 16 +++---- harbour/contrib/hbct/wordrepl.c | 2 +- harbour/contrib/hbct/wordtoch.c | 2 +- harbour/contrib/hbmisc/spd.c | 2 +- harbour/contrib/hbnf/ftattr.c | 2 +- harbour/contrib/hbnf/n2color.c | 2 +- harbour/contrib/hbtip/encmthd.c | 12 ++--- harbour/contrib/hbtip/utils.c | 2 +- harbour/contrib/xhb/xhbtrim.c | 2 +- harbour/contrib/xhb/xstrdel.c | 2 +- harbour/examples/hbgf/hbgfgtk/creabutt.c | 4 +- harbour/examples/hbgf/hbgfgtk/creawin.c | 2 +- harbour/examples/hbwhat/whtcdlg.c | 6 +-- harbour/examples/hbwhat/whtclpb.c | 4 +- harbour/examples/hbwhat/whttree.c | 2 +- 54 files changed, 181 insertions(+), 125 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index b7343c0f42..f1ae2a8402 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -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. diff --git a/harbour/contrib/gtwvg/wvgutils.c b/harbour/contrib/gtwvg/wvgutils.c index 5ce87e7c3c..0531e8ba75 100644 --- a/harbour/contrib/gtwvg/wvgutils.c +++ b/harbour/contrib/gtwvg/wvgutils.c @@ -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 ); diff --git a/harbour/contrib/hbclipsm/environ.c b/harbour/contrib/hbclipsm/environ.c index ff4d5b14fb..488e3f7ed8 100644 --- a/harbour/contrib/hbclipsm/environ.c +++ b/harbour/contrib/hbclipsm/environ.c @@ -66,7 +66,7 @@ HB_FUNC( FILEPATH ) hb_xfree( pFileName ); } else - hb_retc( NULL ); + hb_retc_null(); } /* FileBase( ) --> cFileBase @@ -80,7 +80,7 @@ HB_FUNC( FILEBASE ) hb_xfree( pFileName ); } else - hb_retc( NULL ); + hb_retc_null(); } /* FileExt( ) --> 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( ) --> cFileDrive @@ -111,5 +111,5 @@ HB_FUNC( FILEDRIVE ) hb_xfree( pFileName ); } else - hb_retc( NULL ); + hb_retc_null(); } diff --git a/harbour/contrib/hbct/addascii.c b/harbour/contrib/hbct/addascii.c index a2a75ada36..a32a62f237 100644 --- a/harbour/contrib/hbct/addascii.c +++ b/harbour/contrib/hbct/addascii.c @@ -217,6 +217,6 @@ HB_FUNC( ADDASCII ) else if( iNoRet ) hb_retl( 0 ); else - hb_retc( NULL ); + hb_retc_null(); } } diff --git a/harbour/contrib/hbct/atadjust.c b/harbour/contrib/hbct/atadjust.c index 3dad5ae065..74ab537c1b 100644 --- a/harbour/contrib/hbct/atadjust.c +++ b/harbour/contrib/hbct/atadjust.c @@ -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(); } } diff --git a/harbour/contrib/hbct/atnum.c b/harbour/contrib/hbct/atnum.c index 237b5617a0..41e1c39b85 100644 --- a/harbour/contrib/hbct/atnum.c +++ b/harbour/contrib/hbct/atnum.c @@ -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: diff --git a/harbour/contrib/hbct/charevod.c b/harbour/contrib/hbct/charevod.c index 46099dae3f..5b3a6b25d1 100644 --- a/harbour/contrib/hbct/charevod.c +++ b/harbour/contrib/hbct/charevod.c @@ -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(); } } diff --git a/harbour/contrib/hbct/charmirr.c b/harbour/contrib/hbct/charmirr.c index 3707ecfc54..d38f83d17b 100644 --- a/harbour/contrib/hbct/charmirr.c +++ b/harbour/contrib/hbct/charmirr.c @@ -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(); } } diff --git a/harbour/contrib/hbct/charmix.c b/harbour/contrib/hbct/charmix.c index 2dee1d0d01..4c45e6bc1c 100644 --- a/harbour/contrib/hbct/charmix.c +++ b/harbour/contrib/hbct/charmix.c @@ -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(); } } diff --git a/harbour/contrib/hbct/charone.c b/harbour/contrib/hbct/charone.c index 3d831978a6..3d1fc9ee1a 100644 --- a/harbour/contrib/hbct/charone.c +++ b/harbour/contrib/hbct/charone.c @@ -200,7 +200,7 @@ static void do_charone( int iSwitch ) if( pSubst != NULL ) hb_itemReturnRelease( pSubst ); else - hb_retc( NULL ); + hb_retc_null(); } } diff --git a/harbour/contrib/hbct/charonly.c b/harbour/contrib/hbct/charonly.c index 22f347d6e7..fc3a070bcb 100644 --- a/harbour/contrib/hbct/charonly.c +++ b/harbour/contrib/hbct/charonly.c @@ -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(); } } diff --git a/harbour/contrib/hbct/charop.c b/harbour/contrib/hbct/charop.c index 8c01c5cf6b..8a8805ab3d 100644 --- a/harbour/contrib/hbct/charop.c +++ b/harbour/contrib/hbct/charop.c @@ -100,7 +100,7 @@ static void do_charop( int iSwitch ) } else { - hb_retc( NULL ); + hb_retc_null(); } return; } diff --git a/harbour/contrib/hbct/charrepl.c b/harbour/contrib/hbct/charrepl.c index a5c44fabba..059e9e04f7 100644 --- a/harbour/contrib/hbct/charrepl.c +++ b/harbour/contrib/hbct/charrepl.c @@ -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(); } } diff --git a/harbour/contrib/hbct/charsort.c b/harbour/contrib/hbct/charsort.c index 74921710cc..f04b6c714d 100644 --- a/harbour/contrib/hbct/charsort.c +++ b/harbour/contrib/hbct/charsort.c @@ -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(); } } diff --git a/harbour/contrib/hbct/charsprd.c b/harbour/contrib/hbct/charsprd.c index e28d35218b..503814b6ca 100644 --- a/harbour/contrib/hbct/charsprd.c +++ b/harbour/contrib/hbct/charsprd.c @@ -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 ); diff --git a/harbour/contrib/hbct/charswap.c b/harbour/contrib/hbct/charswap.c index ab85054b8d..030a942614 100644 --- a/harbour/contrib/hbct/charswap.c +++ b/harbour/contrib/hbct/charswap.c @@ -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(); } } diff --git a/harbour/contrib/hbct/color.c b/harbour/contrib/hbct/color.c index 111ee08524..5171da9624 100644 --- a/harbour/contrib/hbct/color.c +++ b/harbour/contrib/hbct/color.c @@ -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(); } diff --git a/harbour/contrib/hbct/ctcrypt.c b/harbour/contrib/hbct/ctcrypt.c index 6cec2f32a4..d1959dfe20 100644 --- a/harbour/contrib/hbct/ctcrypt.c +++ b/harbour/contrib/hbct/ctcrypt.c @@ -128,5 +128,5 @@ HB_FUNC( CRYPT ) hb_retclen_buffer( ( char * ) pbyResult, ulStringLen ); } else - hb_retc( NULL ); + hb_retc_null(); } diff --git a/harbour/contrib/hbct/ctmath.c b/harbour/contrib/hbct/ctmath.c index dfc29b61d0..4cd4b1960c 100644 --- a/harbour/contrib/hbct/ctmath.c +++ b/harbour/contrib/hbct/ctmath.c @@ -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(); } diff --git a/harbour/contrib/hbct/ctpad.c b/harbour/contrib/hbct/ctpad.c index c000fb62e5..53af6255af 100644 --- a/harbour/contrib/hbct/ctpad.c +++ b/harbour/contrib/hbct/ctpad.c @@ -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(); } } diff --git a/harbour/contrib/hbct/ctstrfil.c b/harbour/contrib/hbct/ctstrfil.c index ed30b31e55..cefeea710e 100644 --- a/harbour/contrib/hbct/ctstrfil.c +++ b/harbour/contrib/hbct/ctstrfil.c @@ -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 ) diff --git a/harbour/contrib/hbct/ctwfunc.c b/harbour/contrib/hbct/ctwfunc.c index 9d89fd6d3f..f45f52f089 100644 --- a/harbour/contrib/hbct/ctwfunc.c +++ b/harbour/contrib/hbct/ctwfunc.c @@ -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 ) diff --git a/harbour/contrib/hbct/cursor.c b/harbour/contrib/hbct/cursor.c index 54ce72d01b..944a8347a9 100644 --- a/harbour/contrib/hbct/cursor.c +++ b/harbour/contrib/hbct/cursor.c @@ -81,5 +81,5 @@ HB_FUNC( RESTCURSOR ) hb_gtSetCursor( ( USHORT ) ( ( lCursor >> 16 ) & 0xff ) ); #endif - hb_retc( NULL ); + hb_retc_null(); } diff --git a/harbour/contrib/hbct/dattime2.c b/harbour/contrib/hbct/dattime2.c index 5e8beeef12..aca63462ff 100644 --- a/harbour/contrib/hbct/dattime2.c +++ b/harbour/contrib/hbct/dattime2.c @@ -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(); } } diff --git a/harbour/contrib/hbct/expand.c b/harbour/contrib/hbct/expand.c index 7d6d1671f3..ba01e28cd1 100644 --- a/harbour/contrib/hbct/expand.c +++ b/harbour/contrib/hbct/expand.c @@ -103,5 +103,5 @@ HB_FUNC( EXPAND ) } } else - hb_retc( NULL ); + hb_retc_null(); } diff --git a/harbour/contrib/hbct/justify.c b/harbour/contrib/hbct/justify.c index 6a9f968077..6b52f21628 100644 --- a/harbour/contrib/hbct/justify.c +++ b/harbour/contrib/hbct/justify.c @@ -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(); } } diff --git a/harbour/contrib/hbct/misc2.c b/harbour/contrib/hbct/misc2.c index 81686d6147..2f42675b4f 100644 --- a/harbour/contrib/hbct/misc2.c +++ b/harbour/contrib/hbct/misc2.c @@ -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(); } diff --git a/harbour/contrib/hbct/pos2.c b/harbour/contrib/hbct/pos2.c index 094991dae7..2f682c0d80 100644 --- a/harbour/contrib/hbct/pos2.c +++ b/harbour/contrib/hbct/pos2.c @@ -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(); } } diff --git a/harbour/contrib/hbct/range.c b/harbour/contrib/hbct/range.c index fa0f58bb40..6a173b68a6 100644 --- a/harbour/contrib/hbct/range.c +++ b/harbour/contrib/hbct/range.c @@ -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(); } } diff --git a/harbour/contrib/hbct/relation.c b/harbour/contrib/hbct/relation.c index 0708dbc509..7fd0fb1403 100644 --- a/harbour/contrib/hbct/relation.c +++ b/harbour/contrib/hbct/relation.c @@ -322,6 +322,6 @@ HB_FUNC( CHARRELREP ) else if( iNoRet ) hb_ret(); else - hb_retc( NULL ); + hb_retc_null(); } } diff --git a/harbour/contrib/hbct/remove.c b/harbour/contrib/hbct/remove.c index f13ebd3bd0..7f66d8f610 100644 --- a/harbour/contrib/hbct/remove.c +++ b/harbour/contrib/hbct/remove.c @@ -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(); } } diff --git a/harbour/contrib/hbct/replace.c b/harbour/contrib/hbct/replace.c index 781269f6d5..53ca889d7b 100644 --- a/harbour/contrib/hbct/replace.c +++ b/harbour/contrib/hbct/replace.c @@ -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(); } } diff --git a/harbour/contrib/hbct/screen1.c b/harbour/contrib/hbct/screen1.c index 8e97193a10..87c92a3028 100644 --- a/harbour/contrib/hbct/screen1.c +++ b/harbour/contrib/hbct/screen1.c @@ -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(); } diff --git a/harbour/contrib/hbct/screen2.c b/harbour/contrib/hbct/screen2.c index ffcc1cb3cc..dd8c05a380 100644 --- a/harbour/contrib/hbct/screen2.c +++ b/harbour/contrib/hbct/screen2.c @@ -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(); } /* diff --git a/harbour/contrib/hbct/setlast.c b/harbour/contrib/hbct/setlast.c index 5e5031573f..930d0f588b 100644 --- a/harbour/contrib/hbct/setlast.c +++ b/harbour/contrib/hbct/setlast.c @@ -56,5 +56,5 @@ HB_FUNC( SETLASTKEY ) { hb_inkeySetLast( hb_parni( 1 ) ); - hb_retc( NULL ); + hb_retc_null(); } diff --git a/harbour/contrib/hbct/setrc.c b/harbour/contrib/hbct/setrc.c index be90a375e0..80d45fc043 100644 --- a/harbour/contrib/hbct/setrc.c +++ b/harbour/contrib/hbct/setrc.c @@ -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(); } diff --git a/harbour/contrib/hbct/strswap.c b/harbour/contrib/hbct/strswap.c index 9ddb123e27..3c14016e10 100644 --- a/harbour/contrib/hbct/strswap.c +++ b/harbour/contrib/hbct/strswap.c @@ -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(); } } diff --git a/harbour/contrib/hbct/tab.c b/harbour/contrib/hbct/tab.c index 75cfd40dc8..f28d508a04 100644 --- a/harbour/contrib/hbct/tab.c +++ b/harbour/contrib/hbct/tab.c @@ -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(); } } diff --git a/harbour/contrib/hbct/token1.c b/harbour/contrib/hbct/token1.c index 93f59d446e..2a119730b7 100644 --- a/harbour/contrib/hbct/token1.c +++ b/harbour/contrib/hbct/token1.c @@ -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(); } } diff --git a/harbour/contrib/hbct/token2.c b/harbour/contrib/hbct/token2.c index 87890c3ff6..88c9c75db3 100644 --- a/harbour/contrib/hbct/token2.c +++ b/harbour/contrib/hbct/token2.c @@ -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(); } } diff --git a/harbour/contrib/hbct/wordrepl.c b/harbour/contrib/hbct/wordrepl.c index 1d34887eee..4d7dc21954 100644 --- a/harbour/contrib/hbct/wordrepl.c +++ b/harbour/contrib/hbct/wordrepl.c @@ -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(); } } diff --git a/harbour/contrib/hbct/wordtoch.c b/harbour/contrib/hbct/wordtoch.c index 78b4836275..5474e9ad42 100644 --- a/harbour/contrib/hbct/wordtoch.c +++ b/harbour/contrib/hbct/wordtoch.c @@ -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(); } } diff --git a/harbour/contrib/hbmisc/spd.c b/harbour/contrib/hbmisc/spd.c index 03293d2b8a..6c5ab1c1c9 100644 --- a/harbour/contrib/hbmisc/spd.c +++ b/harbour/contrib/hbmisc/spd.c @@ -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) ); diff --git a/harbour/contrib/hbnf/ftattr.c b/harbour/contrib/hbnf/ftattr.c index 68d40eeae5..99533d27ac 100644 --- a/harbour/contrib/hbnf/ftattr.c +++ b/harbour/contrib/hbnf/ftattr.c @@ -209,7 +209,7 @@ HB_FUNC( FT_SAVEATT ) hb_retclen_buffer( pAttrib, ulSize ); } else - hb_retc( NULL ); + hb_retc_null(); } /* diff --git a/harbour/contrib/hbnf/n2color.c b/harbour/contrib/hbnf/n2color.c index 4d74090054..7db4b74fc9 100644 --- a/harbour/contrib/hbnf/n2color.c +++ b/harbour/contrib/hbnf/n2color.c @@ -65,5 +65,5 @@ HB_FUNC( FT_N2COLOR ) hb_retc( szColorString ); } else - hb_retc( NULL ); + hb_retc_null(); } diff --git a/harbour/contrib/hbtip/encmthd.c b/harbour/contrib/hbtip/encmthd.c index 7837063ca5..ed3f331e43 100644 --- a/harbour/contrib/hbtip/encmthd.c +++ b/harbour/contrib/hbtip/encmthd.c @@ -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; } diff --git a/harbour/contrib/hbtip/utils.c b/harbour/contrib/hbtip/utils.c index bad49d5276..5f4deb67fb 100644 --- a/harbour/contrib/hbtip/utils.c +++ b/harbour/contrib/hbtip/utils.c @@ -846,7 +846,7 @@ HB_FUNC( TIP_HTMLSPECIALCHARS ) if ( ! nLen ) { - hb_retc( NULL ); + hb_retc_null(); return; } diff --git a/harbour/contrib/xhb/xhbtrim.c b/harbour/contrib/xhb/xhbtrim.c index cfd1502cd7..27bd053437 100644 --- a/harbour/contrib/xhb/xhbtrim.c +++ b/harbour/contrib/xhb/xhbtrim.c @@ -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 } diff --git a/harbour/contrib/xhb/xstrdel.c b/harbour/contrib/xhb/xstrdel.c index 7e11a8a7f7..10f116876a 100644 --- a/harbour/contrib/xhb/xstrdel.c +++ b/harbour/contrib/xhb/xstrdel.c @@ -88,5 +88,5 @@ HB_FUNC( STRDEL ) hb_retc( szText ); } else - hb_retc( NULL ); + hb_retc_null(); } diff --git a/harbour/examples/hbgf/hbgfgtk/creabutt.c b/harbour/examples/hbgf/hbgfgtk/creabutt.c index d644911207..4f62b9e104 100644 --- a/harbour/examples/hbgf/hbgfgtk/creabutt.c +++ b/harbour/examples/hbgf/hbgfgtk/creabutt.c @@ -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(); } /* ********************************************************************* */ diff --git a/harbour/examples/hbgf/hbgfgtk/creawin.c b/harbour/examples/hbgf/hbgfgtk/creawin.c index 3af46ea629..4236b9cbea 100644 --- a/harbour/examples/hbgf/hbgfgtk/creawin.c +++ b/harbour/examples/hbgf/hbgfgtk/creawin.c @@ -224,7 +224,7 @@ HB_FUNC( HB_GTKWINDOWGETTEXT ) hb_retc( ( char * )Win->title ); } else - hb_retc( NULL ); + hb_retc_null(); } /* ********************************************************************* */ diff --git a/harbour/examples/hbwhat/whtcdlg.c b/harbour/examples/hbwhat/whtcdlg.c index 38fb302be5..c1ef70f035 100644 --- a/harbour/examples/hbwhat/whtcdlg.c +++ b/harbour/examples/hbwhat/whtcdlg.c @@ -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); diff --git a/harbour/examples/hbwhat/whtclpb.c b/harbour/examples/hbwhat/whtclpb.c index e0aadf62ae..b9ce35d707 100644 --- a/harbour/examples/hbwhat/whtclpb.c +++ b/harbour/examples/hbwhat/whtclpb.c @@ -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: diff --git a/harbour/examples/hbwhat/whttree.c b/harbour/examples/hbwhat/whttree.c index e66308255a..dd12cc18ba 100644 --- a/harbour/examples/hbwhat/whttree.c +++ b/harbour/examples/hbwhat/whttree.c @@ -67,7 +67,7 @@ HB_FUNC( VWN_TVGETSELTEXT ) // ( hWnd ) --> cText hb_retc( tvi.pszText ); } else - hb_retc( NULL ); + hb_retc_null(); } //-------------------------------------------------------------------------//