improve str_to_buf and buf_to_str helpers

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

diff --git a/src/helper/binarybuffer.h b/src/helper/binarybuffer.h
index 60077b31ad2b30680465893cbeb26c3088a327f3..49050074fb226cd6e82315152a9363b9362a64b9 100644 (file)
--- a/src/helper/binarybuffer.h
+++ b/src/helper/binarybuffer.h
@@ -39,8 +39,7 @@ static inline void buf_set_u32(uint8_t* buffer,
                buffer[1] = (value >> 8) & 0xff;
                buffer[0] = (value >> 0) & 0xff;
        } else {
-               unsigned int i;
-               for (i = first; i < first + num; i++)
+               for (unsigned i = first; i < first + num; i++)
                {
                        if (((value >> (i - first)) & 1) == 1)
                                buffer[i / 8] |= 1 << (i % 8);
@@ -59,8 +58,7 @@ static inline uint32_t buf_get_u32(const uint8_t* buffer,
                        (((uint32_t)buffer[0]) << 0);
        } else {
                uint32_t result = 0;
-               unsigned int i;
-               for (i = first; i < first + num; i++)
+               for (unsigned i = first; i < first + num; i++)
                {
                        if (((buffer[i / 8] >> (i % 8)) & 1) == 1)
                                result |= 1 << (i - first);
@@ -81,9 +79,9 @@ uint8_t* buf_set_ones(uint8_t *buf, int count);
 uint8_t* buf_set_buf(const uint8_t *src, int src_start,
                uint8_t *dst, int dst_start, int len);
 
-int str_to_buf(const char *str, int len,
-               uint8_t *bin_buf, int buf_size, int radix);
-char* buf_to_str(const uint8_t *buf, int size, int radix);
+int str_to_buf(const char *str, unsigned len,
+               void *bin_buf, unsigned buf_size, unsigned radix);
+char* buf_to_str(const void *buf, unsigned size, unsigned radix);
 
 #define CEIL(m, n)     (((m) + (n) - 1) / (n))