X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcclient%2Fidlist.c;h=e361a5027c39226a6357ddc12873c97abe9790b4;hb=a818c5b5411bbc4436d1c5f011236985c96bb787;hp=aa5ccc27f22e86c2a4355bd92bb54822f49625b4;hpb=d47a87b03b846e2333ef57b2c0d81f1644992964;p=silc.git

diff --git a/lib/silcclient/idlist.c b/lib/silcclient/idlist.c
index aa5ccc27..e361a502 100644
--- a/lib/silcclient/idlist.c
+++ b/lib/silcclient/idlist.c
@@ -18,7 +18,8 @@
 */
 /* $Id$ */
 
-#include "clientlibincludes.h"
+#include "silcincludes.h"
+#include "silcclient.h"
 #include "client_internal.h"
 
 /******************************************************************************
@@ -40,7 +41,7 @@ SilcClientEntry *silc_client_get_clients_local(SilcClient client,
 					       SilcClientConnection conn,
 					       const char *nickname,
 					       const char *format,
-					       uint32 *clients_count)
+					       SilcUInt32 *clients_count)
 {
   SilcIDCacheEntry id_cache;
   SilcIDCacheList list = NULL;
@@ -122,7 +123,7 @@ SILC_CLIENT_CMD_FUNC(get_client_callback)
 {
   GetClientInternal i = (GetClientInternal)context;
   SilcClientEntry *clients;
-  uint32 clients_count;
+  SilcUInt32 clients_count;
 
   /* Get the clients */
   clients = silc_client_get_clients_local(i->client, i->conn,
@@ -282,7 +283,7 @@ SilcClientEntry silc_idlist_get_client(SilcClient client,
 typedef struct {
   SilcClient client;
   SilcClientConnection conn;
-  uint32 list_count;
+  SilcUInt32 list_count;
   SilcBuffer client_id_list;
   SilcGetClientCallback completion;
   void *context;
@@ -294,14 +295,14 @@ SILC_CLIENT_CMD_FUNC(get_clients_list_callback)
   SilcIDCacheEntry id_cache = NULL;
   SilcBuffer client_id_list = i->client_id_list;
   SilcClientEntry *clients = NULL;
-  uint32 clients_count = 0;
+  SilcUInt32 clients_count = 0;
   bool found = FALSE;
   int c;
 
   SILC_LOG_DEBUG(("Start"));
 
   for (c = 0; c < i->list_count; c++) {
-    uint16 idp_len;
+    SilcUInt16 idp_len;
     SilcClientID *client_id;
 
     /* Get Client ID */
@@ -351,7 +352,7 @@ SILC_CLIENT_CMD_FUNC(get_clients_list_callback)
 
 void silc_client_get_clients_by_list(SilcClient client,
 				     SilcClientConnection conn,
-				     uint32 list_count,
+				     SilcUInt32 list_count,
 				     SilcBuffer client_id_list,
 				     SilcGetClientCallback completion,
 				     void *context)
@@ -359,7 +360,7 @@ void silc_client_get_clients_by_list(SilcClient client,
   SilcIDCacheEntry id_cache = NULL;
   int i;
   unsigned char **res_argv = NULL;
-  uint32 *res_argv_lens = NULL, *res_argv_types = NULL, res_argc = 0;
+  SilcUInt32 *res_argv_lens = NULL, *res_argv_types = NULL, res_argc = 0;
   GetClientsByListInternal in;
 
   SILC_LOG_DEBUG(("Start"));
@@ -373,7 +374,7 @@ void silc_client_get_clients_by_list(SilcClient client,
   in->context = context;
 
   for (i = 0; i < list_count; i++) {
-    uint16 idp_len;
+    SilcUInt16 idp_len;
     SilcClientID *client_id;
     SilcClientEntry entry;
 
@@ -566,7 +567,7 @@ void silc_client_get_client_by_id_resolve(SilcClient client,
 SilcClientEntry
 silc_client_add_client(SilcClient client, SilcClientConnection conn,
 		       char *nickname, char *username, 
-		       char *userinfo, SilcClientID *id, uint32 mode)
+		       char *userinfo, SilcClientID *id, SilcUInt32 mode)
 {
   SilcClientEntry client_entry;
   char *nick = NULL;
@@ -614,7 +615,7 @@ void silc_client_update_client(SilcClient client,
 			       const char *nickname,
 			       const char *username,
 			       const char *userinfo,
-			       uint32 mode)
+			       SilcUInt32 mode)
 {
   char *nick = NULL;
 
@@ -688,7 +689,7 @@ bool silc_client_del_client(SilcClient client, SilcClientConnection conn,
 SilcChannelEntry silc_client_add_channel(SilcClient client,
 					 SilcClientConnection conn,
 					 const char *channel_name,
-					 uint32 mode, 
+					 SilcUInt32 mode, 
 					 SilcChannelID *channel_id)
 {
   SilcChannelEntry channel;
@@ -722,6 +723,8 @@ static void silc_client_del_channel_foreach(void *key, void *context,
 {
   SilcChannelUser chu = (SilcChannelUser)context;
 
+  SILC_LOG_DEBUG(("Start"));
+
   /* Remove the context from the client's channel hash table as that
      table and channel's user_list hash table share this same context. */
   silc_hash_table_del(chu->client->channels, chu->channel);
@@ -735,6 +738,8 @@ bool silc_client_del_channel(SilcClient client, SilcClientConnection conn,
 {
   bool ret = silc_idcache_del_by_context(conn->channel_cache, channel);
 
+  SILC_LOG_DEBUG(("Start"));
+
   /* Free all client entrys from the users list. The silc_hash_table_free
      will free all the entries so they are not freed at the foreach 
      callback. */
@@ -962,7 +967,7 @@ void silc_client_nickname_format(SilcClient client,
   char *newnick = NULL;
   int i, off = 0, len;
   SilcClientEntry *clients;
-  uint32 clients_count = 0;
+  SilcUInt32 clients_count = 0;
   SilcClientEntry unformatted = NULL;
 
   SILC_LOG_DEBUG(("Start"));