X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcclient%2Fclient_entry.c;fp=lib%2Fsilcclient%2Fclient_entry.c;h=a7ec24ee2701801ad02b235fe6c773a54bc37149;hb=3192ac4ddd09cd3fabe10a88cd5c885f217650a4;hp=64810b75d4fe640e12654280e8d697b74e6f0209;hpb=5c43a88e369950a34b1c40d655b598bedd16beda;p=silc.git diff --git a/lib/silcclient/client_entry.c b/lib/silcclient/client_entry.c index 64810b75..a7ec24ee 100644 --- a/lib/silcclient/client_entry.c +++ b/lib/silcclient/client_entry.c @@ -4,7 +4,7 @@ Author: Pekka Riikonen - Copyright (C) 2001 - 2007 Pekka Riikonen + Copyright (C) 2001 - 2008 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 @@ -815,9 +815,9 @@ SilcClientEntry silc_client_add_client(SilcClient client, NULL, NULL, NULL, TRUE); if (!client_entry->channels) { silc_free(client_entry->realname); - silc_atomic_uninit32(&client_entry->internal.deleted); - silc_atomic_uninit32(&client_entry->internal.refcnt); - silc_rwlock_free(client_entry->internal.lock); + silc_atomic_uninit32(&client_entry->internal.deleted); + silc_atomic_uninit32(&client_entry->internal.refcnt); + silc_rwlock_free(client_entry->internal.lock); silc_free(client_entry); return NULL; } @@ -829,9 +829,9 @@ SilcClientEntry silc_client_add_client(SilcClient client, if (!nick) { silc_hash_table_free(client_entry->channels); silc_free(client_entry->realname); - silc_atomic_uninit32(&client_entry->internal.deleted); - silc_atomic_uninit32(&client_entry->internal.refcnt); - silc_rwlock_free(client_entry->internal.lock); + silc_atomic_uninit32(&client_entry->internal.deleted); + silc_atomic_uninit32(&client_entry->internal.refcnt); + silc_rwlock_free(client_entry->internal.lock); silc_free(client_entry); return NULL; } @@ -845,9 +845,9 @@ SilcClientEntry silc_client_add_client(SilcClient client, silc_free(nick); silc_hash_table_free(client_entry->channels); silc_free(client_entry->realname); - silc_atomic_uninit32(&client_entry->internal.deleted); - silc_atomic_uninit32(&client_entry->internal.refcnt); - silc_rwlock_free(client_entry->internal.lock); + silc_atomic_uninit32(&client_entry->internal.deleted); + silc_atomic_uninit32(&client_entry->internal.refcnt); + silc_rwlock_free(client_entry->internal.lock); silc_free(client_entry); silc_mutex_unlock(conn->internal->lock); return NULL; @@ -1661,7 +1661,7 @@ SilcChannelEntry silc_client_add_channel(SilcClient client, if (!channel->channel_name) { silc_rwlock_free(channel->internal.lock); silc_atomic_uninit32(&channel->internal.refcnt); - silc_atomic_uninit32(&channel->internal.deleted); + silc_atomic_uninit32(&channel->internal.deleted); silc_free(channel); return NULL; } @@ -1671,7 +1671,7 @@ SilcChannelEntry silc_client_add_channel(SilcClient client, if (!channel->user_list) { silc_rwlock_free(channel->internal.lock); silc_atomic_uninit32(&channel->internal.refcnt); - silc_atomic_uninit32(&channel->internal.deleted); + silc_atomic_uninit32(&channel->internal.deleted); silc_free(channel->channel_name); silc_free(channel); return NULL; @@ -1683,7 +1683,7 @@ SilcChannelEntry silc_client_add_channel(SilcClient client, if (!channel_namec) { silc_rwlock_free(channel->internal.lock); silc_atomic_uninit32(&channel->internal.refcnt); - silc_atomic_uninit32(&channel->internal.deleted); + silc_atomic_uninit32(&channel->internal.deleted); silc_free(channel->channel_name); silc_hash_table_free(channel->user_list); silc_free(channel); @@ -1697,7 +1697,7 @@ SilcChannelEntry silc_client_add_channel(SilcClient client, &channel->id, channel)) { silc_rwlock_free(channel->internal.lock); silc_atomic_uninit32(&channel->internal.refcnt); - silc_atomic_uninit32(&channel->internal.deleted); + silc_atomic_uninit32(&channel->internal.deleted); silc_free(channel_namec); silc_free(channel->channel_name); silc_hash_table_free(channel->user_list); @@ -2149,11 +2149,7 @@ SilcBool silc_client_del_server(SilcClient client, SilcClientConnection conn, return FALSE; if (silc_atomic_sub_int32(&server->internal.deleted, 1) != 0) - { - SILC_LOG_DEBUG(("** WARNING ** Deleting a server twice %p", server)); -// asm("int3"); - return FALSE; - } + return FALSE; silc_client_unref_server(client, conn, server); return TRUE;