Blame 0288-sysv-generator-don-t-check-first-if-hashmap-contains.patch
|
 |
708deb9 |
From 8c84621c25c563c7428f3d355136fc542389aab8 Mon Sep 17 00:00:00 2001
|
|
|
708deb9 |
From: Thomas Hindoe Paaboel Andersen <phomes@gmail.com>
|
|
|
708deb9 |
Date: Wed, 17 Sep 2014 23:03:27 +0200
|
|
|
708deb9 |
Subject: [PATCH] sysv-generator: don't check first if hashmap contains the
|
|
|
708deb9 |
service name
|
|
|
708deb9 |
|
|
|
708deb9 |
Just test if hashmap_get returns null. hashmap_contains does exactly
|
|
|
708deb9 |
same thing internally so this is slightly more efficient for the true
|
|
|
708deb9 |
case.
|
|
|
708deb9 |
|
|
|
708deb9 |
Silences a coverity warning too. CID#1237648
|
|
|
708deb9 |
---
|
|
|
708deb9 |
src/sysv-generator/sysv-generator.c | 5 ++---
|
|
|
708deb9 |
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
708deb9 |
|
|
|
708deb9 |
diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
|
|
|
708deb9 |
index e5902ab8f8..43bcaa862f 100644
|
|
|
708deb9 |
--- a/src/sysv-generator/sysv-generator.c
|
|
|
708deb9 |
+++ b/src/sysv-generator/sysv-generator.c
|
|
|
708deb9 |
@@ -810,9 +810,8 @@ static int set_dependencies_from_rcnd(LookupPaths lp, Hashmap *all_services) {
|
|
|
708deb9 |
goto finish;
|
|
|
708deb9 |
}
|
|
|
708deb9 |
|
|
|
708deb9 |
- if (hashmap_contains(all_services, name))
|
|
|
708deb9 |
- service = hashmap_get(all_services, name);
|
|
|
708deb9 |
- else {
|
|
|
708deb9 |
+ service = hashmap_get(all_services, name);
|
|
|
708deb9 |
+ if (!service){
|
|
|
708deb9 |
log_warning("Could not find init script for %s", name);
|
|
|
708deb9 |
continue;
|
|
|
708deb9 |
}
|