remove dead breaks and returns

[nssm.git] / io.cpp

diff --git a/io.cpp b/io.cpp
index 90cc0d1..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
@@ -518,9 +518,9 @@ unsigned long WINAPI log_and_rotate(void *arg) {
           /* Write up to the newline. */\r
           ret = try_write(logger, address, i, &out, &complained);\r
           if (ret < 0) {\r
-            HeapFree(GetProcessHeap(), 0, logger);\r
             CloseHandle(logger->read_handle);\r
             CloseHandle(logger->write_handle);\r
+            HeapFree(GetProcessHeap(), 0, logger);\r
             return 3;\r
           }\r
           size += (__int64) out;\r
@@ -574,9 +574,9 @@ unsigned long WINAPI log_and_rotate(void *arg) {
             error = GetLastError();\r
             log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEFILE_FAILED, logger->path, error_string(error), 0);\r
             /* Oh dear.  Now we can't log anything further. */\r
-            HeapFree(GetProcessHeap(), 0, logger);\r
             CloseHandle(logger->read_handle);\r
             CloseHandle(logger->write_handle);\r
+            HeapFree(GetProcessHeap(), 0, logger);\r
             return 4;\r
           }\r
 \r
@@ -600,15 +600,15 @@ unsigned long WINAPI log_and_rotate(void *arg) {
     ret = try_write(logger, address, in, &out, &complained);\r
     size += (__int64) out;\r
     if (ret < 0) {\r
-      HeapFree(GetProcessHeap(), 0, logger);\r
       CloseHandle(logger->read_handle);\r
       CloseHandle(logger->write_handle);\r
+      HeapFree(GetProcessHeap(), 0, logger);\r
       return 3;\r
     }\r
   }\r
 \r
-  HeapFree(GetProcessHeap(), 0, logger);\r
   CloseHandle(logger->read_handle);\r
   CloseHandle(logger->write_handle);\r
+  HeapFree(GetProcessHeap(), 0, logger);\r
   return 0;\r
 }\r