Fixed entry updating when name has not been set to entry.

[silc.git] / lib / silcapputil / silcidcache.c

diff --git a/lib/silcapputil/silcidcache.c b/lib/silcapputil/silcidcache.c
index 5e6629477dbfee50a98096f6b759d33d97678a1a..52ddcef7fdb05151f362f620f79e5851333bdb25 100644 (file)
--- a/lib/silcapputil/silcidcache.c
+++ b/lib/silcapputil/silcidcache.c
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 2000 - 2006 Pekka Riikonen
+  Copyright (C) 2000 - 2007 Pekka Riikonen
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -138,15 +138,14 @@ silc_idcache_add(SilcIDCache cache, char *name, void *id, void *context)
   SILC_LOG_DEBUG(("Adding cache entry %p", c));
 
   /* Add the new entry to the hash tables */
-
-  if (id) {
-    if (silc_idcache_find_by_id_one(cache, id, NULL)) {
-      SILC_LOG_ERROR(("Attempted to add same ID twice to ID Cache"));
-      goto err;
-    }
-    if (!silc_hash_table_add(cache->id_table, id, c))
-      goto err;
+  if (silc_idcache_find_by_id_one(cache, id, NULL)) {
+    SILC_LOG_ERROR(("Attempted to add same ID twice to ID Cache, id %s",
+                  silc_id_render(id, cache->id_type)));
+    SILC_ASSERT(FALSE);
+    goto err;
   }
+  if (!silc_hash_table_add(cache->id_table, id, c))
+    goto err;
   if (name)
     if (!silc_hash_table_add(cache->name_table, name, c))
       goto err;
@@ -222,12 +221,11 @@ SilcBool silc_idcache_del_by_context(SilcIDCache cache, void *context,
 /* Update entry */
 
 SilcBool silc_idcache_update(SilcIDCache cache, SilcIDCacheEntry entry,
-                            void *old_id, void *new_id,
-                            char *old_name, char *new_name,
+                            void *new_id, char *new_name,
                             SilcBool free_old_name)
 {
-  if (old_id && new_id) {
-    if (!silc_hash_table_del_by_context(cache->id_table, old_id, entry))
+  if (new_id) {
+    if (!silc_hash_table_del_by_context(cache->id_table, entry->id, entry))
       return FALSE;
 
     if (cache->id_type == SILC_ID_CLIENT)
@@ -241,9 +239,11 @@ SilcBool silc_idcache_update(SilcIDCache cache, SilcIDCacheEntry entry,
       return FALSE;
   }
 
-  if (old_name && new_name) {
-    if (!silc_hash_table_del_by_context(cache->name_table, old_name, entry))
-      return FALSE;
+  if (new_name) {
+    if (entry->name)
+      if (!silc_hash_table_del_by_context(cache->name_table, entry->name,
+                                         entry))
+       return FALSE;
 
     if (free_old_name)
       silc_free(entry->name);
@@ -259,8 +259,7 @@ SilcBool silc_idcache_update(SilcIDCache cache, SilcIDCacheEntry entry,
 /* Update entry by context */
 
 SilcBool silc_idcache_update_by_context(SilcIDCache cache, void *context,
-                                       void *old_id, void *new_id,
-                                       char *old_name, char *new_name,
+                                       void *new_id, char *new_name,
                                        SilcBool free_old_name)
 {
   SilcIDCacheEntry c;
@@ -268,8 +267,7 @@ SilcBool silc_idcache_update_by_context(SilcIDCache cache, void *context,
   if (!silc_hash_table_find(cache->context_table, context, NULL, (void **)&c))
     return FALSE;
 
-  return silc_idcache_update(cache, c, old_id, new_id, old_name, new_name,
-                            free_old_name);
+  return silc_idcache_update(cache, c, new_id, new_name, free_old_name);
 }
 
 /* Returns all cache entrys from the ID cache to the `ret' ID Cache List. */
@@ -282,6 +280,7 @@ SilcBool silc_idcache_get_all(SilcIDCache cache, SilcList *ret_list)
   if (!silc_hash_table_count(cache->id_table))
     return FALSE;
 
+  silc_list_init(*ret_list, struct SilcIDCacheEntryStruct, next);
   silc_hash_table_foreach(cache->id_table, silc_idcache_get_all_foreach,
                          ret_list);
 
@@ -302,6 +301,7 @@ SilcBool silc_idcache_find_by_id(SilcIDCache cache, void *id,
   if (!silc_hash_table_count(cache->id_table))
     return FALSE;
 
+  silc_list_init(*ret_list, struct SilcIDCacheEntryStruct, next);
   silc_hash_table_find_foreach(cache->id_table, id,
                               silc_idcache_get_all_foreach, ret_list);
 
@@ -342,6 +342,7 @@ SilcBool silc_idcache_find_by_name(SilcIDCache cache, char *name,
   if (!silc_hash_table_count(cache->name_table))
     return FALSE;
 
+  silc_list_init(*ret_list, struct SilcIDCacheEntryStruct, next);
   silc_hash_table_find_foreach(cache->name_table, name,
                               silc_idcache_get_all_foreach, ret_list);