remove dead breaks and returns

[nssm.git] / registry.cpp

diff --git a/registry.cpp b/registry.cpp
index 228ef8d..258b96a 100644 (file)
--- a/registry.cpp
+++ b/registry.cpp
@@ -14,24 +14,31 @@ static int service_registry_path(const TCHAR *service_name, bool parameters, con
   return ret;\r
 }\r
 \r
-static HKEY open_registry_key(const TCHAR *registry, REGSAM sam, bool must_exist) {\r
-  HKEY key;\r
+static long open_registry_key(const TCHAR *registry, REGSAM sam, HKEY *key, bool must_exist) {\r
+  long error;\r
 \r
   if (sam & KEY_SET_VALUE) {\r
-    if (RegCreateKeyEx(HKEY_LOCAL_MACHINE, registry, 0, 0, REG_OPTION_NON_VOLATILE, sam, 0, &key, 0) != ERROR_SUCCESS) {\r
+    error = RegCreateKeyEx(HKEY_LOCAL_MACHINE, registry, 0, 0, REG_OPTION_NON_VOLATILE, sam, 0, key, 0);\r
+    if (error != ERROR_SUCCESS) {\r
+      *key = 0;\r
       log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OPENKEY_FAILED, registry, error_string(GetLastError()), 0);\r
-      return 0;\r
+      return error;\r
     }\r
   }\r
   else {\r
-    long error = RegOpenKeyEx(HKEY_LOCAL_MACHINE, registry, 0, sam, &key);\r
+    error = RegOpenKeyEx(HKEY_LOCAL_MACHINE, registry, 0, sam, key);\r
     if (error != ERROR_SUCCESS) {\r
-      if (error == ERROR_FILE_NOT_FOUND && ! must_exist) return 0;\r
-      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OPENKEY_FAILED, registry, error_string(GetLastError()), 0);\r
-      return 0;\r
+      *key = 0;\r
+      if (error != ERROR_FILE_NOT_FOUND || must_exist) log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OPENKEY_FAILED, registry, error_string(GetLastError()), 0);\r
     }\r
   }\r
 \r
+  return error;\r
+}\r
+\r
+static HKEY open_registry_key(const TCHAR *registry, REGSAM sam, bool must_exist) {\r
+  HKEY key;\r
+  long error = open_registry_key(registry, sam, &key, must_exist);\r
   return key;\r
 }\r
 \r
@@ -346,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
@@ -504,7 +509,7 @@ HKEY open_service_registry(const TCHAR *service_name, REGSAM sam, bool must_exis
   return open_registry_key(registry, sam, must_exist);\r
 }\r
 \r
-HKEY open_registry(const TCHAR *service_name, const TCHAR *sub, REGSAM sam, bool must_exist) {\r
+long open_registry(const TCHAR *service_name, const TCHAR *sub, REGSAM sam, HKEY *key, bool must_exist) {\r
   /* Get registry */\r
   TCHAR registry[KEY_LENGTH];\r
   if (service_registry_path(service_name, true, sub, registry, _countof(registry)) < 0) {\r
@@ -512,7 +517,13 @@ HKEY open_registry(const TCHAR *service_name, const TCHAR *sub, REGSAM sam, bool
     return 0;\r
   }\r
 \r
-  return open_registry_key(registry, sam, must_exist);\r
+  return open_registry_key(registry, sam, key, must_exist);\r
+}\r
+\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, must_exist);\r
+  return key;\r
 }\r
 \r
 HKEY open_registry(const TCHAR *service_name, const TCHAR *sub, REGSAM sam) {\r
@@ -809,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