New function yaz_strerror.

[yaz-moved-to-github.git] / util / log.c

diff --git a/util/log.c b/util/log.c
index e208fbf..5fa4d5e 100644 (file)
--- a/util/log.c
+++ b/util/log.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2002, Index Data
  * See the file LICENSE for details.
  *
- * $Id: log.c,v 1.29 2002-09-25 12:37:07 adam Exp $
+ * $Id: log.c,v 1.32 2002-12-05 12:19:24 adam Exp $
  */
 
 #if HAVE_CONFIG_H
@@ -20,6 +20,7 @@
 #include <stdarg.h>
 #include <errno.h>
 #include <time.h>
+#include <yaz/nmem.h>
 #include <yaz/log.h>
 
 #define HAS_STRERROR 1
@@ -161,25 +162,11 @@ void yaz_log(int level, const char *fmt, ...)
 /* WIN32 */
     if (o_level & LOG_ERRNO)
     {
-#ifdef WIN32
-       DWORD err = GetLastError();
-       if (err)
-       {
-           strcat(buf, " [");
-           FormatMessage(
-               FORMAT_MESSAGE_FROM_SYSTEM,
-               NULL,
-               err,
-               MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
-               (LPTSTR) buf + strlen(buf),
-               2048,
-               NULL);
-           strcat(buf, "]");
-       }
-#else
-        sprintf(buf + strlen(buf), " [%s]", strerror(yaz_errno()));
-#endif
+       strcat(buf, " [");
+       yaz_strerror(buf+strlen(buf), 2048);
+       strcat(buf, "]");
     }
+    va_end (ap);
     if (start_hook_func)
         (*start_hook_func)(o_level, buf, start_hook_info);
     ti = time(0);