mirror of
https://github.com/systemd/systemd
synced 2024-10-06 16:21:34 +00:00
tree-wide: use return value of log_xxx_errno()
This commit is contained in:
parent
a61c0bdf39
commit
fed66db05d
|
@ -2019,13 +2019,12 @@ static int verify(sd_journal *j) {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
k = journal_file_verify(f, arg_verify_key, &first, &validated, &last, true);
|
k = journal_file_verify(f, arg_verify_key, &first, &validated, &last, true);
|
||||||
if (k == -EINVAL) {
|
if (k == -EINVAL)
|
||||||
/* If the key was invalid give up right-away. */
|
/* If the key was invalid give up right-away. */
|
||||||
return k;
|
return k;
|
||||||
} else if (k < 0) {
|
else if (k < 0)
|
||||||
log_warning_errno(k, "FAIL: %s (%m)", f->path);
|
r = log_warning_errno(k, "FAIL: %s (%m)", f->path);
|
||||||
r = k;
|
else {
|
||||||
} else {
|
|
||||||
char a[FORMAT_TIMESTAMP_MAX], b[FORMAT_TIMESTAMP_MAX], c[FORMAT_TIMESPAN_MAX];
|
char a[FORMAT_TIMESTAMP_MAX], b[FORMAT_TIMESTAMP_MAX], c[FORMAT_TIMESPAN_MAX];
|
||||||
log_info("PASS: %s", f->path);
|
log_info("PASS: %s", f->path);
|
||||||
|
|
||||||
|
@ -2374,10 +2373,8 @@ int main(int argc, char *argv[]) {
|
||||||
int q;
|
int q;
|
||||||
|
|
||||||
q = journal_directory_vacuum(d->path, arg_vacuum_size, arg_vacuum_n_files, arg_vacuum_time, NULL, !arg_quiet);
|
q = journal_directory_vacuum(d->path, arg_vacuum_size, arg_vacuum_n_files, arg_vacuum_time, NULL, !arg_quiet);
|
||||||
if (q < 0) {
|
if (q < 0)
|
||||||
log_error_errno(q, "Failed to vacuum %s: %m", d->path);
|
r = log_error_errno(q, "Failed to vacuum %s: %m", d->path);
|
||||||
r = q;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
goto finish;
|
goto finish;
|
||||||
|
|
|
@ -743,16 +743,12 @@ static int enumerator_scan_devices_all(sd_device_enumerator *enumerator) {
|
||||||
int k;
|
int k;
|
||||||
|
|
||||||
k = enumerator_scan_dir(enumerator, "bus", "devices", NULL);
|
k = enumerator_scan_dir(enumerator, "bus", "devices", NULL);
|
||||||
if (k < 0) {
|
if (k < 0)
|
||||||
log_debug_errno(k, "sd-device-enumerator: Failed to scan /sys/bus: %m");
|
r = log_debug_errno(k, "sd-device-enumerator: Failed to scan /sys/bus: %m");
|
||||||
r = k;
|
|
||||||
}
|
|
||||||
|
|
||||||
k = enumerator_scan_dir(enumerator, "class", NULL, NULL);
|
k = enumerator_scan_dir(enumerator, "class", NULL, NULL);
|
||||||
if (k < 0) {
|
if (k < 0)
|
||||||
log_debug_errno(k, "sd-device-enumerator: Failed to scan /sys/class: %m");
|
r = log_debug_errno(k, "sd-device-enumerator: Failed to scan /sys/class: %m");
|
||||||
r = k;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return r;
|
return r;
|
||||||
|
@ -870,10 +866,8 @@ int device_enumerator_scan_subsystems(sd_device_enumerator *enumerator) {
|
||||||
/* modules */
|
/* modules */
|
||||||
if (match_subsystem(enumerator, "module")) {
|
if (match_subsystem(enumerator, "module")) {
|
||||||
k = enumerator_scan_dir_and_add_devices(enumerator, "module", NULL, NULL);
|
k = enumerator_scan_dir_and_add_devices(enumerator, "module", NULL, NULL);
|
||||||
if (k < 0) {
|
if (k < 0)
|
||||||
log_debug_errno(k, "sd-device-enumerator: Failed to scan modules: %m");
|
r = log_debug_errno(k, "sd-device-enumerator: Failed to scan modules: %m");
|
||||||
r = k;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (access("/sys/subsystem", F_OK) >= 0)
|
if (access("/sys/subsystem", F_OK) >= 0)
|
||||||
|
@ -884,19 +878,15 @@ int device_enumerator_scan_subsystems(sd_device_enumerator *enumerator) {
|
||||||
/* subsystems (only buses support coldplug) */
|
/* subsystems (only buses support coldplug) */
|
||||||
if (match_subsystem(enumerator, "subsystem")) {
|
if (match_subsystem(enumerator, "subsystem")) {
|
||||||
k = enumerator_scan_dir_and_add_devices(enumerator, subsysdir, NULL, NULL);
|
k = enumerator_scan_dir_and_add_devices(enumerator, subsysdir, NULL, NULL);
|
||||||
if (k < 0) {
|
if (k < 0)
|
||||||
log_debug_errno(k, "sd-device-enumerator: Failed to scan subsystems: %m");
|
r = log_debug_errno(k, "sd-device-enumerator: Failed to scan subsystems: %m");
|
||||||
r = k;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* subsystem drivers */
|
/* subsystem drivers */
|
||||||
if (match_subsystem(enumerator, "drivers")) {
|
if (match_subsystem(enumerator, "drivers")) {
|
||||||
k = enumerator_scan_dir(enumerator, subsysdir, "drivers", "drivers");
|
k = enumerator_scan_dir(enumerator, subsysdir, "drivers", "drivers");
|
||||||
if (k < 0) {
|
if (k < 0)
|
||||||
log_debug_errno(k, "sd-device-enumerator: Failed to scan drivers: %m");
|
r = log_debug_errno(k, "sd-device-enumerator: Failed to scan drivers: %m");
|
||||||
r = k;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
typesafe_qsort(enumerator->devices, enumerator->n_devices, device_compare);
|
typesafe_qsort(enumerator->devices, enumerator->n_devices, device_compare);
|
||||||
|
|
|
@ -282,8 +282,7 @@ void dns_query_candidate_notify(DnsQueryCandidate *c) {
|
||||||
return;
|
return;
|
||||||
|
|
||||||
fail:
|
fail:
|
||||||
log_warning_errno(r, "Failed to follow search domains: %m");
|
c->error_code = log_warning_errno(r, "Failed to follow search domains: %m");
|
||||||
c->error_code = r;
|
|
||||||
dns_query_ready(c->query);
|
dns_query_ready(c->query);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -133,10 +133,8 @@ static int on_reboot(Context *c) {
|
||||||
t = get_startup_time(c);
|
t = get_startup_time(c);
|
||||||
|
|
||||||
q = utmp_put_reboot(t);
|
q = utmp_put_reboot(t);
|
||||||
if (q < 0) {
|
if (q < 0)
|
||||||
log_error_errno(q, "Failed to write utmp record: %m");
|
r = log_error_errno(q, "Failed to write utmp record: %m");
|
||||||
r = q;
|
|
||||||
}
|
|
||||||
|
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
@ -157,10 +155,8 @@ static int on_shutdown(Context *c) {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
q = utmp_put_shutdown();
|
q = utmp_put_shutdown();
|
||||||
if (q < 0) {
|
if (q < 0)
|
||||||
log_error_errno(q, "Failed to write utmp record: %m");
|
r = log_error_errno(q, "Failed to write utmp record: %m");
|
||||||
r = q;
|
|
||||||
}
|
|
||||||
|
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue