From: Thomas Hindoe Paaboel Andersen <phomes@gmail.com>
Date: Sun, 22 Nov 2015 22:10:26 +0000 (+0100)
Subject: systemctl: do not return uninitialized r
X-Git-Tag: v231~935^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bf4095801958ffd3ffaec219198f3aba5a484206;p=platform%2Fupstream%2Fsystemd.git

systemctl: do not return uninitialized r

Regresssed during port to extract_first_word in
5ab22f3321d238957c03dcc6a6db76491e3989b8

CID #1338060
---

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 240fa2c..f478d80 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -6550,8 +6550,10 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
                         return version();
 
                 case 't': {
-                        if (isempty(optarg))
-                                return log_error_errno(r, "--type requires arguments.");
+                        if (isempty(optarg)) {
+                                log_error("--type requires arguments.");
+                                return -EINVAL;
+                        }
 
                         p = optarg;
                         for(;;) {
@@ -6783,8 +6785,10 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
                         break;
 
                 case ARG_STATE: {
-                        if (isempty(optarg))
-                                return log_error_errno(r, "--signal requires arguments.");
+                        if (isempty(optarg)) {
+                                log_error("--signal requires arguments.");
+                                return -EINVAL;
+                        }
 
                         p = optarg;
                         for(;;) {