remove dead breaks and returns

diff --git a/io.cpp b/io.cpp
index 508d7db..45d1e76 100644 (file)
--- a/io.cpp
+++ b/io.cpp
@@ -86,7 +86,7 @@ int get_createfile_parameters(HKEY key, TCHAR *prefix, TCHAR *path, unsigned lon
   switch (get_number(key, value, sharing, false)) {\r
     case 0: *sharing = default_sharing; break; /* Missing. */\r
     case 1: break; /* Found. */\r
-    case -2: return 4; break; /* Error. */\r
+    case -2: return 4; /* Error. */\r
   }\r
 \r
   /* CreationDisposition. */\r
@@ -97,7 +97,7 @@ int get_createfile_parameters(HKEY key, TCHAR *prefix, TCHAR *path, unsigned lon
   switch (get_number(key, value, disposition, false)) {\r
     case 0: *disposition = default_disposition; break; /* Missing. */\r
     case 1: break; /* Found. */\r
-    case -2: return 6; break; /* Error. */\r
+    case -2: return 6; /* Error. */\r
   }\r
 \r
   /* Flags. */\r
@@ -108,7 +108,7 @@ int get_createfile_parameters(HKEY key, TCHAR *prefix, TCHAR *path, unsigned lon
   switch (get_number(key, value, flags, false)) {\r
     case 0: *flags = default_flags; break; /* Missing. */\r
     case 1: break; /* Found. */\r
-    case -2: return 8; break; /* Error. */\r
+    case -2: return 8; /* Error. */\r
   }\r
 \r
   /* Rotate with CopyFile() and SetEndOfFile(). */\r
@@ -124,7 +124,7 @@ int get_createfile_parameters(HKEY key, TCHAR *prefix, TCHAR *path, unsigned lon
         if (data) *copy_and_truncate = true;\r
         else *copy_and_truncate = false;\r
         break;\r
-      case -2: return 9; break; /* Error. */\r
+      case -2: return 9; /* Error. */\r
     }\r
   }\r
 \r

diff --git a/registry.cpp b/registry.cpp
index b8aab78..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

diff --git a/service.cpp b/service.cpp
index b3b0c62..ce3fb92 100644 (file)
--- a/service.cpp
+++ b/service.cpp
@@ -653,8 +653,6 @@ int get_service_description(const TCHAR *service_name, SC_HANDLE service_handle,
     print_message(stderr, NSSM_MESSAGE_QUERYSERVICECONFIG2_FAILED, service_name, _T("SERVICE_CONFIG_DESCRIPTION"), error_string(error));\r
     return 4;\r
   }\r
-\r
-  return 0;\r
 }\r
 \r
 int get_service_startup(const TCHAR *service_name, SC_HANDLE service_handle, const QUERY_SERVICE_CONFIG *qsc, unsigned long *startup) {\r
@@ -1982,7 +1980,6 @@ void CALLBACK end_service(void *arg, unsigned char why) {
       wait_for_hooks(service, false);\r
       free_imports();\r
       exit(exitcode);\r
-    break;\r
   }\r
 }\r
 \r