diff --git a/src/gnutls_auth.cpp b/src/gnutls_auth.cpp index 0a1d16c..dcbea72 100644 --- a/src/gnutls_auth.cpp +++ b/src/gnutls_auth.cpp @@ -370,9 +370,8 @@ unsigned char* s3fs_sha256hexsum(int fd, off_t start, ssize_t size) bool s3fs_sha256(const unsigned char* data, unsigned int datalen, unsigned char** digest, unsigned int* digestlen) { - (*digestlen) = static_cast(get_sha256_digest_length()); - // cppcheck-suppress constArgument - if(NULL == ((*digest) = reinterpret_cast(malloc(*digestlen)))){ + size_t len = (*digestlen) = static_cast(get_sha256_digest_length()); + if(NULL == ((*digest) = reinterpret_cast(malloc(len)))){ return false; } diff --git a/src/s3fs_util.cpp b/src/s3fs_util.cpp index b8692f5..13d6ea4 100644 --- a/src/s3fs_util.cpp +++ b/src/s3fs_util.cpp @@ -150,12 +150,10 @@ bool S3ObjList::insert_normalized(const char* name, const char* normalized, bool s3obj_t::iterator iter; if(objects.end() != (iter = objects.find(name))){ // found name --> over write - (*iter).second.orgname.erase(); - (*iter).second.etag.erase(); - // cppcheck-suppress unreadVariable - (*iter).second.normalname = normalized; - // cppcheck-suppress unreadVariable - (*iter).second.is_dir = is_dir; + iter->second.orgname.erase(); + iter->second.etag.erase(); + iter->second.normalname = normalized; + iter->second.is_dir = is_dir; }else{ // not found --> add new object s3obj_entry newobject;