remove dead breaks and returns

[nssm.git] / registry.cpp

diff --git a/registry.cpp b/registry.cpp
index e3817a4..258b96a 100644 (file)
--- a/registry.cpp
+++ b/registry.cpp
@@ -353,12 +353,10 @@ int set_string(HKEY key, TCHAR *value, TCHAR *string, bool expand) {
 \r
 int set_string(HKEY key, TCHAR *value, TCHAR *string) {\r
   return set_string(key, value, string, false);\r
-  return 1;\r
 }\r
 \r
 int set_expand_string(HKEY key, TCHAR *value, TCHAR *string) {\r
   return set_string(key, value, string, true);\r
-  return 1;\r
 }\r
 \r
 /*\r
@@ -524,7 +522,7 @@ long open_registry(const TCHAR *service_name, const TCHAR *sub, REGSAM sam, HKEY
 \r
 HKEY open_registry(const TCHAR *service_name, const TCHAR *sub, REGSAM sam, bool must_exist) {\r
   HKEY key;\r
-  long error = open_registry(service_name, sub, sam, &key, true);\r
+  long error = open_registry(service_name, sub, sam, &key, must_exist);\r
   return key;\r
 }\r
 \r
@@ -822,8 +820,15 @@ int get_hook(const TCHAR *service_name, const TCHAR *hook_event, const TCHAR *ho
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("hook registry"), _T("get_hook()"), 0);\r
     return 1;\r
   }\r
-  HKEY key = open_registry(service_name, registry, KEY_READ, false);\r
-  if (! key) return 1;\r
+  HKEY key;\r
+  long error = open_registry(service_name, registry, KEY_READ, &key, false);\r
+  if (! key) {\r
+    if (error == ERROR_FILE_NOT_FOUND) {\r
+      ZeroMemory(buffer, buflen);\r
+      return 0;\r
+    }\r
+    return 1;\r
+  }\r
 \r
   int ret = expand_parameter(key, (TCHAR *) hook_action, buffer, buflen, true, false);\r
 \r