mirror of
https://bitbucket.org/theswgsource/src-1.2.git
synced 2026-09-29 14:12:54 -04:00
newer standards prefer nullptr over NULL - this is most of them but there are others too
This commit is contained in:
@@ -18,20 +18,20 @@ Logger::Logger(const char *prefix, int level, unsigned size, bool rollDate)
|
||||
: m_defaultLevel(level), m_defaultSize(size), m_dirPrefix(prefix), m_rollDate(rollDate)
|
||||
{
|
||||
char buf[1024];
|
||||
FILE *logDir = NULL;
|
||||
FILE *logDir = nullptr;
|
||||
|
||||
logDir = fopen(m_dirPrefix.c_str(), "r+");
|
||||
if(errno == ENOENT)
|
||||
{
|
||||
cmkdir(m_dirPrefix.c_str(), 0755);
|
||||
}
|
||||
else if(logDir != NULL)
|
||||
else if(logDir != nullptr)
|
||||
{
|
||||
fclose(logDir);
|
||||
}
|
||||
|
||||
tm now;
|
||||
time_t t = time(NULL);
|
||||
time_t t = time(nullptr);
|
||||
localtime_r(&t, &now);
|
||||
|
||||
memcpy(&m_lastDateTime, &now, sizeof(tm));
|
||||
@@ -48,7 +48,7 @@ Logger::Logger(const char *prefix, int level, unsigned size, bool rollDate)
|
||||
{
|
||||
cmkdir(buf, 0755);
|
||||
}
|
||||
else if(logDir != NULL)
|
||||
else if(logDir != nullptr)
|
||||
{
|
||||
fclose(logDir);
|
||||
}
|
||||
@@ -178,7 +178,7 @@ void Logger::logSimple(unsigned logenum, int level, const char *message)
|
||||
{
|
||||
return;
|
||||
}
|
||||
time_t t = time(NULL);
|
||||
time_t t = time(nullptr);
|
||||
LogInfo *info = (*iter).second;
|
||||
if(level >= info->level)
|
||||
{
|
||||
@@ -241,7 +241,7 @@ void Logger::log(unsigned logenum, int level, const char *message, ...)
|
||||
{
|
||||
return;
|
||||
}
|
||||
time_t t = time(NULL);
|
||||
time_t t = time(nullptr);
|
||||
LogInfo *info = (*iter).second;
|
||||
if(level >= info->level)
|
||||
{
|
||||
@@ -294,14 +294,14 @@ void Logger::log(unsigned logenum, int level, const char *message, ...)
|
||||
void Logger::rollDate(time_t t)
|
||||
{
|
||||
char buf[80];
|
||||
FILE *logDir = NULL;
|
||||
FILE *logDir = nullptr;
|
||||
|
||||
logDir = fopen(m_dirPrefix.c_str(), "r+");
|
||||
if(errno == ENOENT)
|
||||
{
|
||||
cmkdir(m_dirPrefix.c_str(), 0755);
|
||||
}
|
||||
else if(logDir != NULL)
|
||||
else if(logDir != nullptr)
|
||||
{
|
||||
fclose(logDir);
|
||||
}
|
||||
@@ -316,7 +316,7 @@ void Logger::rollDate(time_t t)
|
||||
{
|
||||
cmkdir(buf, 0755);
|
||||
}
|
||||
else if(logDir != NULL)
|
||||
else if(logDir != nullptr)
|
||||
{
|
||||
fclose(logDir);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user