Mercurial > dovecot > core-2.2
diff src/lib-master/master-login-auth.c @ 14923:96fd2c3bf932
Reverted "support for non-pointers" part of the hash table API changes.
Originally I wrote it using clang, which didn't give as many warnings as gcc
did. I guess this way is safer anyway..
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Mon, 20 Aug 2012 09:47:28 +0300 |
| parents | 8eae4e205c82 |
| children | aa6027a0a78e |
line wrap: on
line diff
--- a/src/lib-master/master-login-auth.c Mon Aug 20 08:31:00 2012 +0300 +++ b/src/lib-master/master-login-auth.c Mon Aug 20 09:47:28 2012 +0300 @@ -47,7 +47,7 @@ struct timeout *to; unsigned int id_counter; - HASH_TABLE(unsigned int, struct master_login_auth_request *) requests; + HASH_TABLE(void *, struct master_login_auth_request *) requests; /* linked list of requests, ordered by create_stamp */ struct master_login_auth_request *request_head, *request_tail; @@ -158,7 +158,7 @@ request = auth->request_head; DLLIST2_REMOVE(&auth->request_head, &auth->request_tail, request); - hash_table_remove(auth->requests, request->id); + hash_table_remove(auth->requests, POINTER_CAST(request->id)); reason = t_strdup_printf( "Auth server request timed out after %u secs", @@ -188,7 +188,7 @@ update_timeout = request->prev == NULL; - hash_table_remove(auth->requests, request->id); + hash_table_remove(auth->requests, POINTER_CAST(request->id)); DLLIST2_REMOVE(&auth->request_head, &auth->request_tail, request); if (update_timeout) { @@ -203,7 +203,7 @@ { struct master_login_auth_request *request; - request = hash_table_lookup(auth->requests, id); + request = hash_table_lookup(auth->requests, POINTER_CAST(id)); if (request == NULL) { i_error("Auth server sent reply with unknown ID %u", id); return NULL; @@ -476,7 +476,7 @@ memcpy(login_req->cookie, req->cookie, sizeof(login_req->cookie)); login_req->callback = callback; login_req->context = context; - hash_table_insert(auth->requests, id, login_req); + hash_table_insert(auth->requests, POINTER_CAST(id), login_req); DLLIST2_APPEND(&auth->request_head, &auth->request_tail, login_req); if (auth->to == NULL)