X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=event.cpp;h=bd43be3515011535a795000a0812684be853927f;hb=47ae0ec9bb0ab33b05469e2780daf1e3f2a3cde1;hp=2a9bbf242d313f564abcd216b7f698860d5284c8;hpb=06a62a665e152850d082607eced4fa4654f1bf70;p=nssm.git

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