Blame SOURCES/0788-systemctl-remove-dead-check.patch
|
|
ff2b41 |
From 9e1bc4f2d8c24ad1b257e3452212d945e1078a8f Mon Sep 17 00:00:00 2001
|
|
|
ff2b41 |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
ff2b41 |
Date: Sat, 7 Mar 2015 15:00:22 -0500
|
|
|
ff2b41 |
Subject: [PATCH] systemctl: remove dead check
|
|
|
ff2b41 |
|
|
|
ff2b41 |
r could never be less than zero.
|
|
|
ff2b41 |
|
|
|
ff2b41 |
CID #1271350.
|
|
|
ff2b41 |
|
|
|
ff2b41 |
(cherry picked from commit 2558691285b2f7b3078b43b26736fcadf3c6d194)
|
|
|
ff2b41 |
|
|
|
ff2b41 |
Resolves: #1694605
|
|
|
ff2b41 |
---
|
|
|
ff2b41 |
src/systemctl/systemctl.c | 4 ++--
|
|
|
ff2b41 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
ff2b41 |
|
|
|
ff2b41 |
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
|
|
|
ff2b41 |
index 83c418f0b7..a55340f0a4 100644
|
|
|
ff2b41 |
--- a/src/systemctl/systemctl.c
|
|
|
ff2b41 |
+++ b/src/systemctl/systemctl.c
|
|
|
ff2b41 |
@@ -4652,7 +4652,7 @@ static int cat(sd_bus *bus, char **args) {
|
|
|
ff2b41 |
_cleanup_strv_free_ char **names = NULL;
|
|
|
ff2b41 |
char **name;
|
|
|
ff2b41 |
bool first = true, avoid_bus_cache;
|
|
|
ff2b41 |
- int r = 0;
|
|
|
ff2b41 |
+ int r;
|
|
|
ff2b41 |
|
|
|
ff2b41 |
assert(args);
|
|
|
ff2b41 |
|
|
|
ff2b41 |
@@ -4702,7 +4702,7 @@ static int cat(sd_bus *bus, char **args) {
|
|
|
ff2b41 |
}
|
|
|
ff2b41 |
}
|
|
|
ff2b41 |
|
|
|
ff2b41 |
- return r < 0 ? r : 0;
|
|
|
ff2b41 |
+ return 0;
|
|
|
ff2b41 |
}
|
|
|
ff2b41 |
|
|
|
ff2b41 |
static int set_property(sd_bus *bus, char **args) {
|