Blame SOURCES/0787-systemctl-set_put-can-t-return-EEXIST.patch
|
 |
ff2b41 |
From 732efbce6725db08a527e14d34f4e10e51fae965 Mon Sep 17 00:00:00 2001
|
|
|
ff2b41 |
From: Frantisek Sumsal <fsumsal@redhat.com>
|
|
|
ff2b41 |
Date: Thu, 28 Feb 2019 11:35:53 +0100
|
|
|
ff2b41 |
Subject: [PATCH] systemctl: set_put() can't return (-)EEXIST
|
|
|
ff2b41 |
|
|
|
ff2b41 |
set_put() returns 0 if the key already exists, 1 if the entry
|
|
|
ff2b41 |
was inserted successfully, and -ENOMEM otherwise.
|
|
|
ff2b41 |
|
|
|
ff2b41 |
See: set_put(), hashmap_base_put_boldly()
|
|
|
ff2b41 |
|
|
|
ff2b41 |
Found by LGTM.
|
|
|
ff2b41 |
|
|
|
ff2b41 |
Resolves: #1694605
|
|
|
ff2b41 |
---
|
|
|
ff2b41 |
src/systemctl/systemctl.c | 2 +-
|
|
|
ff2b41 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
ff2b41 |
|
|
|
ff2b41 |
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
|
|
|
ff2b41 |
index 398727cc7d..83c418f0b7 100644
|
|
|
ff2b41 |
--- a/src/systemctl/systemctl.c
|
|
|
ff2b41 |
+++ b/src/systemctl/systemctl.c
|
|
|
ff2b41 |
@@ -4310,7 +4310,7 @@ static int show_one(
|
|
|
ff2b41 |
return log_oom();
|
|
|
ff2b41 |
|
|
|
ff2b41 |
r = set_put(found_properties, name);
|
|
|
ff2b41 |
- if (r < 0 && r != EEXIST)
|
|
|
ff2b41 |
+ if (r < 0)
|
|
|
ff2b41 |
return log_oom();
|
|
|
ff2b41 |
|
|
|
ff2b41 |
r = print_property(name, reply, contents);
|