From 3256e2027b9f2cba83354b03ea805c9047e1f574 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 28 May 2023 22:53:23 +0900 Subject: [PATCH] sd-bus: rename introspect_free() -> introspect_done --- src/libsystemd/sd-bus/bus-introspect.c | 2 +- src/libsystemd/sd-bus/bus-introspect.h | 2 +- src/libsystemd/sd-bus/bus-objects.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libsystemd/sd-bus/bus-introspect.c b/src/libsystemd/sd-bus/bus-introspect.c index 3d4c47c6dd7..27149dfcc33 100644 --- a/src/libsystemd/sd-bus/bus-introspect.c +++ b/src/libsystemd/sd-bus/bus-introspect.c @@ -277,7 +277,7 @@ int introspect_finish(struct introspect *i, char **ret) { return 0; } -void introspect_free(struct introspect *i) { +void introspect_done(struct introspect *i) { assert(i); /* Normally introspect_finish() does all the work, this is just a backup for error paths */ diff --git a/src/libsystemd/sd-bus/bus-introspect.h b/src/libsystemd/sd-bus/bus-introspect.h index 19e3ef09e24..8bd23a50fd7 100644 --- a/src/libsystemd/sd-bus/bus-introspect.h +++ b/src/libsystemd/sd-bus/bus-introspect.h @@ -23,4 +23,4 @@ int introspect_write_interface( const char *interface_name, const sd_bus_vtable *v); int introspect_finish(struct introspect *i, char **ret); -void introspect_free(struct introspect *i); +void introspect_done(struct introspect *i); diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c index 80dc86d01a4..c25c40ff372 100644 --- a/src/libsystemd/sd-bus/bus-objects.c +++ b/src/libsystemd/sd-bus/bus-objects.c @@ -927,7 +927,7 @@ int introspect_path( sd_bus_error *error) { _cleanup_ordered_set_free_free_ OrderedSet *s = NULL; - _cleanup_(introspect_free) struct introspect intro = {}; + _cleanup_(introspect_done) struct introspect intro = {}; bool empty; int r; -- 2.47.3