colin
/
tripwire-open-source
mirror of https://github.com/Tripwire/tripwire-open-source.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolve assorted GCC 7 warnings

This commit is contained in:
Brian Cox 2017-03-25 19:40:54 -07:00
parent e04b97132b
commit 76868c5ccc
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/displayencoder.cpp
View File

@ -568,7 +568,7 @@ TCHAR cCharEncoderUtil::hex_to_char( TSTRING::const_iterator first,
if( ss.bad() || ss.fail() )
ThrowAndAssert( eBadHexConversion( TSTRING( first, last ) ) );
if( (TCHAR)ch > max_char || (TCHAR)ch < min_char )
if( ch > (unsigned long)max_char || ch < (unsigned long)min_char )
ThrowAndAssert( eBadHexConversion( TSTRING( first, last ) ) );
return (TCHAR)ch;

2
src/core/ntmbs.cpp
View File

@ -96,7 +96,7 @@ tss::mbsdec( const_ntmbs_t beg, const_ntmbs_t curr )
const_ntmbs_t prev = curr - 1;
for ( ; prev > beg && ::mblen( (char*)prev, curr - prev ) == -1; --prev );
if ( curr - prev > MB_CUR_MAX )
if ( (size_t)(curr - prev) > MB_CUR_MAX )
{
prev = (curr - 1);

4
src/tw/twstrings.cpp
View File

@ -243,8 +243,8 @@ TSS_BeginStringtable( cTW )
TSS_StringEntry( tw::STR_COPYRIGHT, TSS_COPYRIGHT_NOTICE ),
TSS_StringEntry( tw::STR_TSS_PRODUCT_NAME, TSS_PRODUCT_NAME BUILD_NUM UNICODE_STR DEBUG_STR ),
TSS_StringEntry( tw::STR_VERSION, TSS_PRODUCT_NAME BUILD_NUM UNICODE_STR DEBUG_STR _T(" built for "TARGET_OS"\n\n") TSS_COPYRIGHT_NOTICE ),
TSS_StringEntry( tw::STR_VERSION_LONG, TSS_PRODUCT_NAME BUILD_NUM UNICODE_STR DEBUG_STR _T(" built for "TARGET_OS"\n\n") TSS_COPYRIGHT_NOTICE_LONG ),
TSS_StringEntry( tw::STR_VERSION, TSS_PRODUCT_NAME BUILD_NUM UNICODE_STR DEBUG_STR _T(" built for " TARGET_OS "\n\n") TSS_COPYRIGHT_NOTICE ),
TSS_StringEntry( tw::STR_VERSION_LONG, TSS_PRODUCT_NAME BUILD_NUM UNICODE_STR DEBUG_STR _T(" built for " TARGET_OS "\n\n") TSS_COPYRIGHT_NOTICE_LONG ),
TSS_EndStringtable( cTW )

2
src/twadmin/keygeneration.cpp
View File

@ -158,6 +158,8 @@ bool GenerateKey(const TCHAR* keyPath, wc16_string passphrase, const cElGamalSig
{
case tGK::FILE_WRITE_ERROR:
TCERR << std::endl << TSS_GetString(cTWAdmin, twadmin::STR_ERR2_KEYGEN_FILEWRITE) << gk.keyPath << std::endl;
break;
default:
TCERR << std::endl << TSS_GetString(cTWAdmin, twadmin::STR_ERR2_KEYGEN) << gk.keyPath
<< TSS_GetString(cTWAdmin, twadmin::STR_ERR2_KEYGEN2) << std::endl;