From 03217baa996eb37d9948c15cb36c218cef5639c3 Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Wed, 4 May 2016 21:53:26 -0700 Subject: [PATCH] Address cppcheck 1.77 warnings --- Makefile.am | 4 +++- src/curl.cpp | 5 ++--- src/curl.h | 2 +- src/gnutls_auth.cpp | 12 ++++++------ src/nss_auth.cpp | 2 +- src/openssl_auth.cpp | 2 +- src/s3fs.cpp | 2 +- src/test_util.h | 1 + 8 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3c50467..e4be3cc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,10 +30,12 @@ release : dist ../utils/release.sh cppcheck: cppcheck --quiet --error-exitcode=1 \ + --inline-suppr \ + --std=c++03 \ -U CURLE_PEER_FAILED_VERIFICATION \ + -U P_tmpdir \ --enable=all \ --suppress=missingIncludeSystem \ - --suppress=unsignedLessThanZero \ --suppress=unusedFunction \ --suppress=variableScope \ src/ test/ diff --git a/src/curl.cpp b/src/curl.cpp index 64d6fb0..7d61341 100644 --- a/src/curl.cpp +++ b/src/curl.cpp @@ -1570,12 +1570,11 @@ int S3fsCurl::CurlDebugFunc(CURL* hcurl, curl_infotype type, char* data, size_t // Methods for S3fsCurl //------------------------------------------------------------------- S3fsCurl::S3fsCurl(bool ahbe) : - hCurl(NULL), path(""), base_path(""), saved_path(""), url(""), requestHeaders(NULL), + hCurl(NULL), type(REQTYPE_UNSET), path(""), base_path(""), saved_path(""), url(""), requestHeaders(NULL), bodydata(NULL), headdata(NULL), LastResponseCode(-1), postdata(NULL), postdata_remaining(0), is_use_ahbe(ahbe), retry_count(0), b_infile(NULL), b_postdata(NULL), b_postdata_remaining(0), b_partdata_startpos(0), b_partdata_size(0), b_ssekey_pos(-1), b_ssevalue(""), b_ssetype(SSE_DISABLE) { - type = REQTYPE_UNSET; } S3fsCurl::~S3fsCurl() @@ -2974,7 +2973,7 @@ int S3fsCurl::ListBucketRequest(const char* tpath, const char* query) } }else{ - insertV4Headers("GET", "/", query, ""); + insertV4Headers("GET", "/", query ? query : "", ""); } // setopt diff --git a/src/curl.h b/src/curl.h index 1ef0638..4fa3726 100644 --- a/src/curl.h +++ b/src/curl.h @@ -130,7 +130,7 @@ class S3fsMultiCurl; class CurlHandlerPool { public: - CurlHandlerPool(int maxHandlers) + explicit CurlHandlerPool(int maxHandlers) : mMaxHandlers(maxHandlers) , mHandlers(NULL) , mIndex(-1) diff --git a/src/gnutls_auth.cpp b/src/gnutls_auth.cpp index dd6ec59..84aab56 100644 --- a/src/gnutls_auth.cpp +++ b/src/gnutls_auth.cpp @@ -103,7 +103,7 @@ bool s3fs_destroy_crypt_mutex(void) bool s3fs_HMAC(const void* key, size_t keylen, const unsigned char* data, size_t datalen, unsigned char** digest, unsigned int* digestlen) { - if(!key || 0 >= keylen || !data || 0 >= datalen || !digest || !digestlen){ + if(!key || !data || !digest || !digestlen){ return false; } @@ -122,7 +122,7 @@ bool s3fs_HMAC(const void* key, size_t keylen, const unsigned char* data, size_t bool s3fs_HMAC256(const void* key, size_t keylen, const unsigned char* data, size_t datalen, unsigned char** digest, unsigned int* digestlen) { - if(!key || 0 >= keylen || !data || 0 >= datalen || !digest || !digestlen){ + if(!key || !data || !digest || !digestlen){ return false; } @@ -143,11 +143,11 @@ bool s3fs_HMAC256(const void* key, size_t keylen, const unsigned char* data, siz bool s3fs_HMAC(const void* key, size_t keylen, const unsigned char* data, size_t datalen, unsigned char** digest, unsigned int* digestlen) { - if(!key || 0 >= keylen || !data || 0 >= datalen || !digest || !digestlen){ + if(!key || !data || !digest || !digestlen){ return false; } - if(0 >= (*digestlen = gnutls_hmac_get_len(GNUTLS_MAC_SHA1))){ + if(0 == (*digestlen = gnutls_hmac_get_len(GNUTLS_MAC_SHA1))){ return false; } if(NULL == (*digest = (unsigned char*)malloc(*digestlen + 1))){ @@ -163,11 +163,11 @@ bool s3fs_HMAC(const void* key, size_t keylen, const unsigned char* data, size_t bool s3fs_HMAC256(const void* key, size_t keylen, const unsigned char* data, size_t datalen, unsigned char** digest, unsigned int* digestlen) { - if(!key || 0 >= keylen || !data || 0 >= datalen || !digest || !digestlen){ + if(!key || !data || !digest || !digestlen){ return false; } - if(0 >= (*digestlen = gnutls_hmac_get_len(GNUTLS_MAC_SHA256))){ + if(0 == (*digestlen = gnutls_hmac_get_len(GNUTLS_MAC_SHA256))){ return false; } if(NULL == (*digest = (unsigned char*)malloc(*digestlen + 1))){ diff --git a/src/nss_auth.cpp b/src/nss_auth.cpp index 5a3e744..649f10c 100644 --- a/src/nss_auth.cpp +++ b/src/nss_auth.cpp @@ -85,7 +85,7 @@ bool s3fs_destroy_crypt_mutex(void) //------------------------------------------------------------------- static bool s3fs_HMAC_RAW(const void* key, size_t keylen, const unsigned char* data, size_t datalen, unsigned char** digest, unsigned int* digestlen, bool is_sha256) { - if(!key || 0 >= keylen || !data || 0 >= datalen || !digest || !digestlen){ + if(!key || !data || !digest || !digestlen){ return false; } diff --git a/src/openssl_auth.cpp b/src/openssl_auth.cpp index 80c8283..b43680a 100644 --- a/src/openssl_auth.cpp +++ b/src/openssl_auth.cpp @@ -185,7 +185,7 @@ bool s3fs_destroy_crypt_mutex(void) //------------------------------------------------------------------- static bool s3fs_HMAC_RAW(const void* key, size_t keylen, const unsigned char* data, size_t datalen, unsigned char** digest, unsigned int* digestlen, bool is_sha256) { - if(!key || 0 >= keylen || !data || 0 >= datalen || !digest || !digestlen){ + if(!key || !data || !digest || !digestlen){ return false; } (*digestlen) = EVP_MAX_MD_SIZE * sizeof(unsigned char); diff --git a/src/s3fs.cpp b/src/s3fs.cpp index d743d3d..77f1372 100644 --- a/src/s3fs.cpp +++ b/src/s3fs.cpp @@ -2800,7 +2800,7 @@ static char* get_object_name(xmlDocPtr doc, xmlNodePtr node, const char* path) string strmybpath = mybasename(string((char*)fullpath)); const char* dirpath = strdirpath.c_str(); const char* mybname = strmybpath.c_str(); - const char* basepath= (!path || '\0' == path[0] || '/' != path[0] ? path : &path[1]); + const char* basepath= (path && '/' == path[0]) ? &path[1] : path; xmlFree(fullpath); if(!mybname || '\0' == mybname[0]){ diff --git a/src/test_util.h b/src/test_util.h index 7180375..0a9560d 100644 --- a/src/test_util.h +++ b/src/test_util.h @@ -33,6 +33,7 @@ void assert_strequals(const char *x, const char *y, const char *file, int line) { if(x == NULL && y == NULL){ return; + // cppcheck-suppress nullPointerRedundantCheck } else if((x == NULL || y == NULL) || strcmp(x, y) != 0){ std::cerr << x << " != " << y << " at " << file << ":" << line << std::endl; std::exit(1);