From f647962d64e844689f3e2acfce6102fc47e76df2 Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Fri, 28 Nov 2014 18:50:43 +0100 Subject: treewide: yet more log_*_errno + return simplifications Using: find . -name '*.[ch]' | while read f; do perl -i.mmm -e \ 'local $/; local $_=<>; s/(if\s*\([^\n]+\))\s*{\n(\s*)(log_[a-z_]*_errno\(\s*([->a-zA-Z_]+)\s*,[^;]+);\s*return\s+\g4;\s+}/\1\n\2return \3;/msg; print;' $f done And a couple of manual whitespace fixups. --- src/libsystemd/sd-bus/test-bus-chat.c | 6 ++---- src/libsystemd/sd-bus/test-bus-server.c | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'src/libsystemd') diff --git a/src/libsystemd/sd-bus/test-bus-chat.c b/src/libsystemd/sd-bus/test-bus-chat.c index dfc54560af..e91c402c5b 100644 --- a/src/libsystemd/sd-bus/test-bus-chat.c +++ b/src/libsystemd/sd-bus/test-bus-chat.c @@ -53,10 +53,8 @@ static int object_callback(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bu log_info("Invoked Foobar() on %s", sd_bus_message_get_path(m)); r = sd_bus_reply_method_return(m, NULL); - if (r < 0) { - log_error_errno(r, "Failed to send reply: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to send reply: %m"); return 1; } diff --git a/src/libsystemd/sd-bus/test-bus-server.c b/src/libsystemd/sd-bus/test-bus-server.c index e65811f047..5f807c3b1e 100644 --- a/src/libsystemd/sd-bus/test-bus-server.c +++ b/src/libsystemd/sd-bus/test-bus-server.c @@ -146,10 +146,8 @@ static int client(struct context *c) { "/", "org.freedesktop.systemd.test", "Exit"); - if (r < 0) { - log_error_errno(r, "Failed to allocate method call: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to allocate method call: %m"); r = sd_bus_call(bus, m, 0, &error, &reply); if (r < 0) { -- cgit v1.2.3-54-g00ecf