diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-05-24 07:35:06 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:08:33 -0500 |
| commit | 92acfc07998da1546182579ad12a063f025c9286 (patch) | |
| tree | 73bbb0b6863908aee6d015b47b5b91649e3d5c67 /source4/web_server | |
| parent | 971d30bb201f5c3faff5f575d26882eb79f7955a (diff) | |
| download | samba-92acfc07998da1546182579ad12a063f025c9286.tar.gz samba-92acfc07998da1546182579ad12a063f025c9286.tar.bz2 samba-92acfc07998da1546182579ad12a063f025c9286.zip | |
r15855: more talloc_set_destructor() typesafe fixes. nearly done ...
(This used to be commit 396d82a231b6e3a91178db08b706626d4d4b420c)
Diffstat (limited to 'source4/web_server')
| -rw-r--r-- | source4/web_server/http.c | 3 | ||||
| -rw-r--r-- | source4/web_server/web_server.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/source4/web_server/http.c b/source4/web_server/http.c index f79bedb2de..8dd594de20 100644 --- a/source4/web_server/http.c +++ b/source4/web_server/http.c @@ -668,9 +668,8 @@ static void session_timeout(struct event_context *ev, struct timed_event *te, /* destroy a session */ -static int session_destructor(void *ptr) +static int session_destructor(struct session_data *s) { - struct session_data *s = talloc_get_type(ptr, struct session_data); DLIST_REMOVE(s->edata->sessions, s); return 0; } diff --git a/source4/web_server/web_server.c b/source4/web_server/web_server.c index 93d59cc47a..7596ca40fc 100644 --- a/source4/web_server/web_server.c +++ b/source4/web_server/web_server.c @@ -37,9 +37,8 @@ /* destroy a web connection */ -static int websrv_destructor(void *ptr) +static int websrv_destructor(struct websrv_context *web) { - struct websrv_context *web = talloc_get_type(ptr, struct websrv_context); if (web->output.fd != -1) { close(web->output.fd); } |