X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Futils.c;h=332df1fe12bcf76af04be005f2d26e5612d82024;hb=0b8b23e0dd7219344543f135ca0aeba8a4a42d48;hp=022ac257906d621b417a7281f9b941e64542d7c5;hpb=fa4a01e4a27dd4b3a57077acbd0e69f95d55944a;p=tinc

diff --git a/src/utils.c b/src/utils.c
index 022ac257..332df1fe 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -48,14 +48,13 @@ static int charb64decode(char c) {
 
 int hex2bin(const char *src, char *dst, int length) {
 	int i;
-	for(i = 0; i < length && src[i * 2] && src[i * 2 + 1]; i++)
+	for(i = 0; i < length && isxdigit(src[i * 2]) && isxdigit(src[i * 2 + 1]); i++)
 		dst[i] = charhex2bin(src[i * 2]) * 16 + charhex2bin(src[i * 2 + 1]);
 	return i;
 }
 
 int bin2hex(const char *src, char *dst, int length) {
-	int i;
-	for(i = length - 1; i >= 0; i--) {
+	for(int i = length - 1; i >= 0; i--) {
 		dst[i * 2 + 1] = hexadecimals[(unsigned char) src[i] & 15];
 		dst[i * 2] = hexadecimals[(unsigned char) src[i] >> 4];
 	}
@@ -66,7 +65,7 @@ int bin2hex(const char *src, char *dst, int length) {
 int b64decode(const char *src, char *dst, int length) {
 	int i;
 	uint32_t triplet = 0;
-	unsigned char *udst = dst;
+	unsigned char *udst = (unsigned char *)dst;
 
 	for(i = 0; i < length / 3 * 4 && src[i]; i++) {
 		triplet |= charb64decode(src[i]) << (6 * (i & 3));
@@ -92,7 +91,7 @@ int b64decode(const char *src, char *dst, int length) {
 
 int b64encode(const char *src, char *dst, int length) {
 	uint32_t triplet;
-	const unsigned char *usrc = src;
+	const unsigned char *usrc = (unsigned char *)src;
 	int si = length / 3 * 3;
 	int di = length / 3 * 4;
 
@@ -137,15 +136,17 @@ int b64encode(const 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)) {
+	        NULL, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), ptr, sizeof(buf) - (ptr - buf), NULL)) {
 		strncpy(buf, "(unable to format errormessage)", sizeof(buf));
 	};
 
-	if((newline = strchr(buf, '\r')))
-		*newline = '\0';
+	if((ptr = strchr(buf, '\r')))
+		*ptr = '\0';
 
 	return buf;
 }