X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=src%2Futils.c;h=e1d4c893edcedfff76fd87c1c26d1d018600dba1;hb=291e61346bb55d0462c07bf078cab3bb7eec2241;hp=354fce57250721f052476d3cf3c5481509e4b88d;hpb=2822296ddb22389c5b4e9b8fb6ef7c906ff99314;p=osmocom-bb.git

diff --git a/src/utils.c b/src/utils.c
index 354fce5..e1d4c89 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -4,7 +4,7 @@
 #include <errno.h>
 #include <stdio.h>
 
-#include <osmocore/utils.h>
+#include <osmocom/core/utils.h>
 
 static char namebuf[255];
 const char *get_value_string(const struct value_string *vs, uint32_t val)
@@ -35,7 +35,7 @@ int get_string_value(const struct value_string *vs, const char *str)
 	return -EINVAL;
 }
 
-char bcd2char(uint8_t bcd)
+char osmo_bcd2char(uint8_t bcd)
 {
 	if (bcd < 0xa)
 		return '0' + bcd;
@@ -44,12 +44,12 @@ char bcd2char(uint8_t bcd)
 }
 
 /* only works for numbers in ascii */
-uint8_t char2bcd(char c)
+uint8_t osmo_char2bcd(char c)
 {
 	return c - 0x30;
 }
 
-int hexparse(const char *str, uint8_t *b, int max_len)
+int osmo_hexparse(const char *str, uint8_t *b, int max_len)
 
 {
 	int i, l, v;
@@ -78,7 +78,7 @@ int hexparse(const char *str, uint8_t *b, int max_len)
 
 static char hexd_buff[4096];
 
-static char *_hexdump(const unsigned char *buf, int len, char *delim)
+static char *_osmo_hexdump(const unsigned char *buf, int len, char *delim)
 {
 	int i;
 	char *cur = hexd_buff;
@@ -86,6 +86,8 @@ static char *_hexdump(const unsigned char *buf, int len, char *delim)
 	hexd_buff[0] = 0;
 	for (i = 0; i < len; i++) {
 		int len_remain = sizeof(hexd_buff) - (cur - hexd_buff);
+		if (len_remain <= 0)
+			break;
 		int rc = snprintf(cur, len_remain, "%02x%s", buf[i], delim);
 		if (rc <= 0)
 			break;
@@ -95,7 +97,7 @@ static char *_hexdump(const unsigned char *buf, int len, char *delim)
 	return hexd_buff;
 }
 
-char *ubit_dump(const uint8_t *bits, unsigned int len)
+char *osmo_ubit_dump(const uint8_t *bits, unsigned int len)
 {
 	int i;
 
@@ -125,14 +127,14 @@ char *ubit_dump(const uint8_t *bits, unsigned int len)
 	return hexd_buff;
 }
 
-char *hexdump(const unsigned char *buf, int len)
+char *osmo_hexdump(const unsigned char *buf, int len)
 {
-	return _hexdump(buf, len, " ");
+	return _osmo_hexdump(buf, len, " ");
 }
 
-char *hexdump_nospc(const unsigned char *buf, int len)
+char *osmo_osmo_hexdump_nospc(const unsigned char *buf, int len)
 {
-	return _hexdump(buf, len, "");
+	return _osmo_hexdump(buf, len, "");
 }
 
 #include "../config.h"