From 14d6c87974bb6d9c049fda54b5cd93d92b49cf64 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 18 Aug 2020 12:58:21 +1000 Subject: [PATCH] libei: use a #define for cleaning up a device Signed-off-by: Peter Hutterer --- src/libei-device.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/libei-device.c b/src/libei-device.c index 08e414d..77a8ba1 100644 --- a/src/libei-device.c +++ b/src/libei-device.c @@ -42,6 +42,8 @@ _public_ OBJECT_IMPLEMENT_REF(ei_device); _public_ OBJECT_IMPLEMENT_UNREF(ei_device); +#define _cleanup_ei_device_ _cleanup_(ei_device_cleanup) + OBJECT_IMPLEMENT_CREATE(ei_device); static OBJECT_IMPLEMENT_PARENT(ei_device, ei); @@ -208,9 +210,9 @@ static MunitResult test_device_ids(const MunitParameter params[], void *user_data) { struct ei ei = {0}; - _cleanup_(ei_device_cleanup) struct ei_device *d1 = ei_device_new(&ei); - _cleanup_(ei_device_cleanup) struct ei_device *d2 = ei_device_new(&ei); - _cleanup_(ei_device_cleanup) struct ei_device *d3 = ei_device_new(&ei); + _cleanup_ei_device_ struct ei_device *d1 = ei_device_new(&ei); + _cleanup_ei_device_ struct ei_device *d2 = ei_device_new(&ei); + _cleanup_ei_device_ struct ei_device *d3 = ei_device_new(&ei); munit_assert_int(d1->id, <, d2->id); munit_assert_int(d1->id, <, d3->id); @@ -245,7 +247,7 @@ static MunitResult test_device_cap(const MunitParameter params[], void *user_data) { struct ei ei = {0}; - _cleanup_(ei_device_cleanup) struct ei_device *d = ei_device_new(&ei); + _cleanup_ei_device_ struct ei_device *d = ei_device_new(&ei); munit_assert(ei_device_configure_capability(d, EI_DEVICE_CAP_POINTER)); /* twice is fine */ @@ -274,7 +276,7 @@ static MunitResult test_device_context(const MunitParameter params[], void *user_data) { struct ei ei = {0}; - _cleanup_(ei_device_cleanup) struct ei_device *d = ei_device_new(&ei); + _cleanup_ei_device_ struct ei_device *d = ei_device_new(&ei); munit_assert_ptr_equal(d->object.parent, &ei);