Move meshlink_get_all_edges_state() to devtools_get_all_edges().

[meshlink] / src / utils.c

diff --git a/src/utils.c b/src/utils.c
index e80fdd9be10f7db8031a8e2851eeec86fc432bd5..9ec2252471299ba0d1798fa2495b60d7ef94cfc7 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
@@ -1,7 +1,6 @@
 /*
     utils.c -- gathering of some stupid small functions
-    Copyright (C) 1999-2005 Ivo Timmermans
-                  2000-2013 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -52,14 +51,16 @@ static int charhex2bin(char c) {
                return toupper(c) - 'A' + 10;
 }
 
-int hex2bin(const char *src, char *dst, int length) {
+int hex2bin(const char *src, void *vdst, int length) {
+       uint8_t *dst = vdst;
        int 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 bin2hex(const void *vsrc, char *dst, int length) {
+       const uint8_t *src = vsrc;
        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];
@@ -68,18 +69,20 @@ int bin2hex(const char *src, char *dst, int length) {
        return length * 2;
 }
 
-int b64decode(const char *src, char *dst, int length) {
+int b64decode(const char *src, void *dst, int length) {
        int i;
        uint32_t triplet = 0;
-       unsigned char *udst = (unsigned char *)dst;
+       unsigned char *udst = dst;
 
        for(i = 0; i < length / 3 * 4 && src[i]; i++) {
                triplet |= base64_decode[src[i] & 0xff] << (6 * (i & 3));
                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;
@@ -88,63 +91,69 @@ int b64decode(const char *src, char *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 char *src, char *dst, int length, const char *alphabet) {
+static int b64encode_internal(const void *src, char *dst, int length, const char *alphabet) {
        uint32_t triplet;
-       const unsigned char *usrc = (unsigned char *)src;
+       const unsigned char *usrc = src;
        int si = length / 3 * 3;
        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];
        }
 
        return length;
 }
 
-int b64encode(const char *src, char *dst, int length) {
+int b64encode(const void *src, char *dst, int length) {
        return b64encode_internal(src, dst, length, base64_original);
 }
 
-int b64encode_urlsafe(const char *src, char *dst, int length) {
+int b64encode_urlsafe(const void *src, char *dst, int length) {
        return b64encode_internal(src, dst, length, base64_urlsafe);
 }
 
@@ -158,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';
@@ -172,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;
 }