diff --git a/source/shared_lib/sources/graphics/gl/texture_gl.cpp b/source/shared_lib/sources/graphics/gl/texture_gl.cpp index dae68e618..d9e60d97f 100644 --- a/source/shared_lib/sources/graphics/gl/texture_gl.cpp +++ b/source/shared_lib/sources/graphics/gl/texture_gl.cpp @@ -328,7 +328,7 @@ GLint toCompressionFormatGl(GLint format) { } static std::vector supportedCompressionFormats = getSupportCompressedTextureFormats(); - if(supportedCompressionFormats.size() <= 0) { + if(supportedCompressionFormats.empty() == true) { return format; } diff --git a/source/shared_lib/sources/platform/common/platform_common.cpp b/source/shared_lib/sources/platform/common/platform_common.cpp index b8683f434..d615e62c3 100644 --- a/source/shared_lib/sources/platform/common/platform_common.cpp +++ b/source/shared_lib/sources/platform/common/platform_common.cpp @@ -884,7 +884,7 @@ void clearFolderTreeContentsCheckSum(const string &path, const string filterFile } string crcCacheFile = getFormattedCRCCacheFileName(cacheKeys); if(fileExists(crcCacheFile) == true) { - bool result = removeFile(crcCacheFile.c_str()); + bool result = removeFile(crcCacheFile); if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] fileitem [%s] result = %d\n",__FILE__,__FUNCTION__,__LINE__,crcCacheFile.c_str(),result); } } @@ -1058,7 +1058,7 @@ void clearFolderTreeContentsCheckSumList(vector paths, string pathSearch } string crcCacheFile = getFormattedCRCCacheFileName(cacheKeys); if(fileExists(crcCacheFile) == true) { - bool result = removeFile(crcCacheFile.c_str()); + bool result = removeFile(crcCacheFile); if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] fileitem [%s] result = %d\n",__FILE__,__FUNCTION__,__LINE__,crcCacheFile.c_str(),result); } } @@ -1231,7 +1231,7 @@ void clearFolderTreeContentsCheckSumList(const string &path, const string filter } string crcCacheFile = getFormattedCRCCacheFileName(cacheKeys); if(fileExists(crcCacheFile) == true) { - bool result = removeFile(crcCacheFile.c_str()); + bool result = removeFile(crcCacheFile); if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] fileitem [%s] result = %d\n",__FILE__,__FUNCTION__,__LINE__,crcCacheFile.c_str(),result); } } diff --git a/source/shared_lib/sources/platform/common/simple_threads.cpp b/source/shared_lib/sources/platform/common/simple_threads.cpp index 8336ef01d..6e22c9a41 100644 --- a/source/shared_lib/sources/platform/common/simple_threads.cpp +++ b/source/shared_lib/sources/platform/common/simple_threads.cpp @@ -253,8 +253,7 @@ void FileCRCPreCacheThread::execute() { if(results.empty() == true) { for(unsigned int factionIdx = 0; factionIdx < results.size(); ++factionIdx) { string factionName = results[factionIdx]; - int32 factionCRC = 0; - factionCRC = getFolderTreeContentsCheckSumRecursively(techDataPaths, "/" + techName + "/factions/" + factionName + "/*", ".xml", NULL, true); + int32 factionCRC = getFolderTreeContentsCheckSumRecursively(techDataPaths, "/" + techName + "/factions/" + factionName + "/*", ".xml", NULL, true); } } diff --git a/source/shared_lib/sources/streflop/libm/e_expf.c b/source/shared_lib/sources/streflop/libm/e_expf.c index 9816f9b11..00787168e 100644 --- a/source/shared_lib/sources/streflop/libm/e_expf.c +++ b/source/shared_lib/sources/streflop/libm/e_expf.c @@ -51,7 +51,7 @@ P5 = 4.1381369442e-08f; /* 0x3331bb4c */ #endif { float y,hi,lo,c,t; - int32_t k,xsb; + int32_t k=0,xsb; u_int32_t hx; GET_FLOAT_WORD(hx,x); diff --git a/source/shared_lib/sources/streflop/libm/flt-32/e_j0f.cpp b/source/shared_lib/sources/streflop/libm/flt-32/e_j0f.cpp index 7551062db..090c83c01 100644 --- a/source/shared_lib/sources/streflop/libm/flt-32/e_j0f.cpp +++ b/source/shared_lib/sources/streflop/libm/flt-32/e_j0f.cpp @@ -289,9 +289,9 @@ static Simple pS2[5] = { #endif { #ifdef __STDC__ - const Simple *p,*q; + const Simple *p=0,*q=0; #else - Simple *p,*q; + Simple *p=0,*q=0; #endif Simple z,r,s; int32_t ix; @@ -425,9 +425,9 @@ static Simple qS2[6] = { #endif { #ifdef __STDC__ - const Simple *p,*q; + const Simple *p=0,*q=0; #else - Simple *p,*q; + Simple *p=0,*q=0; #endif Simple s,r,z; int32_t ix; diff --git a/source/shared_lib/sources/streflop/libm/flt-32/e_j1f.cpp b/source/shared_lib/sources/streflop/libm/flt-32/e_j1f.cpp index 321a54751..f151ba42e 100644 --- a/source/shared_lib/sources/streflop/libm/flt-32/e_j1f.cpp +++ b/source/shared_lib/sources/streflop/libm/flt-32/e_j1f.cpp @@ -288,9 +288,9 @@ static Simple ps2[5] = { #endif { #ifdef __STDC__ - const Simple *p,*q; + const Simple *p=0,*q=0; #else - Simple *p,*q; + Simple *p=0,*q=0; #endif Simple z,r,s; int32_t ix; @@ -425,9 +425,9 @@ static Simple qs2[6] = { #endif { #ifdef __STDC__ - const Simple *p,*q; + const Simple *p=0,*q=0; #else - Simple *p,*q; + Simple *p=0,*q=0; #endif Simple s,r,z; int32_t ix;