From 69205770d7fe418ae291a2372b974abd943ebfec Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 25 Jun 2009 11:41:11 +0000 Subject: [PATCH] 2009-06-25 13:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbmzip/hbmzip.c * contrib/hbblat/blatwrp.c * contrib/hbfbird/firebird.c * contrib/xpp/dbcmdx.c * contrib/xpp/philesx.c * contrib/rddsql/sqlbase.c * contrib/rddsql/sqlmix.c * contrib/gtwvg/gtwvg.h * contrib/gtwvg/wvgcore.c * contrib/gtwvg/wvgwing.c * contrib/hbclipsm/time.c * contrib/rddads/adsfunc.c * contrib/rddads/ads1.c * contrib/hbgd/gdwrp.c * contrib/hbtip/utils.c * contrib/hbtip/base64x.c * contrib/hbtip/encmthd.c * 'const' cleanup. ; NOTE: I've left some warnings which I couldn't fix, and there were also cases where code modification will be needed due to existing bugs now revealed. --- harbour/ChangeLog | 23 +++++++++++++++++++++++ harbour/contrib/gtwvg/gtwvg.h | 4 ++-- harbour/contrib/gtwvg/wvgcore.c | 4 ++-- harbour/contrib/gtwvg/wvgwing.c | 4 ++-- harbour/contrib/hbblat/blatwrp.c | 23 ++++------------------- harbour/contrib/hbclipsm/time.c | 2 +- harbour/contrib/hbfbird/firebird.c | 16 ++++++++-------- harbour/contrib/hbgd/gdwrp.c | 22 +++++++++------------- harbour/contrib/hbmzip/hbmzip.c | 4 ++-- harbour/contrib/hbtip/base64x.c | 2 +- harbour/contrib/hbtip/encmthd.c | 14 +++++++------- harbour/contrib/hbtip/utils.c | 10 +++++----- harbour/contrib/rddads/ads1.c | 13 ++++++++----- harbour/contrib/rddads/adsfunc.c | 28 ++++++++++++++-------------- harbour/contrib/rddsql/sqlbase.c | 6 +++--- harbour/contrib/rddsql/sqlmix.c | 2 +- harbour/contrib/xpp/dbcmdx.c | 4 ++-- harbour/contrib/xpp/philesx.c | 3 ++- 18 files changed, 96 insertions(+), 88 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 83c4ddd706..19686008c8 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,29 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-06-25 13:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbmzip/hbmzip.c + * contrib/hbblat/blatwrp.c + * contrib/hbfbird/firebird.c + * contrib/xpp/dbcmdx.c + * contrib/xpp/philesx.c + * contrib/rddsql/sqlbase.c + * contrib/rddsql/sqlmix.c + * contrib/gtwvg/gtwvg.h + * contrib/gtwvg/wvgcore.c + * contrib/gtwvg/wvgwing.c + * contrib/hbclipsm/time.c + * contrib/rddads/adsfunc.c + * contrib/rddads/ads1.c + * contrib/hbgd/gdwrp.c + * contrib/hbtip/utils.c + * contrib/hbtip/base64x.c + * contrib/hbtip/encmthd.c + * 'const' cleanup. + ; NOTE: I've left some warnings which I couldn't fix, + and there were also cases where code modification + will be needed due to existing bugs now revealed. + 2009-06-25 12:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * INSTALL * Minor diff --git a/harbour/contrib/gtwvg/gtwvg.h b/harbour/contrib/gtwvg/gtwvg.h index 454c49199f..17a0521c04 100644 --- a/harbour/contrib/gtwvg/gtwvg.h +++ b/harbour/contrib/gtwvg/gtwvg.h @@ -596,12 +596,12 @@ typedef struct _tag_HB_GT_COLDEF POINT HB_EXPORT hb_wvt_gtGetXYFromColRow( USHORT col, USHORT row ); #if ! defined( HB_OS_WIN_CE ) -IPicture HB_EXPORT * hb_wvt_gtLoadPicture( char * image ); +IPicture HB_EXPORT * hb_wvt_gtLoadPicture( const char * image ); IPicture HB_EXPORT * hb_wvt_gtLoadPictureFromResource( LPCSTR cResource, LPCSTR cSection ); BOOL HB_EXPORT hb_wvt_gtRenderPicture( int x1, int y1, int wd, int ht, IPicture * iPicture ); BOOL HB_EXPORT hb_wvt_gtDestroyPicture( IPicture * iPicture ); #endif -BOOL HB_EXPORT hb_wvt_DrawImage( HDC hdc, int x1, int y1, int wd, int ht, char * image ); +BOOL HB_EXPORT hb_wvt_DrawImage( HDC hdc, int x1, int y1, int wd, int ht, const char * image ); void HB_EXPORT hb_wvt_GetStringAttrib( USHORT top, USHORT left, USHORT bottom, USHORT right, BYTE * sBuffer, BYTE * sAttrib ); void HB_EXPORT hb_wvt_PutStringAttrib( USHORT top, USHORT left, USHORT bottom, USHORT right, BYTE * sBuffer, BYTE * sAttrib ); diff --git a/harbour/contrib/gtwvg/wvgcore.c b/harbour/contrib/gtwvg/wvgcore.c index a53f8e159e..fecb6e3afc 100644 --- a/harbour/contrib/gtwvg/wvgcore.c +++ b/harbour/contrib/gtwvg/wvgcore.c @@ -189,7 +189,7 @@ IPicture * hb_wvt_gtLoadPictureFromResource( LPCSTR cResource, LPCSTR cSection ) /*--------------------------------------------------------------------*/ -IPicture * hb_wvt_gtLoadPicture( char * cImage ) +IPicture * hb_wvt_gtLoadPicture( const char * cImage ) { IStream *iStream; LPVOID iPicture = NULL; @@ -584,7 +584,7 @@ BOOL CALLBACK hb_wvt_gtDlgProcModal( HWND hDlg, UINT message, WPARAM wParam, LPA /*----------------------------------------------------------------------*/ -BOOL hb_wvt_DrawImage( HDC hdc, int x1, int y1, int wd, int ht, char * image ) +BOOL hb_wvt_DrawImage( HDC hdc, int x1, int y1, int wd, int ht, const char * image ) { #if ! defined( HB_OS_WIN_CE ) HGLOBAL hGlobal; diff --git a/harbour/contrib/gtwvg/wvgwing.c b/harbour/contrib/gtwvg/wvgwing.c index 2c335efc8b..b1d2168d91 100644 --- a/harbour/contrib/gtwvg/wvgwing.c +++ b/harbour/contrib/gtwvg/wvgwing.c @@ -282,7 +282,7 @@ static BYTE * PackedDibGetBitsPtr( BITMAPINFO * pPackedDib ) PackedDibGetColorTableSize( pPackedDib ); } #endif -static HBITMAP hPrepareBitmap( char * szBitmapX, UINT uiBitmap, +static HBITMAP hPrepareBitmap( const char * szBitmapX, UINT uiBitmap, int iExpWidth, int iExpHeight, BOOL bMap3Dcolors, HWND hCtrl, @@ -461,7 +461,7 @@ HB_FUNC( WVG_PREPAREBITMAPFROMRESOURCEID ) { HBITMAP hBitmap; - hBitmap = hPrepareBitmap( ( char * ) NULL, hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parl( 4 ), + hBitmap = hPrepareBitmap( NULL, hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parl( 4 ), ( HWND ) ( HB_PTRDIFF ) hb_parnint( 5 ), 2 ); hb_retptr( ( void * ) hBitmap ); diff --git a/harbour/contrib/hbblat/blatwrp.c b/harbour/contrib/hbblat/blatwrp.c index fa8ebea902..4468a8af4e 100644 --- a/harbour/contrib/hbblat/blatwrp.c +++ b/harbour/contrib/hbblat/blatwrp.c @@ -60,32 +60,17 @@ HB_EXTERN_BEGIN -extern int cSend( char * szCmd ); +extern int cSend( const char * szCmd ); HB_EXTERN_END /* ---------------------------------------------------------------------------*/ -HB_FUNC( HB_BLATSEND ) // void BlatSend( char *szCmd ) +HB_FUNC( HB_BLATSEND ) { - if ( hb_pcount() == 1 && - hb_parinfo( 1 ) & HB_IT_STRING - ) - { - char *szCmd; - int iRet; - - /* Retrieve command */ - szCmd = hb_parcx( 1 ); - - /* Send command to blat */ - iRet = cSend( szCmd ); - - /* Return result */ - hb_retni( iRet ); - } + if( HB_ISCHAR( 1 ) ) + hb_retni( cSend( hb_parc( 1 ) ) ); else - /* Parameter error */ hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS ); } diff --git a/harbour/contrib/hbclipsm/time.c b/harbour/contrib/hbclipsm/time.c index 121803d528..32dfc28446 100644 --- a/harbour/contrib/hbclipsm/time.c +++ b/harbour/contrib/hbclipsm/time.c @@ -98,7 +98,7 @@ HB_FUNC( TIMEDIFF ) */ HB_FUNC( TIMEISVALID ) { - char * pszTime = hb_parc( 1 ); + const char * pszTime = hb_parc( 1 ); BOOL bRet = FALSE; if( pszTime ) diff --git a/harbour/contrib/hbfbird/firebird.c b/harbour/contrib/hbfbird/firebird.c index c7ac408132..af7416a8c0 100644 --- a/harbour/contrib/hbfbird/firebird.c +++ b/harbour/contrib/hbfbird/firebird.c @@ -86,11 +86,11 @@ HB_FUNC( FBCREATEDB ) ISC_STATUS status[ 20 ]; char create_db[ MAX_BUFFER ]; - char * db_name = hb_parcx( 1 ); - char * user = hb_parcx( 2 ); - char * pass = hb_parcx( 3 ); + const char * db_name = hb_parcx( 1 ); + const char * user = hb_parcx( 2 ); + const char * pass = hb_parcx( 3 ); int page = hb_parni( 4 ); - char * charset = hb_parcx( 5 ); + const char * charset = hb_parcx( 5 ); unsigned short dialect = ( unsigned short ) hb_parni( 6 ); hb_snprintf( create_db, sizeof( create_db ), @@ -110,9 +110,9 @@ HB_FUNC( FBCONNECT ) { ISC_STATUS status[ MAX_FIELDS ]; isc_db_handle db = NULL; - char * db_connect = hb_parcx( 1 ); - char * user = hb_parcx( 2 ); - char * passwd = hb_parcx( 3 ); + const char * db_connect = hb_parcx( 1 ); + const char * user = hb_parcx( 2 ); + const char * passwd = hb_parcx( 3 ); char dpb[ 128 ]; short i = 0; int len; @@ -202,7 +202,7 @@ HB_FUNC( FBEXECUTE ) { isc_db_handle db = ( isc_db_handle ) hb_parptr( 1 ); isc_tr_handle trans = NULL; - char * exec_str = hb_parcx( 2 ); + const char * exec_str = hb_parcx( 2 ); ISC_STATUS status[ 20 ]; ISC_STATUS status_rollback[ 20 ]; unsigned short dialect = ( unsigned short ) hb_parni( 3 ); diff --git a/harbour/contrib/hbgd/gdwrp.c b/harbour/contrib/hbgd/gdwrp.c index 1e68694e25..148bb826f6 100644 --- a/harbour/contrib/hbgd/gdwrp.c +++ b/harbour/contrib/hbgd/gdwrp.c @@ -259,7 +259,7 @@ static void * LoadImageFromHandle( HB_FHANDLE fhandle, int sz ) /* ---------------------------------------------------------------------------*/ -static void * LoadImageFromFile( char *szFile, int *sz ) +static void * LoadImageFromFile( const char *szFile, int *sz ) { void * iptr; HB_FHANDLE fhandle; @@ -303,7 +303,7 @@ static void SaveImageToHandle( HB_FHANDLE fhandle, void *iptr, int sz ) /* ---------------------------------------------------------------------------*/ -static void SaveImageToFile( char *szFile, void *iptr, int sz ) +static void SaveImageToFile( const char *szFile, void *iptr, int sz ) { HB_FHANDLE fhandle; @@ -322,7 +322,7 @@ static void SaveImageToFile( char *szFile, void *iptr, int sz ) static void GDImageCreateFrom( int nType ) { gdImagePtr im = NULL; - char *szFile; + const char *szFile; int sz; void * iptr; @@ -419,7 +419,6 @@ static void GDImageSaveTo( int nType ) ) { gdImagePtr im; - char *szFile; int sz = 0; void *iptr = NULL; HB_FHANDLE fhandle; @@ -518,7 +517,7 @@ static void GDImageSaveTo( int nType ) /* If i get a file name */ if( hb_parinfo( 2 ) & HB_IT_STRING ) { - szFile = hb_parcx( 2 ); + const char *szFile = hb_parcx( 2 ); SaveImageToFile( szFile, iptr, sz ); } @@ -2770,7 +2769,7 @@ HB_FUNC( GDIMAGESTRINGFTCIRCLE ) /* char *gdImageStringFTCircle(gdImagePtr im, i int cx, cy; double radius, textRadius, fillPortion, points; char *top; - char *bottom; + const char *bottom; int fgcolor; char *font; char *err; @@ -3939,7 +3938,7 @@ HB_FUNC( GDIMAGEINTERLACE ) /* void gdImageInterlace(gdImagePtr im, int interlac #if HB_GD_VERS( 2, 0, 33 ) -static void AddImageToFile( char *szFile, void *iptr, int sz ) +static void AddImageToFile( const char *szFile, void *iptr, int sz ) { HB_FHANDLE fhandle; @@ -3987,8 +3986,7 @@ HB_FUNC( GDIMAGEGIFANIMBEGIN ) /* Check if 2nd parameter is a file name or an handle */ if( hb_parinfo( 2 ) & HB_IT_STRING ) { - char *szFile; - szFile = hb_parcx( 2 ); + const char *szFile = hb_parcx( 2 ); SaveImageToFile( szFile, iptr, size ); } @@ -4054,8 +4052,7 @@ HB_FUNC( GDIMAGEGIFANIMADD ) /* Check if 2nd parameter is a file name or an handle */ if( hb_parinfo( 2 ) & HB_IT_STRING ) { - char * szFile; - szFile = hb_parcx( 2 ); + const char * szFile = hb_parcx( 2 ); AddImageToFile( szFile, iptr, size ); } @@ -4104,8 +4101,7 @@ HB_FUNC( GDIMAGEGIFANIMEND ) /* Check if 1st parameter is a file name or an handle */ if( hb_parinfo( 1 ) & HB_IT_STRING ) { - char * szFile; - szFile = hb_parcx( 1 ); + const char * szFile = hb_parcx( 1 ); AddImageToFile( szFile, iptr, size ); } diff --git a/harbour/contrib/hbmzip/hbmzip.c b/harbour/contrib/hbmzip/hbmzip.c index a5d627ce1b..b651938b99 100644 --- a/harbour/contrib/hbmzip/hbmzip.c +++ b/harbour/contrib/hbmzip/hbmzip.c @@ -1499,8 +1499,8 @@ static int hb_zipDeleteFile( const char* szZipFile, const char* szFileMask ) /* HB_ZipDeleteFile( cZipFile, cFileMask ) --> nError */ HB_FUNC( HB_ZIPDELETEFILE ) { - char * szZipFile = hb_parc( 1 ); - char * szFileMask = hb_parc( 2 ); + const char * szZipFile = hb_parc( 1 ); + const char * szFileMask = hb_parc( 2 ); if( szZipFile && szFileMask ) hb_retni( hb_zipDeleteFile( szZipFile, szFileMask ) ); diff --git a/harbour/contrib/hbtip/base64x.c b/harbour/contrib/hbtip/base64x.c index 21e462561b..c1e6fa8e22 100644 --- a/harbour/contrib/hbtip/base64x.c +++ b/harbour/contrib/hbtip/base64x.c @@ -59,7 +59,7 @@ HB_FUNC( HB_BASE64 ) if( len <= INT_MAX ) /* TOFIX */ { - char * s = hb_parcx( 1 ); + const char * s = hb_parcx( 1 ); char * t, * p; t = p = ( char * ) hb_xgrab( ( 4 * ( ( len + 2 ) / 3 ) + 1 ) * sizeof( *t ) ); diff --git a/harbour/contrib/hbtip/encmthd.c b/harbour/contrib/hbtip/encmthd.c index 37ef10310c..7837063ca5 100644 --- a/harbour/contrib/hbtip/encmthd.c +++ b/harbour/contrib/hbtip/encmthd.c @@ -59,7 +59,7 @@ HB_FUNC( TIPENCODERBASE64_ENCODE ) { - char *cData = hb_parc( 1 ); + const char *cData = hb_parc( 1 ); char *cRet; int nLen = hb_parclen( 1 ); int nPos = 0, nPosRet = 0; @@ -188,7 +188,7 @@ HB_FUNC( TIPENCODERBASE64_ENCODE ) HB_FUNC( TIPENCODERBASE64_DECODE ) { - char *cData = hb_parc( 1 ); + const char *cData = hb_parc( 1 ); unsigned char *cRet; int nLen = hb_parclen( 1 ); int nPos = 0, nPosRet = 0, nPosBlock = 0; @@ -285,7 +285,7 @@ HB_FUNC( TIPENCODERBASE64_DECODE ) HB_FUNC( TIPENCODERQP_ENCODE ) { - char *cData = hb_parc( 1 ); + const char *cData = hb_parc( 1 ); int nLen = hb_parclen( 1 ); char *cRet; unsigned char cElem; @@ -359,7 +359,7 @@ HB_FUNC( TIPENCODERQP_ENCODE ) HB_FUNC( TIPENCODERQP_DECODE ) { - char *cData = hb_parc( 1 ); + const char *cData = hb_parc( 1 ); int nLen = hb_parclen( 1 ); char *cRet; int nPos = 0, nPosRet = 0, nVal; @@ -435,13 +435,13 @@ HB_FUNC( TIPENCODERQP_DECODE ) HB_FUNC( TIPENCODERURL_ENCODE ) { - char *cData = hb_parc( 1 ); + const char *cData = hb_parc( 1 ); int nLen = hb_parclen( 1 ); BOOL bComplete = hb_parl( 2 ); char *cRet; int nPos = 0, nPosRet = 0, nVal; char cElem; - + if( hb_pcount() < 2 ) { bComplete = TRUE; @@ -502,7 +502,7 @@ HB_FUNC( TIPENCODERURL_ENCODE ) HB_FUNC( TIPENCODERURL_DECODE ) { - char *cData = hb_parc( 1 ); + const char *cData = hb_parc( 1 ); int nLen = hb_parclen( 1 ); char *cRet; int nPos = 0, nPosRet = 0; diff --git a/harbour/contrib/hbtip/utils.c b/harbour/contrib/hbtip/utils.c index 110137bb0f..721b56d46d 100644 --- a/harbour/contrib/hbtip/utils.c +++ b/harbour/contrib/hbtip/utils.c @@ -630,7 +630,7 @@ HB_FUNC( TIP_FILEMIMETYPE ) if ( HB_IS_STRING( pFile ) ) { /* decode the extension */ - char *fname = hb_itemGetCPtr( pFile ); + const char *fname = hb_itemGetCPtr( pFile ); int iPos = strlen( fname )-1; while ( iPos >= 0 && fname[iPos] != '.' ) @@ -718,10 +718,10 @@ HB_FUNC( PSTRCOMPI ) if( pString && pStart && pSubstr ) { - char * pcBase = hb_itemGetCPtr( pString ) ; - char * pcSub = hb_itemGetCPtr( pSubstr ) ; - ULONG uSublen = hb_itemGetCLen( pSubstr ) ; - ULONG uStart = hb_itemGetNL( pStart ) ; + const char * pcBase = hb_itemGetCPtr( pString ); + const char * pcSub = hb_itemGetCPtr( pSubstr ); + ULONG uSublen = hb_itemGetCLen( pSubstr ); + ULONG uStart = hb_itemGetNL( pStart ); hb_retl( hb_strnicmp( pcBase + uStart - 1, pcSub, uSublen ) == 0 ); } diff --git a/harbour/contrib/rddads/ads1.c b/harbour/contrib/rddads/ads1.c index d22857ffb5..f04a1fda0f 100644 --- a/harbour/contrib/rddads/ads1.c +++ b/harbour/contrib/rddads/ads1.c @@ -1441,7 +1441,7 @@ static HB_ERRCODE adsCreateFields( ADSAREAP pArea, PHB_ITEM pStruct ) USHORT uiItems, uiCount, uiLen, uiDec; DBFIELDINFO dbFieldInfo; PHB_ITEM pFieldDesc; - char *szFieldType; + const char *szFieldType; int iData, iNameLen; HB_TRACE(HB_TR_DEBUG, ("adsCreateFields(%p, %p)", pArea, pStruct)); @@ -3579,7 +3579,7 @@ static HB_ERRCODE adsOrderListAdd( ADSAREAP pArea, LPDBORDERINFO pOrderInfo ) /* 1001 and 7008 are standard ADS Open Errors that will usually be sharing issues */ USHORT uiOsCOde = u32RetVal == 1001 || u32RetVal == 7008 ? 32 : 0; commonError( pArea, EG_OPEN, ( USHORT ) u32RetVal, uiOsCOde, - ( char * ) hb_itemGetCPtr( pOrderInfo->atomBagName ), + hb_itemGetCPtr( pOrderInfo->atomBagName ), EF_CANDEFAULT, NULL ); return HB_FAILURE; } @@ -4372,7 +4372,7 @@ static HB_ERRCODE adsSetFilter( ADSAREAP pArea, LPDBFILTERINFO pFilterInfo ) UNSIGNED16 bValidExpr = FALSE; UNSIGNED16 usResolve = ADS_RESOLVE_DYNAMIC ; /*ADS_RESOLVE_IMMEDIATE ;get this from a SETting*/ UNSIGNED32 u32RetVal = AE_INVALID_EXPRESSION; - char * pucFilter = hb_itemGetCPtr( pFilterInfo->abFilterText ); + const char * pucFilter = hb_itemGetCPtr( pFilterInfo->abFilterText ); AdsIsExprValid( pArea->hTable, ( UNSIGNED8 * ) pucFilter, &bValidExpr ); @@ -4600,7 +4600,9 @@ static HB_ERRCODE adsPutValueFile( ADSAREAP pArea, USHORT uiIndex, BYTE * szFile /* TODO: Use AdsDeleteFile() */ static HB_ERRCODE adsDrop( LPRDDNODE pRDD, PHB_ITEM pItemTable, PHB_ITEM pItemIndex, ULONG ulConnect ) { - char szFileName[ HB_PATH_MAX ], * szFile, * szExt; + char szFileName[ HB_PATH_MAX ]; + const char * szFile; + const char * szExt; PHB_ITEM pFileExt = NULL; PHB_FNAME pFileName; BOOL fTable = FALSE, fResult = FALSE; @@ -4686,7 +4688,8 @@ static HB_ERRCODE adsDrop( LPRDDNODE pRDD, PHB_ITEM pItemTable, PHB_ITEM pItemIn */ static HB_ERRCODE adsExists( LPRDDNODE pRDD, PHB_ITEM pItemTable, PHB_ITEM pItemIndex, ULONG ulConnect ) { - char szFileName[ HB_PATH_MAX ], * szFile; + char szFileName[ HB_PATH_MAX ]; + const char * szFile; PHB_ITEM pFileExt = NULL; PHB_FNAME pFileName; BOOL fTable = FALSE; diff --git a/harbour/contrib/rddads/adsfunc.c b/harbour/contrib/rddads/adsfunc.c index afb2cad85d..ccdbeb3df6 100644 --- a/harbour/contrib/rddads/adsfunc.c +++ b/harbour/contrib/rddads/adsfunc.c @@ -418,8 +418,8 @@ HB_FUNC( ADSSETEXACT ) HB_FUNC( ADSBLOB2FILE ) { - char * szFileName = hb_parcx( 1 ); - char * szFieldName = hb_parcx( 2 ); + const char * szFileName = hb_parcx( 1 ); + const char * szFieldName = hb_parcx( 2 ); if( strlen( szFileName ) && strlen( szFieldName ) ) @@ -439,8 +439,8 @@ HB_FUNC( ADSBLOB2FILE ) HB_FUNC( ADSFILE2BLOB ) { - char * szFileName = hb_parcx( 1 ); - char * szFieldName = hb_parcx( 2 ); + const char * szFileName = hb_parcx( 1 ); + const char * szFieldName = hb_parcx( 2 ); if( strlen( szFileName ) && strlen( szFieldName ) ) @@ -979,7 +979,7 @@ HB_FUNC( ADSGETFILTER ) HB_FUNC( ADSENABLEENCRYPTION ) { - char * pucPassword = hb_parcx( 1 ); + const char * pucPassword = hb_parcx( 1 ); if( strlen( pucPassword ) ) { @@ -1831,7 +1831,7 @@ HB_FUNC( ADSDDGETDATABASEPROPERTY ) if( AdsDDGetDatabaseProperty( hConnect, ulProperty, - sBuffer, + ( VOID * ) sBuffer, &ulLength ) != AE_SUCCESS ) { /* TODO: Better error handling. */ @@ -1859,7 +1859,7 @@ HB_FUNC( ADSDDGETDATABASEPROPERTY ) AdsDDGetDatabaseProperty( hConnect, ulProperty, - &ulBuffer, + ( VOID * ) &ulBuffer, &ulLength ); hb_retl( ulBuffer != 0 ); break; @@ -1874,7 +1874,7 @@ HB_FUNC( ADSDDGETDATABASEPROPERTY ) AdsDDGetDatabaseProperty( hConnect, ulProperty, - &ulBuffer, + ( VOID * ) &ulBuffer, &ulLength ); hb_retni( ulBuffer ); break; @@ -1903,7 +1903,7 @@ HB_FUNC( ADSDDSETDATABASEPROPERTY ) { ulRetVal = AdsDDSetDatabaseProperty( hConnect, ulProperty, - HB_IS_STRING( pParam ) ? hb_itemGetCPtr( pParam ) : NULL, + HB_IS_STRING( pParam ) ? ( VOID * ) hb_itemGetCPtr( pParam ) : NULL, ( UNSIGNED16 ) hb_itemGetCLen( pParam ) + 1 ); break; } @@ -1917,7 +1917,7 @@ HB_FUNC( ADSDDSETDATABASEPROPERTY ) { ulRetVal = AdsDDSetDatabaseProperty( hConnect, ulProperty, - hb_itemGetCPtr( pParam ), + ( VOID * ) hb_itemGetCPtr( pParam ), ( UNSIGNED16 ) hb_itemGetCLen( pParam ) + 1 ); break; } @@ -1939,7 +1939,7 @@ HB_FUNC( ADSDDSETDATABASEPROPERTY ) ulBuffer = ( UNSIGNED16 ) hb_itemGetL( pParam ); ulRetVal = AdsDDSetDatabaseProperty( hConnect, ulProperty, - &ulBuffer, + ( VOID * ) &ulBuffer, sizeof( ulBuffer ) ); break; } @@ -1956,7 +1956,7 @@ HB_FUNC( ADSDDSETDATABASEPROPERTY ) ulBuffer = ( UNSIGNED16 ) hb_itemGetNI( pParam ); ulRetVal = AdsDDSetDatabaseProperty( hConnect, ulProperty, - &ulBuffer, + ( VOID * ) &ulBuffer, sizeof( ulBuffer ) ); } else @@ -2175,8 +2175,8 @@ HB_FUNC( ADSDELETEFILE ) HB_FUNC( ADSSTMTSETTABLEPASSWORD ) { #if ADS_LIB_VERSION >= 600 - char * pucTableName = hb_parcx( 1 ); - char * pucPassword = hb_parcx( 2 ); + const char * pucTableName = hb_parcx( 1 ); + const char * pucPassword = hb_parcx( 2 ); if( strlen( pucTableName ) && strlen( pucPassword ) ) diff --git a/harbour/contrib/rddsql/sqlbase.c b/harbour/contrib/rddsql/sqlbase.c index 404d7dbc3b..b3992f44d0 100644 --- a/harbour/contrib/rddsql/sqlbase.c +++ b/harbour/contrib/rddsql/sqlbase.c @@ -929,9 +929,9 @@ static HB_ERRCODE sqlbaseRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnec case RDDI_CONNECT: { - PSDDNODE pNode = NULL; - ULONG ul; - char* pStr; + PSDDNODE pNode = NULL; + ULONG ul; + const char* pStr; /* Find free connection handle */ for ( ul = 0; ul < s_ulConnectionCount; ul++ ) diff --git a/harbour/contrib/rddsql/sqlmix.c b/harbour/contrib/rddsql/sqlmix.c index d985b912dc..d80de79def 100644 --- a/harbour/contrib/rddsql/sqlmix.c +++ b/harbour/contrib/rddsql/sqlmix.c @@ -1914,7 +1914,7 @@ static HB_ERRCODE sqlmixOrderInfo( SQLMIXAREAP pArea, USHORT uiIndex, LPDBORDERI } if ( hb_itemGetCLen( pOrderInfo->itmNewVal ) > 0 ) { - char* pForExpr = hb_itemGetCPtr( pOrderInfo->itmNewVal ); + const char* pForExpr = hb_itemGetCPtr( pOrderInfo->itmNewVal ); if ( SELF_COMPILE( (AREAP) pArea, (BYTE*) pForExpr ) == HB_SUCCESS ) { diff --git a/harbour/contrib/xpp/dbcmdx.c b/harbour/contrib/xpp/dbcmdx.c index 9b8b2bddf8..32409f2e3d 100644 --- a/harbour/contrib/xpp/dbcmdx.c +++ b/harbour/contrib/xpp/dbcmdx.c @@ -76,7 +76,7 @@ HB_FUNC( ORDWILDSEEK ) if( pArea ) { - char * szPattern = hb_parc( 1 ); + const char * szPattern = hb_parc( 1 ); if( szPattern ) { @@ -89,7 +89,7 @@ HB_FUNC( ORDWILDSEEK ) if( !fCont ) { - char * szKey; + const char * szKey; if( fBack ) errCode = SELF_GOBOTTOM( pArea ); diff --git a/harbour/contrib/xpp/philesx.c b/harbour/contrib/xpp/philesx.c index 4d8d7a2e5d..cbd22a2179 100644 --- a/harbour/contrib/xpp/philesx.c +++ b/harbour/contrib/xpp/philesx.c @@ -57,7 +57,8 @@ HB_FUNC( CURDRIVE ) { #if defined(HB_OS_HAS_DRIVE_LETTER) - char szCurDrive[ 1 ], * szDrive; + char szCurDrive[ 1 ]; + const char * szDrive; szCurDrive[ 0 ] = ( ( char ) hb_fsCurDrv() ) + 'A'; hb_retclen( szCurDrive, 1 );