octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-09-28 09:19:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #925 from gaul/clang-tidy/delete-null

Browse Source 
Remove redundant null checks before delete
This commit is contained in:
Takeshi Nakatani 2019-01-27 15:15:31 +09:00 committed by GitHub
commit 4820f0a42b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/cache.cpp
View File

@ -211,10 +211,8 @@ void StatCache::Clear(void)
pthread_mutex_lock(&StatCache::stat_cache_lock); pthread_mutex_lock(&StatCache::stat_cache_lock);
for(stat_cache_t::iterator iter = stat_cache.begin(); iter != stat_cache.end(); stat_cache.erase(iter++)){ for(stat_cache_t::iterator iter = stat_cache.begin(); iter != stat_cache.end(); stat_cache.erase(iter++)){
if((*iter).second){
delete (*iter).second; delete (*iter).second;
} }
}
S3FS_MALLOCTRIM(0); S3FS_MALLOCTRIM(0);
pthread_mutex_unlock(&StatCache::stat_cache_lock); pthread_mutex_unlock(&StatCache::stat_cache_lock);
@ -405,9 +403,7 @@ bool StatCache::AddStat(std::string& key, headers_t& meta, bool forcedir, bool n
stat_cache_t::iterator iter = stat_cache.find(key); // recheck for same key exists stat_cache_t::iterator iter = stat_cache.find(key); // recheck for same key exists
if(stat_cache.end() != iter){ if(stat_cache.end() != iter){
if(iter->second){
delete iter->second; delete iter->second;
}
stat_cache.erase(iter); stat_cache.erase(iter);
} }
stat_cache[key] = ent; stat_cache[key] = ent;
@ -459,9 +455,7 @@ bool StatCache::AddNoObjectCache(string& key)
stat_cache_t::iterator iter = stat_cache.find(key); // recheck for same key exists stat_cache_t::iterator iter = stat_cache.find(key); // recheck for same key exists
if(stat_cache.end() != iter){ if(stat_cache.end() != iter){
if(iter->second){
delete iter->second; delete iter->second;
}
stat_cache.erase(iter); stat_cache.erase(iter);
} }
stat_cache[key] = ent; stat_cache[key] = ent;
@ -505,9 +499,7 @@ bool StatCache::TruncateCache(void)
for(stat_cache_t::iterator iter = stat_cache.begin(); iter != stat_cache.end(); ){ for(stat_cache_t::iterator iter = stat_cache.begin(); iter != stat_cache.end(); ){
stat_cache_entry* entry = iter->second; stat_cache_entry* entry = iter->second;
if(!entry || (0L == entry->notruncate && IsExpireStatCacheTime(entry->cache_date, ExpireTime))){ if(!entry || (0L == entry->notruncate && IsExpireStatCacheTime(entry->cache_date, ExpireTime))){
if(entry){
delete entry; delete entry;
}
stat_cache.erase(iter++); stat_cache.erase(iter++);
}else{ }else{
++iter; ++iter;
@ -544,9 +536,7 @@ bool StatCache::TruncateCache(void)
stat_cache_t::iterator siter = *iiter; stat_cache_t::iterator siter = *iiter;
S3FS_PRN_DBG("truncate stat cache[path=%s]", siter->first.c_str()); S3FS_PRN_DBG("truncate stat cache[path=%s]", siter->first.c_str());
if(siter->second){
delete siter->second; delete siter->second;
}
stat_cache.erase(siter); stat_cache.erase(siter);
} }
S3FS_MALLOCTRIM(0); S3FS_MALLOCTRIM(0);
@ -567,9 +557,7 @@ bool StatCache::DelStat(const char* key)
stat_cache_t::iterator iter; stat_cache_t::iterator iter;
if(stat_cache.end() != (iter = stat_cache.find(string(key)))){ if(stat_cache.end() != (iter = stat_cache.find(string(key)))){
if((*iter).second){
delete (*iter).second; delete (*iter).second;
}
stat_cache.erase(iter); stat_cache.erase(iter);
} }
if(0 < strlen(key) && 0 != strcmp(key, "/")){ if(0 < strlen(key) && 0 != strcmp(key, "/")){
@ -582,9 +570,7 @@ bool StatCache::DelStat(const char* key)
strpath += "/"; strpath += "/";
} }
if(stat_cache.end() != (iter = stat_cache.find(strpath))){ if(stat_cache.end() != (iter = stat_cache.find(strpath))){
if((*iter).second){
delete (*iter).second; delete (*iter).second;
}
stat_cache.erase(iter); stat_cache.erase(iter);
} }
} }

4
src/s3fs.cpp
View File

@ -2886,11 +2886,9 @@ static int remote_mountpath_exists(const char* path)
static void free_xattrs(xattrs_t& xattrs) static void free_xattrs(xattrs_t& xattrs)
{ {
for(xattrs_t::iterator iter = xattrs.begin(); iter != xattrs.end(); xattrs.erase(iter++)){ for(xattrs_t::iterator iter = xattrs.begin(); iter != xattrs.end(); xattrs.erase(iter++)){
if(iter->second){
delete iter->second; delete iter->second;
} }
} }
}
static bool parse_xattr_keyval(const std::string& xattrpair, string& key, PXATTRVAL& pval) static bool parse_xattr_keyval(const std::string& xattrpair, string& key, PXATTRVAL& pval)
{ {
@ -3327,9 +3325,7 @@ static int s3fs_removexattr(const char* path, const char* name)
} }
// make new header_t after deleting name xattr // make new header_t after deleting name xattr
if(xiter->second){
delete xiter->second; delete xiter->second;
}
xattrs.erase(xiter); xattrs.erase(xiter);
// build new xattr // build new xattr