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

Prefer abort over assert(false)

Browse Source 
The compiler can remove the latter when compiled with NDEBUG which may
cause unintended control flow.
This commit is contained in:
Andrew Gaul 2019-01-20 12:29:38 -08:00
parent c83a3e67c9
commit 40ba3b44a1
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/addhead.cpp
View File

@ -22,7 +22,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <syslog.h> #include <syslog.h>
#include <assert.h>
#include <curl/curl.h> #include <curl/curl.h>
#include <sstream> #include <sstream>
#include <fstream> #include <fstream>
@ -56,7 +55,7 @@ AdditionalHeader::AdditionalHeader()
if(this == AdditionalHeader::get()){ if(this == AdditionalHeader::get()){
is_enable = false; is_enable = false;
}else{ }else{
assert(false); abort();
} }
} }
@ -65,7 +64,7 @@ AdditionalHeader::~AdditionalHeader()
if(this == AdditionalHeader::get()){ if(this == AdditionalHeader::get()){
Unload(); Unload();
}else{ }else{
assert(false); abort();
} }
} }

5
src/cache.cpp
View File

@ -28,7 +28,6 @@
#include <stdint.h> #include <stdint.h>
#include <pthread.h> #include <pthread.h>
#include <string.h> #include <string.h>
#include <assert.h>
#include <syslog.h> #include <syslog.h>
#include <string> #include <string>
#include <map> #include <map>
@ -148,7 +147,7 @@ StatCache::StatCache() : IsExpireTime(false), IsExpireIntervalType(false), Expir
stat_cache.clear(); stat_cache.clear();
pthread_mutex_init(&(StatCache::stat_cache_lock), NULL); pthread_mutex_init(&(StatCache::stat_cache_lock), NULL);
}else{ }else{
assert(false); abort();
} }
} }
@ -158,7 +157,7 @@ StatCache::~StatCache()
Clear(); Clear();
pthread_mutex_destroy(&(StatCache::stat_cache_lock)); pthread_mutex_destroy(&(StatCache::stat_cache_lock));
}else{ }else{
assert(false); abort();
} }
} }

3
src/curl.cpp
View File

@ -110,7 +110,8 @@ static string url_to_host(const std::string &url)
} else if (url.compare(0, https.size(), https) == 0) { } else if (url.compare(0, https.size(), https) == 0) {
hostname = url.substr(https.size()); hostname = url.substr(https.size());
} else { } else {
assert(!"url does not begin with http:// or https://"); S3FS_PRN_EXIT("url does not begin with http:// or https://");
abort();
} }
size_t idx; size_t idx;

5
src/fdcache.cpp
View File

@ -30,7 +30,6 @@
#include <syslog.h> #include <syslog.h>
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include <assert.h>
#include <dirent.h> #include <dirent.h>
#include <curl/curl.h> #include <curl/curl.h>
#include <string> #include <string>
@ -2000,7 +1999,7 @@ FdManager::FdManager()
S3FS_PRN_CRIT("failed to init mutex"); S3FS_PRN_CRIT("failed to init mutex");
} }
}else{ }else{
assert(false); abort();
} }
} }
@ -2024,7 +2023,7 @@ FdManager::~FdManager()
FdManager::is_lock_init = false; FdManager::is_lock_init = false;
} }
}else{ }else{
assert(false); abort();
} }
} }