Do not segfault on unknown options.

[cubemap] / log.cpp

diff --git a/log.cpp b/log.cpp
index a4f923644a5b9597febecb038fa8c54c8526a207..0b3db4fdf2c0d7c363e204951a9539a73e0fec9b 100644 (file)
--- a/log.cpp
+++ b/log.cpp
@@ -71,12 +71,8 @@ void log(LogLevel log_level, const char *fmt, ...)
        int syslog_level;
 
        switch (log_level) {
-       case NO_LEVEL:
-               log_level_str = "";
-               syslog_level = LOG_INFO;
-               break;
        case INFO:
-               log_level_str = "INFO: ";
+               log_level_str = "INFO:    ";
                syslog_level = LOG_INFO;
                break;
        case WARNING:
@@ -84,7 +80,7 @@ void log(LogLevel log_level, const char *fmt, ...)
                syslog_level = LOG_WARNING;
                break;
        case ERROR:
-               log_level_str = "ERROR: ";
+               log_level_str = "ERROR:   ";
                syslog_level = LOG_ERR;
                break;
        default:
@@ -116,6 +112,5 @@ void log(LogLevel log_level, const char *fmt, ...)
 void log_perror(const char *msg)
 {
        char errbuf[4096];
-       strerror_r(errno, errbuf, sizeof(errbuf));
-       log(ERROR, "%s: %s", msg, errbuf);
+       log(ERROR, "%s: %s", msg, strerror_r(errno, errbuf, sizeof(errbuf)));
 }