From: Thomas Haller <thaller@redhat.com>
Date: Sun, 3 Feb 2019 11:56:24 +0000 (+0100)
Subject: hashmap: avoid uninitialized variable warning in internal_hashmap_clear()
X-Git-Tag: v241~19^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca3237150e965c33863addb9e89100030692d36d;p=thirdparty%2Fsystemd.git

hashmap: avoid uninitialized variable warning in internal_hashmap_clear()

GCC 8.2 with LTO and -O2 emits a false warning:

    src/basic/hashmap.c: In function 'internal_hashmap_free.constprop':
    src/basic/hashmap.c:898:33: error: 'k' may be used uninitialized in this function [-Werror=maybe-uninitialized]
                      free_key(k);
                      ^

Avoid it by initializing the variable.
---

diff --git a/src/basic/hashmap.c b/src/basic/hashmap.c
index f2e33d22656..80fec8fb535 100644
--- a/src/basic/hashmap.c
+++ b/src/basic/hashmap.c
@@ -888,7 +888,8 @@ void internal_hashmap_clear(HashmapBase *h, free_func_t default_free_key, free_f
                  * themselves from our hash table a second time, the entry is already gone. */
 
                 while (internal_hashmap_size(h) > 0) {
-                        void *v, *k;
+                        void *k = NULL;
+                        void *v;
 
                         v = internal_hashmap_first_key_and_value(h, true, &k);