From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 30 Sep 2015 12:16:40 +0000 (+0200)
Subject: log: properly return -EINVAL from log_set_max_level_from_string()
X-Git-Tag: v227~55^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=737af7347c03a6ed2dfeea76647e9c1ca5b05a64;p=thirdparty%2Fsystemd.git

log: properly return -EINVAL from log_set_max_level_from_string()

If we just return the value we got from log_level_from_string() on
failure we'll return -1, which is not a proper error code.

log_set_target_from_string() did get this right already, hence let's fix
this here too.
---

diff --git a/src/basic/log.c b/src/basic/log.c
index 38f42b3a6e3..e6d7d151820 100644
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -922,7 +922,7 @@ int log_set_max_level_from_string(const char *e) {
 
         t = log_level_from_string(e);
         if (t < 0)
-                return t;
+                return -EINVAL;
 
         log_set_max_level(t);
         return 0;