add (errnum) in front of windows error messages

[oweals/tinc.git] / lib / utils.c

diff --git a/lib/utils.c b/lib/utils.c
index b327a49f56c1abcf3d9b22d1fa7fac55a853df6a..405097bbe3d01c592a05147c6df36422c614af65 100644 (file)
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -23,15 +23,9 @@
 #include "../src/logger.h"
 #include "utils.h"
 
-#ifdef ENABLE_TRACING
-volatile int (cp_line[]) = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-volatile char (*cp_file[]) = {"?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?", "?"};
-volatile int cp_index = 0;
-#endif
-
-const char hexadecimals[] = "0123456789ABCDEF";
+static const char hexadecimals[] = "0123456789ABCDEF";
 
-int charhex2bin(char c) {
+static int charhex2bin(char c) {
        if(isdigit(c))
                return c - '0';
        else
@@ -53,50 +47,29 @@ void bin2hex(char *src, char *dst, int length) {
        }
 }
 
-#ifdef ENABLE_TRACING
-void cp_trace() {
-       logger(LOG_DEBUG, "Checkpoint trace: %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d <- %s:%d...",
-                  cp_file[(cp_index + 15) % 16], cp_line[(cp_index + 15) % 16],
-                  cp_file[(cp_index + 14) % 16], cp_line[(cp_index + 14) % 16],
-                  cp_file[(cp_index + 13) % 16], cp_line[(cp_index + 13) % 16],
-                  cp_file[(cp_index + 12) % 16], cp_line[(cp_index + 12) % 16],
-                  cp_file[(cp_index + 11) % 16], cp_line[(cp_index + 11) % 16],
-                  cp_file[(cp_index + 10) % 16], cp_line[(cp_index + 10) % 16],
-                  cp_file[(cp_index + 9) % 16], cp_line[(cp_index + 9) % 16],
-                  cp_file[(cp_index + 8) % 16], cp_line[(cp_index + 8) % 16],
-                  cp_file[(cp_index + 7) % 16], cp_line[(cp_index + 7) % 16],
-                  cp_file[(cp_index + 6) % 16], cp_line[(cp_index + 6) % 16],
-                  cp_file[(cp_index + 5) % 16], cp_line[(cp_index + 5) % 16],
-                  cp_file[(cp_index + 4) % 16], cp_line[(cp_index + 4) % 16],
-                  cp_file[(cp_index + 3) % 16], cp_line[(cp_index + 3) % 16],
-                  cp_file[(cp_index + 2) % 16], cp_line[(cp_index + 2) % 16],
-                  cp_file[(cp_index + 1) % 16], cp_line[(cp_index + 1) % 16],
-                  cp_file[cp_index], cp_line[cp_index]
-               );
-}
-#endif
-
 #if defined(HAVE_MINGW) || defined(HAVE_CYGWIN)
 #ifdef HAVE_CYGWIN
 #include <w32api/windows.h>
 #endif
 
 const char *winerror(int err) {
-       static char buf[1024], *newline;
+       static char buf[1024], *ptr;
+
+       ptr = buf + sprintf(buf, "(%d) ", err);
 
        if (!FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-               NULL, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), buf, sizeof(buf), NULL)) {
-               strncpy(buf, _("(unable to format errormessage)"), sizeof(buf));
+               NULL, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), ptr, sizeof(buf) - (ptr - buf), NULL)) {
+               strcpy(ptr, "(unable to format errormessage)");
        };
 
-       if((newline = strchr(buf, '\r')))
-               *newline = '\0';
+       if((ptr = strchr(buf, '\r')))
+               *ptr = '\0';
 
        return buf;
 }
 #endif
 
-unsigned int bitfield_to_int(void *bitfield, size_t size) {
+unsigned int bitfield_to_int(const void *bitfield, size_t size) {
        unsigned int value = 0;
        if(size > sizeof value)
                size = sizeof value;