From c24015f626b8249ba300ea311892856dc0134c2b Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Mon, 19 Aug 2013 09:58:58 +0800 Subject: [PATCH 1/1] lib/waiter: remove waitset_destroy We can rely on the ctx free to destroy the waitset. Signed-off-by: Jeremy Kerr --- discover/pb-discover.c | 1 - lib/waiter/waiter.c | 5 ----- lib/waiter/waiter.h | 1 - 3 files changed, 7 deletions(-) diff --git a/discover/pb-discover.c b/discover/pb-discover.c index 8ab2849..70f0365 100644 --- a/discover/pb-discover.c +++ b/discover/pb-discover.c @@ -192,7 +192,6 @@ int main(int argc, char *argv[]) } device_handler_destroy(handler); - waitset_destroy(waitset); udev_destroy(udev); config_fini(); diff --git a/lib/waiter/waiter.c b/lib/waiter/waiter.c index 833f63b..e201ad1 100644 --- a/lib/waiter/waiter.c +++ b/lib/waiter/waiter.c @@ -57,11 +57,6 @@ struct waitset *waitset_create(void *ctx) return set; } -void waitset_destroy(struct waitset *set) -{ - talloc_free(set); -} - static struct waiter *waiter_new(struct waitset *set) { struct waiter **waiters, *waiter; diff --git a/lib/waiter/waiter.h b/lib/waiter/waiter.h index 58ea04c..9a8acf4 100644 --- a/lib/waiter/waiter.h +++ b/lib/waiter/waiter.h @@ -14,7 +14,6 @@ enum events { typedef int (*waiter_cb)(void *); struct waitset *waitset_create(void *ctx); -void waitset_destroy(struct waitset *waitset); struct waiter *waiter_register_io(struct waitset *waitset, int fd, int events, waiter_cb callback, void *arg); -- 2.39.2