procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid compilation warning in w32fns.c

Browse source 
* 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>.
This commit is contained in:
Eli Zaretskii 2018-08-18 09:24:38 +03:00
parent 3300287236
commit 877cd22f55
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/w32fns.c
View file

@ -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);