Log messages properly.

[nssm.git] / event.cpp

diff --git a/event.cpp b/event.cpp
index 2a9bbf2..661761d 100644 (file)
--- a/event.cpp
+++ b/event.cpp
@@ -1,40 +1,22 @@
 #include "nssm.h"\r
 \r
-/* Convert error code to error string - must call LocalFree() on return value */\r
-char *error_string(unsigned long error) {\r
-  static char message[65535];\r
-  if (! FormatMessage(FORMAT_MESSAGE_FROM_HMODULE, 0, NSSM_MESSAGE_DEFAULT, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), message, sizeof(message), 0)) return 0;\r
-  return message;\r
-}\r
-\r
 /* Log a message to the Event Log */\r
-void eventprintf(unsigned short type, unsigned long id, char *format, ...) {\r
-  char message[4096];\r
-  char *strings[2];\r
-  int n, size;\r
+void log_event(unsigned short type, unsigned long id, ...) {\r
   va_list arg;\r
+  int count;\r
+  char *s;\r
+  char *strings[6];\r
 \r
-  /* Construct the message */\r
-  size = sizeof(message);\r
-  va_start(arg, format);\r
-  n = _vsnprintf(message, size, format, arg);\r
-  va_end(arg);\r
-\r
-  /* Check success */\r
-  if (n < 0 || n >= size) return;\r
-\r
-  /* Construct strings array */\r
-  strings[0] = message;\r
-  strings[1] = 0;\r
-    \r
   /* Open event log */\r
   HANDLE handle = RegisterEventSource(0, TEXT(NSSM));\r
   if (! handle) return;\r
 \r
   /* Log it */\r
-  if (! ReportEvent(handle, type, 0, id, 0, 1, 0, (const char **) strings, 0)) {\r
-    printf("ReportEvent(): %s\n", error_string(GetLastError()));\r
-  }\r
+  count = 0;\r
+  va_start(arg, id);\r
+  while ((s = va_arg(arg, char *))) strings[count++] = s;\r
+  va_end(arg);\r
+  ReportEvent(handle, type, 0, id, 0, count, 0, (const char **) strings, 0);\r
 \r
   /* Close event log */\r
   DeregisterEventSource(handle);\r