add new error code AVAHI_ERR_IS_EMPTY and use it in avahi_entry_group_commit()

[catta] / avahi-core / hashmap.c

diff --git a/avahi-core/hashmap.c b/avahi-core/hashmap.c
index 0c44d4ff5920d2439744bc6f04e437f459015f4b..07bd7078cfd87b54c95a4873cf8b00a810264a3d 100644 (file)
--- a/avahi-core/hashmap.c
+++ b/avahi-core/hashmap.c
@@ -57,7 +57,7 @@ struct AvahiHashmap {
 static Entry* entry_get(AvahiHashmap *m, const void *key) {
     unsigned idx;
     Entry *e;
-    
+
     idx = m->hash_func(key) % HASH_MAP_SIZE;
     
     for (e = m->entries[idx]; e; e = e->bucket_next)
@@ -69,6 +69,7 @@ static Entry* entry_get(AvahiHashmap *m, const void *key) {
 
 static void entry_free(AvahiHashmap *m, Entry *e, int stolen) {
     unsigned idx;
+    assert(m);
     assert(e);
 
     idx = m->hash_func(e->key) % HASH_MAP_SIZE;
@@ -90,7 +91,7 @@ AvahiHashmap* avahi_hashmap_new(AvahiHashFunc hash_func, AvahiEqualFunc equal_fu
     assert(hash_func);
     assert(equal_func);
 
-    if (!(m = avahi_new(AvahiHashmap, 1)))
+    if (!(m = avahi_new0(AvahiHashmap, 1)))
         return NULL;
 
     m->hash_func = hash_func;
@@ -98,8 +99,6 @@ AvahiHashmap* avahi_hashmap_new(AvahiHashFunc hash_func, AvahiEqualFunc equal_fu
     m->key_free_func = key_free_func;
     m->value_free_func = value_free_func;
 
-    memset(m->entries, 0, sizeof(m->entries));
-
     AVAHI_LLIST_HEAD_INIT(Entry, m->entries_list);
     
     return m;
@@ -125,20 +124,6 @@ void* avahi_hashmap_lookup(AvahiHashmap *m, const void *key) {
     return e->value;
 }
 
-void* avahi_hashmap_steal(AvahiHashmap *m, const void *key) {
-    Entry *e;
-    void *v;
-    
-    assert(m);
-
-    if (!(e = entry_get(m, key)))
-        return NULL;
-
-    v = e->value;
-    entry_free(m, e, 1);
-    return v;
-}
-
 int avahi_hashmap_insert(AvahiHashmap *m, void *key, void *value) {
     unsigned idx;
     Entry *e;
@@ -203,7 +188,6 @@ int avahi_hashmap_replace(AvahiHashmap *m, void *key, void *value) {
     return 0;
 }
 
-
 void avahi_hashmap_remove(AvahiHashmap *m, const void *key) {
     Entry *e;
     
@@ -215,10 +199,24 @@ void avahi_hashmap_remove(AvahiHashmap *m, const void *key) {
     entry_free(m, e, 0);
 }
 
+void avahi_hashmap_foreach(AvahiHashmap *m, AvahiHashmapForeachCallback callback, void *userdata) {
+    Entry *e, *next;
+    assert(m);
+    assert(callback);
+
+    for (e = m->entries_list; e; e = next) {
+        next = e->entries_next;
+
+        callback(e->key, e->value, userdata);
+    }
+}
+
 unsigned avahi_string_hash(const void *data) {
     const char *p = data;
     unsigned hash = 0;
 
+    assert(p);
+    
     for (; *p; p++)
         hash = 31 * hash + *p;
 
@@ -228,22 +226,25 @@ unsigned avahi_string_hash(const void *data) {
 int avahi_string_equal(const void *a, const void *b) {
     const char *p = a, *q = b;
 
+    assert(p);
+    assert(q);
+    
     return strcmp(p, q) == 0;
 }
 
-unsigned avahi_domain_hash(const void *data) {
-    unsigned hash = 0;
-    const char *s;
+unsigned avahi_int_hash(const void *data) {
+    const int *i = data;
+
+    assert(i);
     
-    for (;;) {
-        char c[65];
+    return (unsigned) *i;
+}
 
-        if (!avahi_unescape_label(&s, c, sizeof(c)))
-            return hash;
+int avahi_int_equal(const void *a, const void *b) {
+    const int *_a = a, *_b = b;
 
-        if (!c[0])
-            continue;
-        
-        hash += avahi_string_hash(avahi_strdown(c));
-    }
+    assert(_a);
+    assert(_b);
+    
+    return *_a == *_b;
 }