diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2012-09-24 23:20:43 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2012-09-24 23:20:43 +0900 |
| commit | d8c44fe9e8cc73903fba710490c59016d5dfd972 (patch) | |
| tree | 409f2bcd464efcc055668f0930fa03b792d54ebf /src/Logger.cc | |
| parent | 0144397e4b3897035d76c40827d7f8a753868f2a (diff) | |
Use const char* instead of static const std::string
Diffstat (limited to 'src/Logger.cc')
| -rw-r--r-- | src/Logger.cc | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/src/Logger.cc b/src/Logger.cc index 3e3ee814..a123db01 100644 --- a/src/Logger.cc +++ b/src/Logger.cc @@ -48,18 +48,6 @@ namespace aria2 { -namespace { -static const std::string DEBUG_LABEL("DEBUG"); - -static const std::string INFO_LABEL("INFO"); - -static const std::string NOTICE_LABEL("NOTICE"); - -static const std::string WARN_LABEL("WARN"); - -static const std::string ERROR_LABEL("ERROR"); -} // namespace - Logger::Logger() : logLevel_(Logger::A2_DEBUG), stdoutField_(0) @@ -104,21 +92,21 @@ bool Logger::levelEnabled(LEVEL level) } namespace { -const std::string& levelToString(Logger::LEVEL level) +const char* levelToString(Logger::LEVEL level) { switch(level) { case Logger::A2_DEBUG: - return DEBUG_LABEL; + return "DEBUG"; case Logger::A2_INFO: - return INFO_LABEL; + return "INFO"; case Logger::A2_NOTICE: - return NOTICE_LABEL; + return "NOTICE"; case Logger::A2_WARN: - return WARN_LABEL; + return "WARN"; case Logger::A2_ERROR: - return ERROR_LABEL; + return "ERROR"; default: - return A2STR::NIL; + return ""; } } } // namespace @@ -138,8 +126,7 @@ void writeHeader size_t dateLength = strftime(datestr, sizeof(datestr), "%Y-%m-%d %H:%M:%S", &tm); assert(dateLength <= (size_t)20); - fp.printf("%s.%06ld %s - ", datestr, tv.tv_usec, - levelToString(level).c_str()); + fp.printf("%s.%06ld %s - ", datestr, tv.tv_usec, levelToString(level)); if(sourceFile) { fp.printf("[%s:%d]", sourceFile, lineNum); } |
