From 60e9a0e663faa8f25e5259d3e3249f6958e92a50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= Date: Sat, 18 Jan 2025 05:03:36 +0100 Subject: [PATCH] 2025-01-18 05:03 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * src/rdd/dbfnsx/dbfnsx1.c * src/rtl/dates.c * src/rtl/hbtoken.c ! pacified few stupid warnings --- ChangeLog.txt | 6 ++++++ src/rdd/dbfnsx/dbfnsx1.c | 2 +- src/rtl/dates.c | 4 ++-- src/rtl/hbtoken.c | 6 +++--- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 61ede63b38..97af0ede4c 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -7,6 +7,12 @@ Entries may not always be in chronological/commit order. See license at the end of file. */ +2025-01-18 05:03 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * src/rdd/dbfnsx/dbfnsx1.c + * src/rtl/dates.c + * src/rtl/hbtoken.c + ! pacified few stupid warnings + 2025-01-18 04:59 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * contrib/hbssl/bio.c ! added missing BIO_free() call in HB_BIO destructor diff --git a/src/rdd/dbfnsx/dbfnsx1.c b/src/rdd/dbfnsx/dbfnsx1.c index 9e84eb8f0c..ea1c1020db 100644 --- a/src/rdd/dbfnsx/dbfnsx1.c +++ b/src/rdd/dbfnsx/dbfnsx1.c @@ -2095,7 +2095,7 @@ static HB_ERRCODE hb_nsxIndexHeaderRead( LPNSXINDEX pIndex ) return HB_FAILURE; if( ( pIndex->FileSize ? pIndex->HeaderBuff.Signature[ 0 ] != - ( pIndex->LargeFile ? NSX_SIGNATURE_LARGE : NSX_SIGNATURE ) : + ( HB_UCHAR ) ( pIndex->LargeFile ? NSX_SIGNATURE_LARGE : NSX_SIGNATURE ) : ( pIndex->HeaderBuff.Signature[ 0 ] != NSX_SIGNATURE && pIndex->HeaderBuff.Signature[ 0 ] != NSX_SIGNATURE_LARGE ) ) || pIndex->HeaderBuff.IndexFlags[ 0 ] != 0 ) diff --git a/src/rtl/dates.c b/src/rtl/dates.c index c95478fd56..07be4e346a 100644 --- a/src/rtl/dates.c +++ b/src/rtl/dates.c @@ -80,7 +80,7 @@ char * hb_dateFormat( const char * szDate, char * szFormattedDate, const char * int digit = HB_TOUPPER( ( HB_UCHAR ) *szPtr ); szPtr++; digit_count = 1; - while( HB_TOUPPER( ( HB_UCHAR ) *szPtr ) == digit && format_count < size ) + while( ( int ) HB_TOUPPER( ( HB_UCHAR ) *szPtr ) == digit && format_count < size ) { szPtr++; if( format_count + digit_count < size ) @@ -404,7 +404,7 @@ char * hb_timeFormat( char * szBuffer, const char * szTimeFormat, long lMilliSec int count = -i; int ch = HB_TOUPPER( szTimeFormat[ i ] ); ++i; - while( ch == HB_TOUPPER( szTimeFormat[ i ] ) && i < size ) + while( ch == ( int ) HB_TOUPPER( szTimeFormat[ i ] ) && i < size ) ++i; count += i; switch( ch ) diff --git a/src/rtl/hbtoken.c b/src/rtl/hbtoken.c index 7c2de7a418..6eb9984df2 100644 --- a/src/rtl/hbtoken.c +++ b/src/rtl/hbtoken.c @@ -81,7 +81,7 @@ static HB_SIZE hb_tokenCount( const char * szLine, HB_SIZE nLen, ( ch == '\n' || ch == '\r' ) ) { ++nTokens; - if( nPos + 1 < nLen && szLine[ nPos + 1 ] == ( ch == '\n' ? '\r' : '\n' ) ) + if( nPos + 1 < nLen && szLine[ nPos + 1 ] == ( char ) ( ch == '\n' ? '\r' : '\n' ) ) ++nPos; } else if( nDelim && ch == szDelim[ 0 ] && @@ -126,7 +126,7 @@ static const char * hb_tokenGet( const char * szLine, HB_SIZE nLen, ( ch == '\n' || ch == '\r' ) ) { HB_SIZE nL = ( nPos + 1 < nLen && - szLine[ nPos + 1 ] == ( ch == '\n' ? '\r' : '\n' ) ) ? 1 : 0; + szLine[ nPos + 1 ] == ( char ) ( ch == '\n' ? '\r' : '\n' ) ) ? 1 : 0; if( --nToken == 0 ) { *pnDelim = nL + 1; @@ -192,7 +192,7 @@ static PHB_ITEM hb_tokenArray( const char * szLine, HB_SIZE nLen, ( ch == '\n' || ch == '\r' ) ) { hb_arraySetCL( pArray, ++nToken, szLine + nStart, nPos - nStart ); - if( nPos + 1 < nLen && szLine[ nPos + 1 ] == ( ch == '\n' ? '\r' : '\n' ) ) + if( nPos + 1 < nLen && szLine[ nPos + 1 ] == ( char ) ( ch == '\n' ? '\r' : '\n' ) ) ++nPos; nStart = nPos + 1; }