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/locale/localectl.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/locale/localectl.c') diff --git a/src/locale/localectl.c b/src/locale/localectl.c index 211808b03e..cb2920974c 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c @@ -234,10 +234,8 @@ static int list_locales(sd_bus *bus, char **args, unsigned n) { assert(args); r = get_locales(&l); - if (r < 0) { - log_error_errno(r, "Failed to read list of locales: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to read list of locales: %m"); pager_open_if_enabled(); strv_print(l); @@ -309,10 +307,8 @@ static int nftw_cb( *e = 0; r = set_consume(keymaps, p); - if (r < 0 && r != -EEXIST) { - log_error_errno(r, "Can't add keymap: %m"); - return r; - } + if (r < 0 && r != -EEXIST) + return log_error_errno(r, "Can't add keymap: %m"); return 0; } -- cgit v1.2.3-54-g00ecf