Fix compilation for Ubuntu 9.04 on x86-64 when using --enable-httpd.

[openocd.git] / src / helper / binarybuffer.c

diff --git a/src/helper/binarybuffer.c b/src/helper/binarybuffer.c
index a8be403cd5319b6de1cc91755207169710307967..87b9fa795dace2bb22813b67aadf64416933cc28 100644 (file)
--- a/src/helper/binarybuffer.c
+++ b/src/helper/binarybuffer.c
@@ -24,12 +24,7 @@
 #include "config.h"
 #endif
 
-#include <stdlib.h>
-#include <string.h>
-
-#include "types.h"
 #include "log.h"
-
 #include "binarybuffer.h"
 
 const unsigned char bit_reverse_table256[] =
@@ -53,7 +48,7 @@ const unsigned char bit_reverse_table256[] =
 };
 
 
-u8* buf_cpy(u8 *from, u8 *to, int size)
+u8* buf_cpy(const u8 *from, u8 *to, int size)
 {
        unsigned int num_bytes = CEIL(size, 8);
        unsigned int i;
@@ -73,7 +68,7 @@ u8* buf_cpy(u8 *from, u8 *to, int size)
        return to;
 }
 
-int buf_cmp(u8 *buf1, u8 *buf2, int size)
+int buf_cmp(const u8 *buf1, const u8 *buf2, int size)
 {
        int num_bytes = CEIL(size, 8);
        int i;
@@ -100,7 +95,7 @@ int buf_cmp(u8 *buf1, u8 *buf2, int size)
        return 0;
 }
 
-int buf_cmp_mask(u8 *buf1, u8 *buf2, u8 *mask, int size)
+int buf_cmp_mask(const u8 *buf1, const u8 *buf2, const u8 *mask, int size)
 {
        int num_bytes = CEIL(size, 8);
        int i;
@@ -143,7 +138,7 @@ u8* buf_set_ones(u8 *buf, int count)
        return buf;
 }
 
-u8* buf_set_buf(u8 *src, int src_start, u8 *dst, int dst_start, int len)
+u8* buf_set_buf(const u8 *src, int src_start, u8 *dst, int dst_start, int len)
 {
        int src_idx = src_start, dst_idx = dst_start;
        int i;
@@ -244,7 +239,7 @@ char* buf_to_str(const u8 *buf, int buf_len, int radix)
 int str_to_buf(const char *str, int str_len, u8 *buf, int buf_len, int radix)
 {
        char *charbuf;
-       char tmp;
+       u32 tmp;
        float factor;
        u8 *b256_buf;
        int b256_len;
@@ -303,7 +298,7 @@ int str_to_buf(const char *str, int str_len, u8 *buf, int buf_len, int radix)
                        tmp = (tmp - 'A' + 10);
                else continue;  /* skip characters other than [0-9,a-f,A-F] */
 
-               if (tmp >= radix)
+               if (tmp >= (u32)radix)
                        continue;       /* skip digits invalid for the current radix */
 
                for (j = 0; j < b256_len; j++)