From 57386e3fd12a558e534d1979227443578d3e2d93 Mon Sep 17 00:00:00 2001 From: Paul Tucker Date: Fri, 17 Sep 1999 03:56:38 +0000 Subject: [PATCH] *** empty log message *** --- harbour/ChangeLog | 8 ++++++++ harbour/source/rtl/console.c | 28 ++++++++++++++-------------- harbour/source/rtl/gtapi.c | 12 ++++++------ 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 389176a894..3eb148f725 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,11 @@ +19990916-23:45 EDT Paul Tucker + * source/rtl/console.c + * source/rtl/gtapi.c + * added a number of casts + The problem with declaring something to acctype (BYTE*) is that then + the overly sensitive MSVC complains about passing a const * to it - + it becomes quite bothersome to use (IMO). + 19990917-03:15 GMT+1 Victor Szel * source/rtl/transfrm.c diff --git a/harbour/source/rtl/console.c b/harbour/source/rtl/console.c index 009aa6369f..3776966d72 100644 --- a/harbour/source/rtl/console.c +++ b/harbour/source/rtl/console.c @@ -217,7 +217,7 @@ static void hb_out( USHORT uiParam, hb_out_func_typedef * hb_out_func ) switch( pItem->type ) { case IT_STRING: - hb_out_func( hb_itemGetCPtr( pItem ), hb_itemGetCLen( pItem ) ); + hb_out_func( ( BYTE * ) hb_itemGetCPtr( pItem ), hb_itemGetCLen( pItem ) ); break; case IT_DATE: @@ -241,14 +241,14 @@ static void hb_out( USHORT uiParam, hb_out_func_typedef * hb_out_func ) break; } case IT_NIL: - hb_out_func( "NIL", 3 ); + hb_out_func( ( BYTE * ) "NIL", 3 ); break; case IT_LOGICAL: if( hb_itemGetL( pItem ) ) - hb_out_func( ".T.", 3 ); + hb_out_func( ( BYTE * ) ".T.", 3 ); else - hb_out_func( ".F.", 3 ); + hb_out_func( ( BYTE * ) ".F.", 3 ); break; default: @@ -266,7 +266,7 @@ static void hb_outstd( BYTE * pStr, ULONG ulLen ) hb_gtPreExt(); #endif - if( strlen( pStr ) != ulCount ) + if( strlen( ( const char * ) pStr ) != ulCount ) while( ulCount-- ) fputc( *pPtr++, stdout ); else fputs( ( char * ) pStr, stdout ); @@ -296,7 +296,7 @@ static void hb_outerr( BYTE * pStr, ULONG ulLen ) hb_gtPreExt(); #endif - if( strlen( pStr ) != ulCount ) + if( strlen( ( const char * ) pStr ) != ulCount ) while( ulCount-- ) fputc( *pPtr++, stderr ); else fputs( ( char * ) pStr, stderr ); @@ -541,7 +541,7 @@ HARBOUR HB_OUTSTD( void ) /* writes a list of values to the standard output devi { hb_out( uiParam, hb_outstd ); if( uiParam < uiPCount ) - hb_outstd( " ", 1 ); + hb_outstd( ( BYTE * ) " ", 1 ); } } @@ -553,7 +553,7 @@ HARBOUR HB_OUTERR( void ) /* writes a list of values to the standard error devic { hb_out( uiParam, hb_outerr ); if( uiParam < uiPCount ) - hb_outerr( " ", 1 ); + hb_outerr( ( BYTE * ) " ", 1 ); } } @@ -565,7 +565,7 @@ HARBOUR HB_QQOUT( void ) /* writes a list of values to the current device (scree { hb_out( uiParam, hb_altout ); if( uiParam < uiPCount ) - hb_altout( " ", 1 ); + hb_altout( ( BYTE * ) " ", 1 ); } } @@ -573,7 +573,7 @@ HARBOUR HB_QOUT( void ) { USHORT uiCount; - hb_altout( s_szCrLf, CRLF_BUFFER_LEN - 1 ); + hb_altout( ( BYTE * ) s_szCrLf, CRLF_BUFFER_LEN - 1 ); if( hb_set.HB_SET_PRINTER && hb_set_printhan >= 0 ) { @@ -1054,7 +1054,7 @@ HARBOUR HB_SAVESCREEN( void ) hb_gtRectSize( uiCoords[ 0 ], uiCoords[ 1 ], uiCoords[ 2 ], uiCoords[ 3 ], &uiX ); pBuffer = hb_xgrab( uiX ); hb_gtSave( uiCoords[ 0 ], uiCoords[ 1 ], uiCoords[ 2 ], uiCoords[ 3 ], pBuffer ); - hb_retclen( pBuffer, uiX ); + hb_retclen( ( char * ) pBuffer, uiX ); hb_xfree( ( char * ) pBuffer ); #else hb_retc( "" ); @@ -1162,7 +1162,7 @@ HARBOUR HB___ACCEPT( void ) /* Internal Clipper function used in ACCEPT command while( input != K_ENTER ) { /* Wait forever, for keyboard events only */ - input = hb_inkey( 0.0, INKEY_KEYBOARD, 1, 1 ); + input = hb_inkey( 0.0, ( HB_inkey_enum ) INKEY_KEYBOARD, 1, 1 ); switch( input ) { case K_BS: @@ -1172,7 +1172,7 @@ HARBOUR HB___ACCEPT( void ) /* Internal Clipper function used in ACCEPT command ulLen--; /* Adjust input count to get rid of last character, then erase it from the screen. */ #ifdef HARBOUR_USE_GTAPI - hb_gtWriteCon( "\x8 \x8", 3L ); + hb_gtWriteCon( ( BYTE * ) "\x8 \x8", 3L ); #else fputs( "\x8 \x8", stdout ); #endif @@ -1183,7 +1183,7 @@ HARBOUR HB___ACCEPT( void ) /* Internal Clipper function used in ACCEPT command if( ulLen < ( ACCEPT_BUFFER_LEN - 1 ) && input >= 32 ) { s_szAcceptResult[ ulLen ] = input; /* Accept the input */ - hb_dispout( &s_szAcceptResult[ ulLen ], sizeof( char ) ); /* Then display it */ + hb_dispout( ( BYTE * ) &s_szAcceptResult[ ulLen ], sizeof( char ) ); /* Then display it */ ulLen++; /* Then adjust the input count */ } } diff --git a/harbour/source/rtl/gtapi.c b/harbour/source/rtl/gtapi.c index 6d04584dcd..105b7e96d9 100644 --- a/harbour/source/rtl/gtapi.c +++ b/harbour/source/rtl/gtapi.c @@ -241,12 +241,12 @@ int hb_gtBox( USHORT uiTop, USHORT uiLeft, USHORT uiBottom, USHORT uiRight, BYTE int hb_gtBoxD( USHORT uiTop, USHORT uiLeft, USHORT uiBottom, USHORT uiRight ) { - return hb_gtBox( uiTop, uiLeft, uiBottom, uiRight, B_DOUBLE ); + return hb_gtBox( uiTop, uiLeft, uiBottom, uiRight, ( BYTE * ) B_DOUBLE ); } int hb_gtBoxS( USHORT uiTop, USHORT uiLeft, USHORT uiBottom, USHORT uiRight ) { - return hb_gtBox( uiTop, uiLeft, uiBottom, uiRight, B_SINGLE ); + return hb_gtBox( uiTop, uiLeft, uiBottom, uiRight, ( BYTE * ) B_SINGLE ); } int hb_gtColorSelect( USHORT uiColorIndex ) @@ -713,7 +713,7 @@ int hb_gtWrite( BYTE * fpStr, ULONG length ) int iRow, iCol, iMaxCol, iMaxRow; ULONG size = length; BYTE attr = s_Color[ s_uiColorIndex ] & 0xFF; - char *fpPointer = fpStr; + char *fpPointer = ( char * ) fpStr; /* TODO: this is doing more work than needed */ @@ -769,7 +769,7 @@ int hb_gtWrite( BYTE * fpStr, ULONG length ) else size = length; /* Now the text string can be displayed */ - hb_gt_Puts( s_uiCurrentRow, s_uiCurrentCol, attr, fpPointer, size ); + hb_gt_Puts( s_uiCurrentRow, s_uiCurrentCol, attr, ( BYTE * ) fpPointer, size ); /* Finally, save the new cursor position */ hb_gtSetPos( iRow, iCol ); @@ -796,7 +796,7 @@ int hb_gtWriteCon( BYTE * fpStr, ULONG length ) USHORT uiMaxRow = hb_gtMaxRow(); USHORT uiMaxCol = hb_gtMaxCol(); int ch; - char * fpPtr = fpStr; + char * fpPtr = ( char * ) fpStr; #define STRNG_SIZE 500 char strng[ STRNG_SIZE ]; @@ -868,7 +868,7 @@ int hb_gtWriteCon( BYTE * fpStr, ULONG length ) if( ldisp || ! length ) { if( nLen ) - rc = hb_gtWrite( strng, nLen ); + rc = hb_gtWrite( ( BYTE * ) strng, nLen ); nLen = 0; if( uiRow > uiMaxRow ) {