From 04ed17a15221c9ea0ae8cd8ff73ec1898a9bd1ce Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Sun, 31 Jul 2016 07:20:21 +0000 Subject: [PATCH] correct some of my erroneous snprintfs --- .../LogServer/src/shared/LoggingServerApiObserver.cpp | 2 +- .../shared/library/sharedLog/src/shared/FileLogObserver.cpp | 4 ++-- .../library/sharedLog/src/shared/TailFileLogObserver.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/engine/server/application/LogServer/src/shared/LoggingServerApiObserver.cpp b/engine/server/application/LogServer/src/shared/LoggingServerApiObserver.cpp index bd8c4753..199f65da 100755 --- a/engine/server/application/LogServer/src/shared/LoggingServerApiObserver.cpp +++ b/engine/server/application/LogServer/src/shared/LoggingServerApiObserver.cpp @@ -58,7 +58,7 @@ void LoggingServerApiObserver::log(const LogMessage & msg) IGNORE_RETURN(time(&now)); IGNORE_RETURN(gmtime_r(&now, &t)); char dirBuf[128] = { "\0" }; - snprintf(dirBuf, sizeof(dirBuf), "%d/%d/%d/", t.tm_year + 1900, t.tm_mon + 1, t.tm_mday); + snprintf(dirBuf, 128, "%d/%d/%d/", t.tm_year + 1900, t.tm_mon + 1, t.tm_mday); fileName = ConfigLogServer::getClusterName(); fileName += "/"; fileName += dirBuf; diff --git a/engine/shared/library/sharedLog/src/shared/FileLogObserver.cpp b/engine/shared/library/sharedLog/src/shared/FileLogObserver.cpp index 702e8fce..d5455aab 100755 --- a/engine/shared/library/sharedLog/src/shared/FileLogObserver.cpp +++ b/engine/shared/library/sharedLog/src/shared/FileLogObserver.cpp @@ -62,7 +62,7 @@ void FileLogObserver::prepareFile() else { char buf[512]; - IGNORE_RETURN( snprintf(buf, 512, "%s-%d", m_filename.c_str(), m_fileIndex+1) ); + IGNORE_RETURN( snprintf(buf, sizeof(buf), "%s-%d", m_filename.c_str(), m_fileIndex+1) ); m_file = new StdioFile(buf, "a"); } NOT_NULL(m_file); @@ -91,7 +91,7 @@ void FileLogObserver::log(LogMessage const &msg) std::string uniAttach(Unicode::wideToNarrow(msg.getUnicodeAttach())); char tsbuf[16]; // yyyymmddhhmmss (14) - IGNORE_RETURN( snprintf(tsbuf, 16, UINT64_FORMAT_SPECIFIER, timestamp) ); + IGNORE_RETURN( snprintf(tsbuf, sizeof(tsbuf), UINT64_FORMAT_SPECIFIER, timestamp) ); IGNORE_RETURN( m_file->write(14, tsbuf) ); IGNORE_RETURN( m_file->write(1, ":") ); IGNORE_RETURN( m_file->write(static_cast(procId.length()), procId.c_str()) ); diff --git a/engine/shared/library/sharedLog/src/shared/TailFileLogObserver.cpp b/engine/shared/library/sharedLog/src/shared/TailFileLogObserver.cpp index 18c7a4f9..28459ebd 100755 --- a/engine/shared/library/sharedLog/src/shared/TailFileLogObserver.cpp +++ b/engine/shared/library/sharedLog/src/shared/TailFileLogObserver.cpp @@ -93,7 +93,7 @@ void TailFileLogObserver::prepareFile() else { char buf[512]; - IGNORE_RETURN( snprintf(buf, 512, "%s-%d", m_filename.c_str(), m_fileIndex+1) ); + IGNORE_RETURN( snprintf(buf, sizeof(buf), "%s-%d", m_filename.c_str(), m_fileIndex+1) ); m_file = new StdioFile(buf, "a"); } NOT_NULL(m_file); @@ -123,7 +123,7 @@ void TailFileLogObserver::log(LogMessage const &msg) char tsbuf[16]; // yyyymmddhhmmss (14) newLogMessage.clear(); - IGNORE_RETURN( snprintf(tsbuf, 16, UINT64_FORMAT_SPECIFIER, timestamp) ); + IGNORE_RETURN( snprintf(tsbuf, sizeof(tsbuf), UINT64_FORMAT_SPECIFIER, timestamp) ); newLogMessage.append(tsbuf); newLogMessage.append(":"); newLogMessage.append(procId);