Merge branch 'master' into 1.1

[meshlink] / lib / utils.c

diff --git a/lib/utils.c b/lib/utils.c
index b00a73bc7c5e7adc2d3f4305f77f1bb654844cb5..1d46630b0782be4c1e35ff805c7fc38539535977 100644 (file)
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -29,7 +29,7 @@ volatile char (*cp_file[]) = {"?", "?", "?", "?", "?", "?", "?", "?", "?", "?",
 volatile int cp_index = 0;
 #endif
 
-char *hexadecimals = "0123456789ABCDEF";
+const char hexadecimals[] = "0123456789ABCDEF";
 
 int charhex2bin(char c) {
        if(isdigit(c))
@@ -81,7 +81,7 @@ void cp_trace() {
 #include <w32api/windows.h>
 #endif
 
-char *winerror(int err) {
+const char *winerror(int err) {
        static char buf[1024], *newline;
 
        if (!FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
@@ -96,3 +96,10 @@ char *winerror(int err) {
 }
 #endif
 
+unsigned int bitfield_to_int(void *bitfield, size_t size) {
+       unsigned int value = 0;
+       if(size > sizeof value)
+               size = sizeof value;
+       memcpy(&value, bitfield, size);
+       return value;
+}