Commit f3513a79 authored by unknown's avatar unknown
Browse files

more snprintf...

parent 63920158

ndb/src/common/debugger/EventLogger.cpp

+105 −105

File changed.

Preview size limit exceeded, changes collapsed.

ndb/src/common/logger/FileLogHandler.cpp

+2 −2
Original line number Diff line number Diff line
@@ -153,11 +153,11 @@ FileLogHandler::createNewFile() 
    if (fileNo >= m_maxNoFiles)

    {

      fileNo = 1;

      ::snprintf(newName, sizeof(newName),

      BaseString::snprintf(newName, sizeof(newName),

		 "%s.%d", m_pLogFile->getName(), fileNo);

      break;

    }		

    ::snprintf(newName, sizeof(newName),

    BaseString::snprintf(newName, sizeof(newName),

	       "%s.%d", m_pLogFile->getName(), fileNo++); 

    

  } while (File_class::exists(newName));

ndb/src/common/logger/LogHandler.cpp

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ LogHandler::getDefaultHeader(char* pStr, const char* pCategory, 
			     Logger::LoggerLevel level) const

{

  char time[MAX_DATE_TIME_HEADER_LENGTH];

  ::snprintf(pStr, MAX_HEADER_LENGTH, "%s [%s] %s -- ", 

  BaseString::snprintf(pStr, MAX_HEADER_LENGTH, "%s [%s] %s -- ", 

	     getTimeAsString((char*)time),

	     pCategory,

	     Logger::LoggerLevelNames[level]);
@@ -84,7 +84,7 @@ LogHandler::getTimeAsString(char* pStr) const 
  tm_now = ::localtime(&now); //uses the "current" timezone

#endif



  ::snprintf(pStr, MAX_DATE_TIME_HEADER_LENGTH, 

  BaseString::snprintf(pStr, MAX_DATE_TIME_HEADER_LENGTH, 

	     m_pDateTimeFormat, 

	     tm_now->tm_year + 1900, 

	     tm_now->tm_mon + 1, //month is [0,11]. +1 -> [1,12]

ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ LogHandlerListUnitTest::testTraverseNext(const char* msg) 
  {

    char* str = new char[3];

    pHandlers[i] = new ConsoleLogHandler();

    ::snprintf(str, 3, "%d", i);

    BaseString::snprintf(str, 3, "%d", i);

    pHandlers[i]->setDateTimeFormat(str);   

    list.add(pHandlers[i]);

  }

ndb/src/common/logger/loggertest/LoggerUnitTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ NDB_COMMAND(loggertest, "loggertest", "loggertest -console | -file", 
  {

    ndbout << "-- " << " Test " << i + 1 

         << " [" << testCases[i].name << "] --" << endl;

    ::snprintf(str, 256, "%s %s %s %d", "Logging ", 

    BaseString::snprintf(str, 256, "%s %s %s %d", "Logging ", 

	       testCases[i].name, " message ", i);  

    if (testCases[i].test(str))

    {