libudev: Use correct free function

[elogind.git] / src / libudev / libudev.c

diff --git a/src/libudev/libudev.c b/src/libudev/libudev.c
index 7803863b2e946d00951487bc4e36684b0b35b868..b1649b651435cce8b10bd9022a8cc25dde25eb0b 100644 (file)
--- a/src/libudev/libudev.c
+++ b/src/libudev/libudev.c
@@ -79,7 +79,7 @@ static void log_stderr(struct udev *udev,
  * @udev: udev library context
  *
  * Retrieve stored data pointer from library context. This might be useful
- * to access from callbacks like a custom logging function.
+ * to access from callbacks like a custom log function.
  *
  * Returns: stored userdata
  **/
@@ -119,7 +119,7 @@ _public_ struct udev *udev_new(void)
 {
         struct udev *udev;
         const char *env;
-        _cleanup_free_ FILE *f = NULL;
+        _cleanup_fclose_ FILE *f = NULL;
 
         udev = new0(struct udev, 1);
         if (udev == NULL)
@@ -193,7 +193,13 @@ _public_ struct udev *udev_new(void)
                         }
 
                         if (streq(key, "udev_log")) {
-                                udev_set_log_priority(udev, util_log_priority(val));
+                                int prio;
+
+                                prio = util_log_priority(val);
+                                if (prio < 0)
+                                        udev_err(udev, "/etc/udev/udev.conf:%u: invalid log level '%s', ignoring.\n", line_nr, val);
+                                else
+                                        udev_set_log_priority(udev, prio);
                                 continue;
                         }
                 }
@@ -201,8 +207,15 @@ _public_ struct udev *udev_new(void)
 
         /* environment overrides config */
         env = secure_getenv("UDEV_LOG");
-        if (env != NULL)
-                udev_set_log_priority(udev, util_log_priority(env));
+        if (env != NULL) {
+                int prio;
+
+                prio = util_log_priority(env);
+                if (prio < 0)
+                        udev_err(udev, "$UDEV_LOG specifies invalid log level '%s', ignoring.\n", env);
+                else
+                        udev_set_log_priority(udev, prio);
+        }
 
         return udev;
 }
@@ -247,11 +260,11 @@ _public_ struct udev *udev_unref(struct udev *udev)
 /**
  * udev_set_log_fn:
  * @udev: udev library context
- * @log_fn: function to be called for logging messages
+ * @log_fn: function to be called for log messages
  *
  * The built-in logging writes to stderr. It can be
  * overridden by a custom function, to plug log messages
- * into the users' logging functionality.
+ * into the users' log functionality.
  *
  **/
 _public_ void udev_set_log_fn(struct udev *udev,
@@ -260,17 +273,16 @@ _public_ void udev_set_log_fn(struct udev *udev,
                                     const char *format, va_list args))
 {
         udev->log_fn = log_fn;
-        udev_dbg(udev, "custom logging function %p registered\n", log_fn);
+        udev_dbg(udev, "custom log function %p registered\n", log_fn);
 }
 
 /**
  * udev_get_log_priority:
  * @udev: udev library context
  *
- * The initial logging priority is read from the udev config file
- * at startup.
+ * The initial log level is read from the udev config file at startup.
  *
- * Returns: the current logging priority
+ * Returns: the current log level
  **/
 _public_ int udev_get_log_priority(struct udev *udev)
 {
@@ -280,10 +292,9 @@ _public_ int udev_get_log_priority(struct udev *udev)
 /**
  * udev_set_log_priority:
  * @udev: udev library context
- * @priority: the new logging priority
+ * @priority: the new log priority
  *
- * Set the current logging priority. The value controls which messages
- * are logged.
+ * Set the log level. This value controls which messages are logged.
  **/
 _public_ void udev_set_log_priority(struct udev *udev, int priority)
 {