From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 18 Aug 2018 06:24:38 +0000 (+0300)
Subject: Avoid compilation warning in w32fns.c
X-Git-Tag: emacs-27.0.90~4548
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=877cd22f553624b6d7f24141acd134f9cf839259;p=emacs.git

Avoid compilation warning in w32fns.c

* src/w32fns.c (Fw32_read_registry): Avoid compiler warning
regarding possible use of 'rootkey' without initializing it
first.  Reported by Andy Moreton <andrewjmoreton@gmail.com>.
---

diff --git a/src/w32fns.c b/src/w32fns.c
index c32868fa695..b587677f090 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -10125,7 +10125,7 @@ to be converted to forward slashes by the caller.  */)
   CHECK_STRING (key);
   CHECK_STRING (name);
 
-  HKEY rootkey;
+  HKEY rootkey = HKEY_CURRENT_USER;
   if (EQ (root, QHKCR))
     rootkey = HKEY_CLASSES_ROOT;
   else if (EQ (root, QHKCU))
@@ -10139,10 +10139,7 @@ to be converted to forward slashes by the caller.  */)
   else if (!NILP (root))
     error ("unknown root key: %s", SDATA (SYMBOL_NAME (root)));
 
-  Lisp_Object val = w32_read_registry (NILP (root)
-				       ? HKEY_CURRENT_USER
-				       : rootkey,
-				       key, name);
+  Lisp_Object val = w32_read_registry (rootkey, key, name);
   if (NILP (val) && NILP (root))
     val = w32_read_registry (HKEY_LOCAL_MACHINE, key, name);