From d10a5f6c3de64fcaa71855d9a94394ea8317038a Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Wed, 29 Mar 2023 21:45:10 +0100 Subject: [PATCH] man: further shorten print-unit-path example --- man/print-unit-path.c | 41 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/man/print-unit-path.c b/man/print-unit-path.c index 44c8271820f..0b89318736a 100644 --- a/man/print-unit-path.c +++ b/man/print-unit-path.c @@ -1,20 +1,20 @@ /* SPDX-License-Identifier: MIT-0 */ -#include -#include -#include -#include - -#include -#define _cleanup_(f) __attribute__((cleanup(f))) - /* This is equivalent to: * busctl call org.freedesktop.systemd1 /org/freedesktop/systemd1 \ * org.freedesktop.systemd1.Manager GetUnitByPID $$ * - * Compile with 'cc -lsystemd print-unit-path.c' + * Compile with 'cc print-unit-path.c -lsystemd' */ +#include +#include +#include +#include + +#include + +#define _cleanup_(f) __attribute__((cleanup(f))) #define DESTINATION "org.freedesktop.systemd1" #define PATH "/org/freedesktop/systemd1" #define INTERFACE "org.freedesktop.systemd1.Manager" @@ -26,12 +26,16 @@ static int log_error(int error, const char *message) { return error; } -static int print_unit_path(sd_bus *bus) { - _cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL; +int main(int argc, char **argv) { + _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL; _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; - _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL; + _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL, *m = NULL; int r; + r = sd_bus_open_system(&bus); + if (r < 0) + return log_error(r, "Failed to acquire bus"); + r = sd_bus_message_new_method_call(bus, &m, DESTINATION, PATH, INTERFACE, MEMBER); if (r < 0) @@ -43,7 +47,7 @@ static int print_unit_path(sd_bus *bus) { r = sd_bus_call(bus, m, -1, &error, &reply); if (r < 0) - return log_error(r, "Call failed"); + return log_error(r, MEMBER " call failed"); const char *ans; r = sd_bus_message_read(reply, "o", &ans); @@ -54,14 +58,3 @@ static int print_unit_path(sd_bus *bus) { return 0; } - -int main(int argc, char **argv) { - _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL; - int r; - - r = sd_bus_open_system(&bus); - if (r < 0) - return log_error(r, "Failed to acquire bus"); - - print_unit_path(bus); -} -- 2.39.5