From 19ae05b33b98721f622901a7577dcefe6a81777d Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 3 Mar 2022 10:57:01 +1000 Subject: [PATCH] test: define peck_unrefp in the header file Signed-off-by: Peter Hutterer --- test/eierpecken.c | 2 +- test/eierpecken.h | 2 ++ test/test-ei-device.c | 1 - test/test-ei-seat.c | 2 -- test/test-ei.c | 2 -- test/test-eis.c | 2 -- 6 files changed, 3 insertions(+), 8 deletions(-) diff --git a/test/eierpecken.c b/test/eierpecken.c index 5536e28..f89926e 100644 --- a/test/eierpecken.c +++ b/test/eierpecken.c @@ -120,7 +120,7 @@ peck_destroy(struct peck *peck) static OBJECT_IMPLEMENT_CREATE(peck); -OBJECT_IMPLEMENT_UNREF_CLEANUP(peck); +OBJECT_IMPLEMENT_UNREF(peck); OBJECT_IMPLEMENT_GETTER(peck, ei, struct ei*); OBJECT_IMPLEMENT_GETTER(peck, eis, struct eis*); diff --git a/test/eierpecken.h b/test/eierpecken.h index 949939f..e296a17 100644 --- a/test/eierpecken.h +++ b/test/eierpecken.h @@ -281,6 +281,8 @@ peck_ei_event_type_name(enum ei_event_type type); const char * peck_eis_event_type_name(enum eis_event_type type); +DEFINE_UNREF_CLEANUP_FUNC(peck); + /* Define a bunch of _cleanup_foo_ macros for a struct foo */ DEFINE_UNREF_CLEANUP_FUNC(ei); DEFINE_UNREF_CLEANUP_FUNC(ei_event); diff --git a/test/test-ei-device.c b/test/test-ei-device.c index 21961fc..6854940 100644 --- a/test/test-ei-device.c +++ b/test/test-ei-device.c @@ -34,7 +34,6 @@ #include "eierpecken.h" -DEFINE_UNREF_CLEANUP_FUNC(peck); DEFINE_TRIVIAL_CLEANUP_FUNC(struct memfile *, memfile_unref); #define _cleanup_memfile_ _cleanup_(memfile_unrefp) diff --git a/test/test-ei-seat.c b/test/test-ei-seat.c index 080004b..8061c1b 100644 --- a/test/test-ei-seat.c +++ b/test/test-ei-seat.c @@ -27,8 +27,6 @@ #include "util-munit.h" #include "eierpecken.h" -DEFINE_UNREF_CLEANUP_FUNC(peck); - MUNIT_TEST(test_ei_seat_bind_unbind) { _unref_(peck) *peck = peck_new(); diff --git a/test/test-ei.c b/test/test-ei.c index bde7bc7..ec5aa00 100644 --- a/test/test-ei.c +++ b/test/test-ei.c @@ -31,8 +31,6 @@ #include "util-strings.h" #include "eierpecken.h" -DEFINE_UNREF_CLEANUP_FUNC(peck); - MUNIT_TEST(test_ei_ref_unref) { struct ei *ei = ei_new(NULL); diff --git a/test/test-eis.c b/test/test-eis.c index 5a219b0..deaa463 100644 --- a/test/test-eis.c +++ b/test/test-eis.c @@ -28,8 +28,6 @@ #include "eierpecken.h" -DEFINE_UNREF_CLEANUP_FUNC(peck); - MUNIT_TEST(eistest_ref_unref) { struct eis *eis = eis_new(NULL);