r4275@bucket (orig r265): kcr | 2008-01-21 02:57:32 -0500

[1ts-debian.git] / zephyr / server / client.c

diff --git a/zephyr/server/client.c b/zephyr/server/client.c
index e56c9b9b5f4ba6ffaee5e5bdb79e24f9248fb9aa..90d83bc31a57717633544bbc5b224b1bc2526f9e 100644 (file)
--- a/zephyr/server/client.c
+++ b/zephyr/server/client.c
@@ -65,7 +65,6 @@ client_register(ZNotice_t *notice,
                int wantdefaults)
 {
     Client *client;
-    Code_t retval;
 
     /* chain the client's host onto this server's host list */
 
@@ -98,8 +97,8 @@ client_register(ZNotice_t *notice,
        client->subs = NULL;
        client->realm = NULL;
        client->principal = make_string(notice->z_sender, 0);
-       LIST_INSERT(&client_bucket[INET_HASH(&client->addr.sin_addr,
-                                            notice->z_port)], client);
+       Client_insert(&client_bucket[INET_HASH(&client->addr.sin_addr,
+                                              notice->z_port)], client);
     }
 
     /* Add default subscriptions only if this is not resulting from a brain
@@ -120,7 +119,7 @@ void
 client_deregister(Client *client,
                  int flush)
 {
-    LIST_DELETE(client);
+    Client_delete(client);
     nack_release(client);
     subscr_cancel_client(client);
     free_string(client->principal);