octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2025-02-02 18:48:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #961 from gaul/cppcheck

Browse Source 
Work around cppcheck warnings
This commit is contained in:
Takeshi Nakatani 2019-02-24 11:24:28 +09:00 committed by GitHub
commit 77993e607e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gnutls_auth.cpp
View File

@ -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<unsigned int>(get_sha256_digest_length());
// cppcheck-suppress constArgument
if(NULL == ((*digest) = reinterpret_cast<unsigned char*>(malloc(*digestlen)))){
size_t len = (*digestlen) = static_cast<unsigned int>(get_sha256_digest_length());
if(NULL == ((*digest) = reinterpret_cast<unsigned char*>(malloc(len)))){
return false;
}

10
src/s3fs_util.cpp
View File

@ -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;