summaryrefslogtreecommitdiff
path: root/source4/gtk/common
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-05-24 07:32:17 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:08:32 -0500
commitcdc64c448df49676c96f87d106af8de0c467651f (patch)
tree341b178e8bc20e6b132382f8fce05204978ddd9d /source4/gtk/common
parenta665cccd2ef81e704e90bb228bbd14c0afb031af (diff)
downloadsamba-cdc64c448df49676c96f87d106af8de0c467651f.tar.gz
samba-cdc64c448df49676c96f87d106af8de0c467651f.tar.bz2
samba-cdc64c448df49676c96f87d106af8de0c467651f.zip
r15853: started the process of removing the warnings now that
talloc_set_destructor() is type safe. The end result will be lots less use of void*, and less calls to talloc_get_type() (This used to be commit 6b4c085b862c0932b80b93e316396a53b993544c)
Diffstat (limited to 'source4/gtk/common')
-rw-r--r--source4/gtk/common/gtk_events.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/source4/gtk/common/gtk_events.c b/source4/gtk/common/gtk_events.c
index 9a0af5fdeb..67467b87a7 100644
--- a/source4/gtk/common/gtk_events.c
+++ b/source4/gtk/common/gtk_events.c
@@ -34,7 +34,7 @@
*/
static struct event_context *gtk_event_context_global;
-static int gtk_event_context_destructor(void *ptr)
+static int gtk_event_context_destructor(struct event_context *ev)
{
gtk_event_context_global = NULL;
return 0;
@@ -83,9 +83,8 @@ static gboolean gtk_event_fd_handler(GIOChannel *source, GIOCondition condition,
/*
destroy an fd_event
*/
-static int gtk_event_fd_destructor(void *ptr)
+static int gtk_event_fd_destructor(struct fd_event *fde)
{
- struct fd_event *fde = talloc_get_type(ptr, struct fd_event);
struct gtk_fd_event *gtk_fd = talloc_get_type(fde->additional_data,
struct gtk_fd_event);
@@ -212,9 +211,8 @@ struct gtk_timed_event {
/*
destroy a timed event
*/
-static int gtk_event_timed_destructor(void *ptr)
+static int gtk_event_timed_destructor(struct timed_event *te)
{
- struct timed_event *te = talloc_get_type(ptr, struct timed_event);
struct gtk_timed_event *gtk_te = talloc_get_type(te->additional_data,
struct gtk_timed_event);
@@ -223,7 +221,7 @@ static int gtk_event_timed_destructor(void *ptr)
return 0;
}
-static int gtk_event_timed_deny_destructor(void *ptr)
+static int gtk_event_timed_deny_destructor(struct timed_event *te)
{
return -1;
}