X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=lib%2Futils.c;h=3b221f59f0ef731f62b0369314de5964bdf855fd;hp=3283472d826d6e13541bc0cf712168fc5b2761f4;hb=21d0e24f1a523ad5fc23b3cddef78a1ae9585ea9;hpb=a227843b739d279b63adcf3736ebb03d856080c4

diff --git a/lib/utils.c b/lib/utils.c
index 3283472d..3b221f59 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -23,20 +23,22 @@
 #include "../src/logger.h"
 #include "utils.h"
 
-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
 		return toupper(c) - 'A' + 10;
 }
 
-
-void hex2bin(char *src, char *dst, int length) {
-	int i;
-	for(i = 0; i < length; i++)
+bool hex2bin(char *src, char *dst, int length) {
+	for(int i = 0; i < length; i++) {
+		if(!isxdigit(src[i * 2]) || !isxdigit(src[i * 2 + 1]))
+			return false;
 		dst[i] = charhex2bin(src[i * 2]) * 16 + charhex2bin(src[i * 2 + 1]);
+	}
+	return true;
 }
 
 void bin2hex(char *src, char *dst, int length) {
@@ -53,21 +55,23 @@ void bin2hex(char *src, char *dst, int length) {
 #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;