X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-core%2Futil.c;h=b1925f0e207f5a41686fe7f5d81d5ac1e285d9bf;hb=a2fd5b8ed02be912fcb71cdec1c9233692d6c615;hp=4fe8737acf6c6aea2969db5131aba55a4f75aaba;hpb=6e35536bddb52c8e6bc201265c77a846d879b5a3;p=catta

diff --git a/avahi-core/util.c b/avahi-core/util.c
index 4fe8737..b1925f0 100644
--- a/avahi-core/util.c
+++ b/avahi-core/util.c
@@ -29,15 +29,14 @@
 #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;
@@ -67,51 +66,57 @@ void avahi_hexdump(const void* p, size_t size) {
     }
 }
 
-
-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;
 }
-