From 5d85ea4c8f693ecc63ff5ec7a262c85614a4ad73 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 27 Aug 2020 10:10:40 +1000 Subject: [PATCH] tools/demo-server: use _cleanup_foo_ functions for eis and eis_event Signed-off-by: Peter Hutterer --- tools/eis-demo-server.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/eis-demo-server.c b/tools/eis-demo-server.c index fd63ad8..4efb8f0 100644 --- a/tools/eis-demo-server.c +++ b/tools/eis-demo-server.c @@ -59,6 +59,9 @@ static void sighandler(int signal) { } DEFINE_TRIVIAL_CLEANUP_FUNC(struct eis *, eis_unref); +#define _cleanup_eis_ _cleanup_(eis_unrefp) +DEFINE_TRIVIAL_CLEANUP_FUNC(struct eis_event *, eis_event_unref); +#define _cleanup_eis_event_ _cleanup_(eis_event_unrefp) static void unlink_free(char **path) { if (*path) { @@ -252,7 +255,7 @@ int main(int argc, char **argv) .layout = layout, }; - _cleanup_(eis_unrefp) struct eis *eis = eis_new(NULL); + _cleanup_eis_ struct eis *eis = eis_new(NULL); assert(eis); if (verbose) @@ -278,7 +281,7 @@ int main(int argc, char **argv) eis_dispatch(eis); while (true) { - struct eis_event *e = eis_get_event(eis); + _cleanup_eis_event_ struct eis_event *e = eis_get_event(eis); if (!e) break; @@ -342,7 +345,6 @@ int main(int argc, char **argv) default: abort(); } - eis_event_unref(e); } }