core,log: minor coding style changes

src/mm-log.c

@@ -72,7 +72,6 @@ static const LogDesc level_descs[] = {
     { MM_LOG_LEVEL_WARN  | MM_LOG_LEVEL_ERR, "WARN" },
     { MM_LOG_LEVEL_INFO  | MM_LOG_LEVEL_WARN | MM_LOG_LEVEL_ERR, "INFO" },
     { MM_LOG_LEVEL_DEBUG | MM_LOG_LEVEL_INFO | MM_LOG_LEVEL_WARN | MM_LOG_LEVEL_ERR, "DEBUG" },
-    { 0, NULL }
 };
 
 static GString *msgbuf = NULL;
@@ -82,14 +81,14 @@ static int
 mm_to_syslog_priority (MMLogLevel level)
 {
     switch (level) {
-    case MM_LOG_LEVEL_DEBUG:
-        return LOG_DEBUG;
+    case MM_LOG_LEVEL_ERR:
+        return LOG_ERR;
     case MM_LOG_LEVEL_WARN:
         return LOG_WARNING;
     case MM_LOG_LEVEL_INFO:
         return LOG_INFO;
-    case MM_LOG_LEVEL_ERR:
-        return LOG_ERR;
+    case MM_LOG_LEVEL_DEBUG:
+        return LOG_DEBUG;
     default:
         break;
     }
@@ -130,14 +129,14 @@ static const char *
 log_level_description (MMLogLevel level)
 {
     switch (level) {
-    case MM_LOG_LEVEL_DEBUG:
-        return "<debug>";
+    case MM_LOG_LEVEL_ERR:
+        return "<error>";
     case MM_LOG_LEVEL_WARN:
         return "<warn> ";
     case MM_LOG_LEVEL_INFO:
         return "<info> ";
-    case MM_LOG_LEVEL_ERR:
-        return "<error>";
+    case MM_LOG_LEVEL_DEBUG:
+        return "<debug>";
     default:
         break;
     }
@@ -153,6 +152,7 @@ log_backend_file (const char *loc,
                   size_t      length)
 {
     ssize_t ign;
+
     ign = write (logfd, message, length);
     if (ign) {} /* whatever; really shut up about unused result */
 
@@ -276,22 +276,23 @@ log_handler (const gchar *log_domain,
 }
 
 gboolean
-mm_log_set_level (const char *level, GError **error)
+mm_log_set_level (const gchar  *level,
+                  GError      **error)
 {
-    gboolean found = FALSE;
-    const LogDesc *diter;
+    guint i;
 
-    for (diter = &level_descs[0]; diter->name; diter++) {
-        if (!strcasecmp (diter->name, level)) {
-            log_level = diter->num;
-            found = TRUE;
+    for (i = 0; i < G_N_ELEMENTS (level_descs); i++) {
+        if (!g_ascii_strcasecmp (level_descs[i].name, level)) {
+            log_level = level_descs[i].num;
             break;
         }
     }
 
-    if (!found)
+    if (i == G_N_ELEMENTS (level_descs)) {
         g_set_error (error, MM_CORE_ERROR, MM_CORE_ERROR_INVALID_ARGS,
                      "Unknown log level '%s'", level);
+        return FALSE;
+    }
 
 #if defined WITH_QMI
     qmi_utils_set_traces_enabled (log_level & MM_LOG_LEVEL_DEBUG ? TRUE : FALSE);
@@ -301,12 +302,12 @@ mm_log_set_level (const char *level, GError **error)
     mbim_utils_set_traces_enabled (log_level & MM_LOG_LEVEL_DEBUG ? TRUE : FALSE);
 #endif
 
-    return found;
+    return TRUE;
 }
 
 gboolean
-mm_log_setup (const char *level,
-              const char *log_file,
+mm_log_setup (const gchar  *level,
+              const gchar  *log_file,
               gboolean      log_journal,
               gboolean      show_timestamps,
               gboolean      rel_timestamps,
@@ -331,7 +332,7 @@ mm_log_setup (const char *level,
         append_log_level_text = FALSE;
     } else
 #endif
-    if (log_file == NULL) {
+    if (!log_file) {
         openlog (G_LOG_DOMAIN, LOG_CONS | LOG_PID | LOG_PERROR, LOG_DAEMON);
         log_backend = log_backend_syslog;
     } else {

src/mm-log.h

@@ -11,7 +11,8 @@
  * GNU General Public License for more details:
  *
  * Copyright (C) 2011-2020 Red Hat, Inc.
- * Copyright (C) 2020 Aleksander Morgado <aleksander@aleksander.es>
+ * Copyright (C) 2020-2022 Aleksander Morgado <aleksander@aleksander.es>
+ * Copyright (C) 2022 Google, Inc.
  */
 
 #ifndef MM_LOG_H
@@ -24,7 +25,7 @@ typedef enum {
     MM_LOG_LEVEL_ERR   = 0x00000001,
     MM_LOG_LEVEL_WARN  = 0x00000002,
     MM_LOG_LEVEL_INFO  = 0x00000004,
-    MM_LOG_LEVEL_DEBUG = 0x00000008
+    MM_LOG_LEVEL_DEBUG = 0x00000008,
 } MMLogLevel;
 
 #if !defined MM_MODULE_NAME
@@ -53,16 +54,15 @@ void _mm_log (gpointer     obj,
               const gchar *fmt,
               ...)  __attribute__((__format__ (__printf__, 6, 7)));
 
-gboolean mm_log_set_level (const char *level, GError **error);
-
-gboolean mm_log_setup (const char *level,
-                       const char *log_file,
+gboolean mm_log_set_level (const gchar  *level,
+                           GError      **error);
+gboolean mm_log_setup     (const gchar  *level,
+                           const gchar  *log_file,
                            gboolean      log_journal,
                            gboolean      show_ts,
                            gboolean      rel_ts,
                            gboolean      show_personal_info,
                            GError      **error);
-
 void     mm_log_shutdown  (void);
 
 #endif  /* MM_LOG_H */