From 922828a4e2881f4593092f6cc192d18e90f3b8a3 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 12 Apr 2025 10:04:41 +0900 Subject: [PATCH] busctl: use strdup_to() and set_consume() --- src/busctl/busctl.c | 50 +++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c index 9a9f98c8081..924defd2673 100644 --- a/src/busctl/busctl.c +++ b/src/busctl/busctl.c @@ -824,18 +824,17 @@ static int on_interface(const char *interface, uint64_t flags, void *userdata) { .flags = flags, }; - r = free_and_strdup(&m->interface, interface); + r = strdup_to(&m->interface, interface); if (r < 0) return log_oom(); - r = set_put(members, m); + r = set_consume(members, TAKE_PTR(m)); + if (r < 0) + return log_oom(); if (r == 0) return log_error_errno(SYNTHETIC_ERRNO(EEXIST), "Invalid introspection data: duplicate interface '%s'.", interface); - if (r < 0) - return log_oom(); - m = NULL; return 0; } @@ -856,30 +855,29 @@ static int on_method(const char *interface, const char *name, const char *signat .flags = flags, }; - r = free_and_strdup(&m->interface, interface); + r = strdup_to(&m->interface, interface); if (r < 0) return log_oom(); - r = free_and_strdup(&m->name, name); + r = strdup_to(&m->name, name); if (r < 0) return log_oom(); - r = free_and_strdup(&m->signature, signature); + r = strdup_to(&m->signature, signature); if (r < 0) return log_oom(); - r = free_and_strdup(&m->result, result); + r = strdup_to(&m->result, result); if (r < 0) return log_oom(); - r = set_put(members, m); + r = set_consume(members, TAKE_PTR(m)); + if (r < 0) + return log_oom(); if (r == 0) return log_error_errno(SYNTHETIC_ERRNO(EEXIST), "Invalid introspection data: duplicate method '%s' on interface '%s'.", name, interface); - if (r < 0) - return log_oom(); - m = NULL; return 0; } @@ -900,26 +898,25 @@ static int on_signal(const char *interface, const char *name, const char *signat .flags = flags, }; - r = free_and_strdup(&m->interface, interface); + r = strdup_to(&m->interface, interface); if (r < 0) return log_oom(); - r = free_and_strdup(&m->name, name); + r = strdup_to(&m->name, name); if (r < 0) return log_oom(); - r = free_and_strdup(&m->signature, signature); + r = strdup_to(&m->signature, signature); if (r < 0) return log_oom(); - r = set_put(members, m); + r = set_consume(members, TAKE_PTR(m)); + if (r < 0) + return log_oom(); if (r == 0) return log_error_errno(SYNTHETIC_ERRNO(EEXIST), "Invalid introspection data: duplicate signal '%s' on interface '%s'.", name, interface); - if (r < 0) - return log_oom(); - m = NULL; return 0; } @@ -941,26 +938,25 @@ static int on_property(const char *interface, const char *name, const char *sign .writable = writable, }; - r = free_and_strdup(&m->interface, interface); + r = strdup_to(&m->interface, interface); if (r < 0) return log_oom(); - r = free_and_strdup(&m->name, name); + r = strdup_to(&m->name, name); if (r < 0) return log_oom(); - r = free_and_strdup(&m->signature, signature); + r = strdup_to(&m->signature, signature); if (r < 0) return log_oom(); - r = set_put(members, m); + r = set_consume(members, TAKE_PTR(m)); + if (r < 0) + return log_oom(); if (r == 0) return log_error_errno(SYNTHETIC_ERRNO(EEXIST), "Invalid introspection data: duplicate property '%s' on interface '%s'.", name, interface); - if (r < 0) - return log_oom(); - m = NULL; return 0; } -- 2.47.3