X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Futils.c;h=9ec2252471299ba0d1798fa2495b60d7ef94cfc7;hb=e25370c54e78fda0a7996b008f7ad68aa80f2ccd;hp=e45e5942d8a477a82e08924ba59e727c1feca4ff;hpb=2e606e5823d06aece9a0d4719e07ce3b28ebeadc;p=meshlink

diff --git a/src/utils.c b/src/utils.c
index e45e5942..9ec22524 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -79,8 +79,10 @@ int b64decode(const char *src, void *dst, int length) {
 		if((i & 3) == 3) {
 			if(triplet & 0xff000000U)
 				return 0;
-			udst[0] = triplet & 0xff; triplet >>= 8;
-			udst[1] = triplet & 0xff; triplet >>= 8;
+			udst[0] = triplet & 0xff;
+			triplet >>= 8;
+			udst[1] = triplet & 0xff;
+			triplet >>= 8;
 			udst[2] = triplet;
 			triplet = 0;
 			udst += 3;
@@ -89,15 +91,15 @@ int b64decode(const char *src, void *dst, int length) {
 	if(triplet & 0xff000000U)
 		return 0;
 	if((i & 3) == 3) {
-		udst[0] = triplet & 0xff; triplet >>= 8;
+		udst[0] = triplet & 0xff;
+		triplet >>= 8;
 		udst[1] = triplet & 0xff;
 		return i / 4 * 3 + 2;
 	} else if((i & 3) == 2) {
 		udst[0] = triplet & 0xff;
 		return i / 4 * 3 + 1;
-	} else {
+	} else
 		return i / 4 * 3;
-	}
 }
 
 static int b64encode_internal(const void *src, char *dst, int length, const char *alphabet) {
@@ -107,34 +109,40 @@ static int b64encode_internal(const void *src, char *dst, int length, const char
 	int di = length / 3 * 4;
 
 	switch(length % 3) {
-		case 2:
-			triplet = usrc[si] | usrc[si + 1] << 8;
-			dst[di] = alphabet[triplet & 63]; triplet >>= 6;
-			dst[di + 1] = alphabet[triplet & 63]; triplet >>= 6;
-			dst[di + 2] = alphabet[triplet];
-			dst[di + 3] = 0;
-			length = di + 2;
-			break;
-		case 1:
-			triplet = usrc[si];
-			dst[di] = alphabet[triplet & 63]; triplet >>= 6;
-			dst[di + 1] = alphabet[triplet];
-			dst[di + 2] = 0;
-			length = di + 1;
-			break;
-		default:
-			dst[di] = 0;
-			length = di;
-			break;
+	case 2:
+		triplet = usrc[si] | usrc[si + 1] << 8;
+		dst[di] = alphabet[triplet & 63];
+		triplet >>= 6;
+		dst[di + 1] = alphabet[triplet & 63];
+		triplet >>= 6;
+		dst[di + 2] = alphabet[triplet];
+		dst[di + 3] = 0;
+		length = di + 2;
+		break;
+	case 1:
+		triplet = usrc[si];
+		dst[di] = alphabet[triplet & 63];
+		triplet >>= 6;
+		dst[di + 1] = alphabet[triplet];
+		dst[di + 2] = 0;
+		length = di + 1;
+		break;
+	default:
+		dst[di] = 0;
+		length = di;
+		break;
 	}
 
 	while(si > 0) {
 		di -= 4;
 		si -= 3;
 		triplet = usrc[si] | usrc[si + 1] << 8 | usrc[si + 2] << 16;
-		dst[di] = alphabet[triplet & 63]; triplet >>= 6;
-		dst[di + 1] = alphabet[triplet & 63]; triplet >>= 6;
-		dst[di + 2] = alphabet[triplet & 63]; triplet >>= 6;
+		dst[di] = alphabet[triplet & 63];
+		triplet >>= 6;
+		dst[di + 1] = alphabet[triplet & 63];
+		triplet >>= 6;
+		dst[di + 2] = alphabet[triplet & 63];
+		triplet >>= 6;
 		dst[di + 3] = alphabet[triplet];
 	}
 
@@ -159,10 +167,10 @@ const char *winerror(int err) {
 
 	ptr = buf + sprintf(buf, "(%d) ", err);
 
-	if (!FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-		NULL, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), ptr, sizeof(buf) - (ptr - buf), NULL)) {
+	if(!FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+	                  NULL, err, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), ptr, sizeof(buf) - (ptr - buf), NULL))
 		strncpy(buf, "(unable to format errormessage)", sizeof(buf));
-	};
+	;
 
 	if((ptr = strchr(buf, '\r')))
 		*ptr = '\0';
@@ -173,8 +181,8 @@ const char *winerror(int err) {
 
 unsigned int bitfield_to_int(const void *bitfield, size_t size) {
 	unsigned int value = 0;
-	if(size > sizeof value)
-		size = sizeof value;
+	if(size > sizeof(value))
+		size = sizeof(value);
 	memcpy(&value, bitfield, size);
 	return value;
 }