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/modules-load/modules-load.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/modules-load') diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c index 99aa429ed8..1fd01adbe4 100644 --- a/src/modules-load/modules-load.c +++ b/src/modules-load/modules-load.c @@ -81,10 +81,8 @@ static int load_module(struct kmod_ctx *ctx, const char *m) { log_debug("load: %s", m); r = kmod_module_new_from_lookup(ctx, m, &modlist); - if (r < 0) { - log_error_errno(r, "Failed to lookup alias '%s': %m", m); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to lookup alias '%s': %m", m); if (!modlist) { log_error("Failed to find module '%s'", m); -- cgit v1.2.1