atria-soft/elog
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] update nullptr in null (specific etk)

Browse Source
This commit is contained in:
Edouard DUPIN 2018-06-19 22:15:52 +02:00
parent 0b06079407
commit 8a5d7428e9
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
elog/log.cpp
View File

@ -44,7 +44,7 @@
} }
const char * symname = dlinfo.dli_sname; const char * symname = dlinfo.dli_sname;
int status; int status;
char * demangled = abi::__cxa_demangle(symname, nullptr, 0, &status); char * demangled = abi::__cxa_demangle(symname, null, 0, &status);
if(status == 0 && demangled) { if(status == 0 && demangled) {
symname = demangled; symname = demangled;
} }
@ -53,7 +53,7 @@
ELOG_PRINT(" " << symname); ELOG_PRINT(" " << symname);
} }
_removeElement--; _removeElement--;
if(demangled != nullptr) { if(demangled != null) {
free(demangled); free(demangled);
} }
} }
@ -199,11 +199,11 @@ void elog::logStream(int32_t _id, int32_t _level, int32_t _ligne, const char* _f
} }
void elog::logChar1(int32_t _id, int32_t _level, const char* _log) { void elog::logChar1(int32_t _id, int32_t _level, const char* _log) {
elog::logChar(_id, _level, -1, nullptr, _log); elog::logChar(_id, _level, -1, null, _log);
} }
void elog::logStream1(int32_t _id, int32_t _level, const etk::Stream& _log) { void elog::logStream1(int32_t _id, int32_t _level, const etk::Stream& _log) {
elog::logChar(_id, _level, -1, nullptr, _log.c_str()); elog::logChar(_id, _level, -1, null, _log.c_str());
} }
static bool& getColor() { static bool& getColor() {
@ -274,7 +274,7 @@ void elog::setBackTrace(bool _status) {
static void getDisplayTime(char* data) { static void getDisplayTime(char* data) {
#ifdef __TARGET_OS__Android #ifdef __TARGET_OS__Android
struct timeval now; struct timeval now;
gettimeofday(&now, nullptr); gettimeofday(&now, null);
sprintf(data, " %2dh%2d'%2d ", (int32_t)(now.tv_sec/3600)%24, (int32_t)(now.tv_sec/60)%60, (int32_t)(now.tv_sec%60)); sprintf(data, " %2dh%2d'%2d ", (int32_t)(now.tv_sec/3600)%24, (int32_t)(now.tv_sec/60)%60, (int32_t)(now.tv_sec%60));
#else #else
time_t rawtime; time_t rawtime;
@ -286,14 +286,14 @@ static void getDisplayTime(char* data) {
} }
static ethread::Mutex g_lock; static ethread::Mutex g_lock;
static elog::callbackLog callbackUserLog(nullptr); static elog::callbackLog callbackUserLog(null);
static etk::String& getLogFileName() { static etk::String& getLogFileName() {
static etk::String g_val=""; static etk::String g_val="";
return g_val; return g_val;
} }
static FILE*& getLogFile() { static FILE*& getLogFile() {
static FILE* g_val=nullptr; static FILE* g_val=null;
return g_val; return g_val;
} }
@ -346,7 +346,7 @@ static int32_t FSNODE_LOCAL_mkPath(const char* _path, mode_t _mode) {
char *sp; char *sp;
int status; int status;
char *copypath = strdup(_path); char *copypath = strdup(_path);
if (nullptr==copypath) { if (null==copypath) {
return -1; return -1;
} }
status = 0; status = 0;
@ -391,7 +391,7 @@ void elog::setLogInFile(const etk::String& _filename) {
g_lock.lock(); g_lock.lock();
file = fopen(_filename.c_str(), "w"); file = fopen(_filename.c_str(), "w");
g_lock.unLock(); g_lock.unLock();
if (file == nullptr) { if (file == null) {
ELOG_ERROR("Can not open file: '" << _filename << "'"); ELOG_ERROR("Can not open file: '" << _filename << "'");
} }
} }
@ -401,10 +401,10 @@ void elog::unsetLogInFile() {
g_lock.lock(); g_lock.lock();
FILE*& file = getLogFile(); FILE*& file = getLogFile();
// close file only if needed ... // close file only if needed ...
if (file != nullptr) { if (file != null) {
fflush(file); fflush(file);
fclose(file); fclose(file);
file = nullptr; file = null;
} }
g_lock.unLock(); g_lock.unLock();
} }
@ -452,13 +452,13 @@ void elog::setCallbackLog(const elog::callbackLog& _callback) {
void elog::logChar(int32_t _id, int32_t _level, int32_t _ligne, const char* _funcName, const char* _log) { void elog::logChar(int32_t _id, int32_t _level, int32_t _ligne, const char* _funcName, const char* _log) {
// special callback mode: // special callback mode:
if (callbackUserLog != nullptr) { if (callbackUserLog != null) {
const char* libName = ""; const char* libName = "";
if (_id >= 0) { if (_id >= 0) {
libName = getList()[_id].first.c_str(); libName = getList()[_id].first.c_str();
} }
g_lock.lock(); g_lock.lock();
if (callbackUserLog != nullptr) { if (callbackUserLog != null) {
callbackUserLog(libName, elog::level(_level), _ligne, _funcName, _log); callbackUserLog(libName, elog::level(_level), _ligne, _funcName, _log);
} }
g_lock.unLock(); g_lock.unLock();
@ -586,14 +586,14 @@ void elog::logChar(int32_t _id, int32_t _level, int32_t _ligne, const char* _fun
int32_t len = strlen(handle); int32_t len = strlen(handle);
char tmpName[1024]; char tmpName[1024];
char *tmpPointer = tmpName; char *tmpPointer = tmpName;
if (_funcName != nullptr) { if (_funcName != null) {
// cleen for android : // cleen for android :
char* startPos = strchr((char*)_funcName, ' '); char* startPos = strchr((char*)_funcName, ' ');
char* stopPos = strchr((char*)_funcName, '('); char* stopPos = strchr((char*)_funcName, '(');
if (startPos != nullptr) { if (startPos != null) {
if (stopPos != nullptr) { if (stopPos != null) {
char* startPos2 = strchr(startPos+1, ' '); char* startPos2 = strchr(startPos+1, ' ');
while ( startPos2 != nullptr while ( startPos2 != null
&& startPos2 < stopPos) { && startPos2 < stopPos) {
startPos = startPos2; startPos = startPos2;
startPos2 = strchr(startPos+1, ' '); startPos2 = strchr(startPos+1, ' ');
@ -607,7 +607,7 @@ void elog::logChar(int32_t _id, int32_t _level, int32_t _ligne, const char* _fun
snprintf(tmpPointer, 1024, "%s", startPos); snprintf(tmpPointer, 1024, "%s", startPos);
} }
} else { } else {
if (stopPos != nullptr) { if (stopPos != null) {
snprintf(tmpPointer, etk::min(uint64_t(1024), uint64_t(stopPos)-uint64_t(_funcName)+1), "%s", _funcName); snprintf(tmpPointer, etk::min(uint64_t(1024), uint64_t(stopPos)-uint64_t(_funcName)+1), "%s", _funcName);
} else { } else {
snprintf(tmpPointer, 1024, "%s", _funcName); snprintf(tmpPointer, 1024, "%s", _funcName);
@ -651,7 +651,7 @@ void elog::logChar(int32_t _id, int32_t _level, int32_t _ligne, const char* _fun
size_t& fileCurrentCount = getLogFileCount(); size_t& fileCurrentCount = getLogFileCount();
size_t& fileMaxCount = getLogFileMaxCount(); size_t& fileMaxCount = getLogFileMaxCount();
// close file only if needed ... // close file only if needed ...
if (file != nullptr) { if (file != null) {
*pointer++ = '\n'; *pointer++ = '\n';
*pointer = '\0'; *pointer = '\0';
fprintf(file, "%s", handle); fprintf(file, "%s", handle);
@ -736,7 +736,7 @@ void elog::logChar(int32_t _id, int32_t _level, int32_t _ligne, const char* _fun
void elog::flush() { void elog::flush() {
g_lock.lock(); g_lock.lock();
FILE*& file = getLogFile(); FILE*& file = getLogFile();
if (file != nullptr) { if (file != null) {
fflush(file); fflush(file);
} }
fflush(stdout); fflush(stdout);