#include <assert.h>
#include <ctype.h>
-#include <glib.h>
-
+#include <avahi-common/malloc.h>
#include "util.h"
void avahi_hexdump(const void* p, size_t size) {
const uint8_t *c = p;
assert(p);
- printf("Dumping %u bytes from %p:\n", size, p);
+ printf("Dumping %lu bytes from %p:\n", (unsigned long) size, p);
while (size > 0) {
unsigned i;
}
}
-
-char *avahi_format_mac_address(const uint8_t* mac, size_t size) {
- char *r, *t;
+char *avahi_format_mac_address(char *r, size_t l, const uint8_t* mac, size_t size) {
+ char *t = r;
unsigned i;
static const char hex[] = "0123456789abcdef";
- t = r = g_new(char, size > 0 ? size*3 : 1);
-
+ assert(r);
+ assert(l > 0);
+ assert(mac);
+
if (size <= 0) {
*r = 0;
return r;
}
for (i = 0; i < size; i++) {
+ if (l < 3)
+ break;
+
*(t++) = hex[*mac >> 4];
*(t++) = hex[*mac & 0xF];
*(t++) = ':';
+ l -= 3;
+
mac++;
}
- *(--t) = 0;
+ if (t > r)
+ *(t-1) = 0;
+ else
+ *r = 0;
+
return r;
}
-
-
-char *avahi_strdown(char *s) {
+char *avahi_strup(char *s) {
char *c;
-
assert(s);
for (c = s; *c; c++)
- *c = (char) tolower(*c);
+ *c = (char) toupper(*c);
return s;
}
-char *avahi_strup(char *s) {
+char *avahi_strdown(char *s) {
char *c;
assert(s);
for (c = s; *c; c++)
- *c = (char) toupper(*c);
+ *c = (char) tolower(*c);
return s;
}
-