projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/silc.1.1.branch'
[silc.git]
/
lib
/
silcapputil
/
silcidcache.c
diff --git
a/lib/silcapputil/silcidcache.c
b/lib/silcapputil/silcidcache.c
index d189e9321ee8568cab41ec777d86d324de3946f9..f549b770b4a3a007efb24e3a02a1af4c090eb6e5 100644
(file)
--- a/
lib/silcapputil/silcidcache.c
+++ b/
lib/silcapputil/silcidcache.c
@@
-4,7
+4,7
@@
Author: Pekka Riikonen <priikone@silcnet.org>
Author: Pekka Riikonen <priikone@silcnet.org>
- Copyright (C) 2000 - 200
7
Pekka Riikonen
+ Copyright (C) 2000 - 200
8
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
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
@@
-142,9
+142,8
@@
silc_idcache_add(SilcIDCache cache, char *name, void *id, void *context)
if (id) {
/* See if this entry is added already to cache */
if (silc_idcache_find_by_id_one(cache, id, NULL)) {
if (id) {
/* See if this entry is added already to cache */
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_LOG_
DEBUG
(("Attempted to add same ID twice to ID Cache, id %s",
silc_id_render(id, cache->id_type)));
silc_id_render(id, cache->id_type)));
- SILC_ASSERT(FALSE);
goto err;
}
}
goto err;
}
}