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.
This commit is contained in:
@@ -363,10 +363,8 @@ static int list_timezones(sd_bus *bus, char **args, unsigned n) {
|
||||
assert(n == 1);
|
||||
|
||||
r = get_timezones(&zones);
|
||||
if (r < 0) {
|
||||
log_error_errno(r, "Failed to read list of time zones: %m");
|
||||
return r;
|
||||
}
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to read list of time zones: %m");
|
||||
|
||||
pager_open_if_enabled();
|
||||
strv_print(zones);
|
||||
|
||||
@@ -649,28 +649,20 @@ static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) {
|
||||
assert(_bus);
|
||||
|
||||
r = sd_bus_default_system(&bus);
|
||||
if (r < 0) {
|
||||
log_error_errno(r, "Failed to get system bus connection: %m");
|
||||
return r;
|
||||
}
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to get system bus connection: %m");
|
||||
|
||||
r = sd_bus_add_object_vtable(bus, NULL, "/org/freedesktop/timedate1", "org.freedesktop.timedate1", timedate_vtable, c);
|
||||
if (r < 0) {
|
||||
log_error_errno(r, "Failed to register object: %m");
|
||||
return r;
|
||||
}
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to register object: %m");
|
||||
|
||||
r = sd_bus_request_name(bus, "org.freedesktop.timedate1", 0);
|
||||
if (r < 0) {
|
||||
log_error_errno(r, "Failed to register name: %m");
|
||||
return r;
|
||||
}
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to register name: %m");
|
||||
|
||||
r = sd_bus_attach_event(bus, event, 0);
|
||||
if (r < 0) {
|
||||
log_error_errno(r, "Failed to attach bus to event loop: %m");
|
||||
return r;
|
||||
}
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to attach bus to event loop: %m");
|
||||
|
||||
*_bus = bus;
|
||||
bus = NULL;
|
||||
|
||||
Reference in New Issue
Block a user