Skip to content

Commit f647962

Browse files
michichmichich
committed
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.
1 parent e80733b commit f647962

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+476
-947
lines changed

‎src/journal-remote/journal-remote.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -653,10 +653,8 @@ static int setup_microhttpd_server(RemoteServer *s,
653653
assert(fd >= 0);
654654

655655
r = fd_nonblock(fd, true);
656-
if (r < 0) {
657-
log_error_errno(r, "Failed to make fd:%d nonblocking: %m", fd);
658-
return r;
659-
}
656+
if (r < 0)
657+
return log_error_errno(r, "Failed to make fd:%d nonblocking: %m", fd);
660658

661659
if (key) {
662660
assert(cert);

‎src/libsystemd/sd-bus/test-bus-chat.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,8 @@ static int object_callback(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bu
5353
log_info("Invoked Foobar() on %s", sd_bus_message_get_path(m));
5454

5555
r = sd_bus_reply_method_return(m, NULL);
56-
if (r < 0) {
57-
log_error_errno(r, "Failed to send reply: %m");
58-
return r;
59-
}
56+
if (r < 0)
57+
return log_error_errno(r, "Failed to send reply: %m");
6058

6159
return 1;
6260
}

‎src/libsystemd/sd-bus/test-bus-server.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,8 @@ static int client(struct context *c) {
146146
"/",
147147
"org.freedesktop.systemd.test",
148148
"Exit");
149-
if (r < 0) {
150-
log_error_errno(r, "Failed to allocate method call: %m");
151-
return r;
152-
}
149+
if (r < 0)
150+
return log_error_errno(r, "Failed to allocate method call: %m");
153151

154152
r = sd_bus_call(bus, m, 0, &error, &reply);
155153
if (r < 0) {

‎src/locale/localectl.c‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -234,10 +234,8 @@ static int list_locales(sd_bus *bus, char **args, unsigned n) {
234234
assert(args);
235235

236236
r = get_locales(&l);
237-
if (r < 0) {
238-
log_error_errno(r, "Failed to read list of locales: %m");
239-
return r;
240-
}
237+
if (r < 0)
238+
return log_error_errno(r, "Failed to read list of locales: %m");
241239

242240
pager_open_if_enabled();
243241
strv_print(l);
@@ -309,10 +307,8 @@ static int nftw_cb(
309307
*e = 0;
310308

311309
r = set_consume(keymaps, p);
312-
if (r < 0 && r != -EEXIST) {
313-
log_error_errno(r, "Can't add keymap: %m");
314-
return r;
315-
}
310+
if (r < 0 && r != -EEXIST)
311+
return log_error_errno(r, "Can't add keymap: %m");
316312

317313
return 0;
318314
}

‎src/locale/localed.c‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -610,10 +610,8 @@ static int vconsole_convert_to_x11(Context *c, sd_bus *bus) {
610610
int r;
611611

612612
r = x11_write_data(c);
613-
if (r < 0) {
614-
log_error_errno(r, "Failed to set X11 keyboard layout: %m");
615-
return r;
616-
}
613+
if (r < 0)
614+
return log_error_errno(r, "Failed to set X11 keyboard layout: %m");
617615

618616
log_info("Changed X11 keyboard layout to '%s' model '%s' variant '%s' options '%s'",
619617
strempty(c->x11_layout),
@@ -1155,28 +1153,20 @@ static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) {
11551153
assert(_bus);
11561154

11571155
r = sd_bus_default_system(&bus);
1158-
if (r < 0) {
1159-
log_error_errno(r, "Failed to get system bus connection: %m");
1160-
return r;
1161-
}
1156+
if (r < 0)
1157+
return log_error_errno(r, "Failed to get system bus connection: %m");
11621158

11631159
r = sd_bus_add_object_vtable(bus, NULL, "/org/freedesktop/locale1", "org.freedesktop.locale1", locale_vtable, c);
1164-
if (r < 0) {
1165-
log_error_errno(r, "Failed to register object: %m");
1166-
return r;
1167-
}
1160+
if (r < 0)
1161+
return log_error_errno(r, "Failed to register object: %m");
11681162

11691163
r = sd_bus_request_name(bus, "org.freedesktop.locale1", 0);
1170-
if (r < 0) {
1171-
log_error_errno(r, "Failed to register name: %m");
1172-
return r;
1173-
}
1164+
if (r < 0)
1165+
return log_error_errno(r, "Failed to register name: %m");
11741166

11751167
r = sd_bus_attach_event(bus, event, 0);
1176-
if (r < 0) {
1177-
log_error_errno(r, "Failed to attach bus to event loop: %m");
1178-
return r;
1179-
}
1168+
if (r < 0)
1169+
return log_error_errno(r, "Failed to attach bus to event loop: %m");
11801170

11811171
*_bus = bus;
11821172
bus = NULL;

‎src/login/loginctl.c‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -384,10 +384,8 @@ static int print_session_status_info(sd_bus *bus, const char *path, bool *new_li
384384
int r;
385385

386386
r = bus_map_all_properties(bus, "org.freedesktop.login1", path, map, &i);
387-
if (r < 0) {
388-
log_error_errno(r, "Could not get properties: %m");
389-
return r;
390-
}
387+
if (r < 0)
388+
return log_error_errno(r, "Could not get properties: %m");
391389

392390
if (*new_line)
393391
printf("\n");
@@ -699,10 +697,8 @@ static int show_user(sd_bus *bus, char **args, unsigned n) {
699697
uid_t uid;
700698

701699
r = get_user_creds((const char**) (args+i), &uid, NULL, NULL, NULL);
702-
if (r < 0) {
703-
log_error_errno(r, "Failed to look up user %s: %m", args[i]);
704-
return r;
705-
}
700+
if (r < 0)
701+
return log_error_errno(r, "Failed to look up user %s: %m", args[i]);
706702

707703
r = sd_bus_call_method(
708704
bus,
@@ -859,10 +855,8 @@ static int enable_linger(sd_bus *bus, char **args, unsigned n) {
859855
uid_t uid;
860856

861857
r = get_user_creds((const char**) (args+i), &uid, NULL, NULL, NULL);
862-
if (r < 0) {
863-
log_error_errno(r, "Failed to look up user %s: %m", args[i]);
864-
return r;
865-
}
858+
if (r < 0)
859+
return log_error_errno(r, "Failed to look up user %s: %m", args[i]);
866860

867861
r = sd_bus_call_method (
868862
bus,
@@ -892,10 +886,8 @@ static int terminate_user(sd_bus *bus, char **args, unsigned n) {
892886
uid_t uid;
893887

894888
r = get_user_creds((const char**) (args+i), &uid, NULL, NULL, NULL);
895-
if (r < 0) {
896-
log_error_errno(r, "Failed to look up user %s: %m", args[i]);
897-
return r;
898-
}
889+
if (r < 0)
890+
return log_error_errno(r, "Failed to look up user %s: %m", args[i]);
899891

900892
r = sd_bus_call_method (
901893
bus,
@@ -928,10 +920,8 @@ static int kill_user(sd_bus *bus, char **args, unsigned n) {
928920
uid_t uid;
929921

930922
r = get_user_creds((const char**) (args+i), &uid, NULL, NULL, NULL);
931-
if (r < 0) {
932-
log_error_errno(r, "Failed to look up user %s: %m", args[i]);
933-
return r;
934-
}
923+
if (r < 0)
924+
return log_error_errno(r, "Failed to look up user %s: %m", args[i]);
935925

936926
r = sd_bus_call_method (
937927
bus,

‎src/login/logind-session.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -337,10 +337,8 @@ int session_load(Session *s) {
337337
"CONTROLLER", &controller,
338338
NULL);
339339

340-
if (r < 0) {
341-
log_error_errno(r, "Failed to read %s: %m", s->state_file);
342-
return r;
343-
}
340+
if (r < 0)
341+
return log_error_errno(r, "Failed to read %s: %m", s->state_file);
344342

345343
if (!s->user) {
346344
uid_t u;

‎src/login/logind-user.c‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -310,10 +310,8 @@ static int user_mkdir_runtime_path(User *u) {
310310
assert(u);
311311

312312
r = mkdir_safe_label("/run/user", 0755, 0, 0);
313-
if (r < 0) {
314-
log_error_errno(r, "Failed to create /run/user: %m");
315-
return r;
316-
}
313+
if (r < 0)
314+
return log_error_errno(r, "Failed to create /run/user: %m");
317315

318316
if (!u->runtime_path) {
319317
if (asprintf(&p, "/run/user/" UID_FMT, u->uid) < 0)

0 commit comments

Comments
 (0)