Removed some legacy stuff.

What was #define GUI even for?
Why #define snprintf _snprintf in one file where we're using actual
_snprintf everywhere else?

diff --git a/gui.cpp b/gui.cpp
index b1174d1..83f2165 100644 (file)
--- a/gui.cpp
+++ b/gui.cpp
@@ -6,7 +6,7 @@ int nssm_gui(int resource, char *name) {
   /* Create window */\r
   HWND dlg = CreateDialog(0, MAKEINTRESOURCE(resource), 0, install_dlg);\r
   if (! dlg) {\r
-    snprintf(blurb, sizeof(blurb), "CreateDialog() failed with error code %d", GetLastError());\r
+    _snprintf(blurb, sizeof(blurb), "CreateDialog() failed with error code %d", GetLastError());\r
     MessageBox(0, blurb, NSSM, MB_OK);\r
     return 1;\r
   }\r
@@ -133,7 +133,7 @@ int remove(HWND window) {
 \r
   /* Confirm */\r
   char blurb[MAX_PATH];\r
-  if (snprintf(blurb, sizeof(blurb), "Remove the \"%s\" service?", name) < 0) {\r
+  if (_snprintf(blurb, sizeof(blurb), "Remove the \"%s\" service?", name) < 0) {\r
     if (MessageBox(0, "Remove the service?", NSSM, MB_YESNO) != IDYES) return 0;\r
   }\r
   else if (MessageBox(0, blurb, NSSM, MB_YESNO) != IDYES) return 0;\r

diff --git a/gui.h b/gui.h
index d9c378b..4521c32 100644 (file)
--- a/gui.h
+++ b/gui.h
@@ -6,11 +6,6 @@
 #include <commctrl.h>\r
 #include "resource.h"\r
 \r
-#define GUI\r
-#ifndef snprintf\r
-#define snprintf _snprintf\r
-#endif\r
-\r
 #define STRING_SIZE 256\r
 \r
 int nssm_gui(int, char *);\r

diff --git a/service.cpp b/service.cpp
index a400ebd..6292698 100644 (file)
--- a/service.cpp
+++ b/service.cpp
@@ -101,7 +101,7 @@ int install_service(char *name, char *exe, char *flags) {
     fprintf(stderr, "The full path to " NSSM " is too long!\n");\r
     return 3;\r
   }\r
-  if (snprintf(command, sizeof(command), "\"%s\" %s", path, NSSM_RUN) < 0) {\r
+  if (_snprintf(command, sizeof(command), "\"%s\" %s", path, NSSM_RUN) < 0) {\r
     fprintf(stderr, "Out of memory for ImagePath!\n");\r
     return 4;\r
   }\r
@@ -235,7 +235,7 @@ int monitor_service() {
   int ret = start_service();\r
   if (ret) {\r
     char code[16];\r
-    snprintf(code, sizeof(code), "%d", ret);\r
+    _snprintf(code, sizeof(code), "%d", ret);\r
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_START_SERVICE_FAILED, exe, service_name, ret, 0);\r
     return ret;\r
   }\r