]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
core: small fixes to parse_namespace 1773/head
authorEvgeny Vereshchagin <evvers@ya.ru>
Tue, 3 Nov 2015 21:32:34 +0000 (00:32 +0300)
committerEvgeny Vereshchagin <evvers@ya.ru>
Tue, 3 Nov 2015 21:41:18 +0000 (00:41 +0300)
* don't hide ENOMEM
* log r instead of 0

src/core/load-fragment.c

index a30cd0967d5fc0c7b6228ab812a2be120ee9682a..594974937481dbe0a077beee70d391a5bcc9e10b 100644 (file)
@@ -3232,12 +3232,14 @@ int config_parse_namespace_path_strv(
                 int offset;
 
                 r = extract_first_word(&cur, &word, NULL, EXTRACT_QUOTES);
+                if (r == 0)
+                        break;
+                if (r == -ENOMEM)
+                        return log_oom();
                 if (r < 0) {
-                        log_syntax(unit, LOG_ERR, filename, line, 0, "Trailing garbage, ignoring: %s", prev);
+                        log_syntax(unit, LOG_ERR, filename, line, r, "Trailing garbage, ignoring: %s", prev);
                         return 0;
                 }
-                if (r == 0)
-                        break;
 
                 if (!utf8_is_valid(word)) {
                         log_syntax_invalid_utf8(unit, LOG_ERR, filename, line, word);