[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 877cd22: Avoid compilation warning in w32fns.c
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] master 877cd22: Avoid compilation warning in w32fns.c |
Date: |
Sat, 18 Aug 2018 02:25:36 -0400 (EDT) |
branch: master
commit 877cd22f553624b6d7f24141acd134f9cf839259
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
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 <address@hidden>.
---
src/w32fns.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/w32fns.c b/src/w32fns.c
index c32868f..b587677 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);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 877cd22: Avoid compilation warning in w32fns.c,
Eli Zaretskii <=