#endif
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. */
return k;
- } else if (k < 0) {
- log_warning_errno(k, "FAIL: %s (%m)", f->path);
- r = k;
- } else {
+ else if (k < 0)
+ r = log_warning_errno(k, "FAIL: %s (%m)", f->path);
+ else {
char a[FORMAT_TIMESTAMP_MAX], b[FORMAT_TIMESTAMP_MAX], c[FORMAT_TIMESPAN_MAX];
log_info("PASS: %s", f->path);
int q;
q = journal_directory_vacuum(d->path, arg_vacuum_size, arg_vacuum_n_files, arg_vacuum_time, NULL, !arg_quiet);
- if (q < 0) {
- log_error_errno(q, "Failed to vacuum %s: %m", d->path);
- r = q;
- }
+ if (q < 0)
+ r = log_error_errno(q, "Failed to vacuum %s: %m", d->path);
}
goto finish;
int k;
k = enumerator_scan_dir(enumerator, "bus", "devices", NULL);
- if (k < 0) {
- log_debug_errno(k, "sd-device-enumerator: Failed to scan /sys/bus: %m");
- r = k;
- }
+ if (k < 0)
+ r = log_debug_errno(k, "sd-device-enumerator: Failed to scan /sys/bus: %m");
k = enumerator_scan_dir(enumerator, "class", NULL, NULL);
- if (k < 0) {
- log_debug_errno(k, "sd-device-enumerator: Failed to scan /sys/class: %m");
- r = k;
- }
+ if (k < 0)
+ r = log_debug_errno(k, "sd-device-enumerator: Failed to scan /sys/class: %m");
}
return r;
/* modules */
if (match_subsystem(enumerator, "module")) {
k = enumerator_scan_dir_and_add_devices(enumerator, "module", NULL, NULL);
- if (k < 0) {
- log_debug_errno(k, "sd-device-enumerator: Failed to scan modules: %m");
- r = k;
- }
+ if (k < 0)
+ r = log_debug_errno(k, "sd-device-enumerator: Failed to scan modules: %m");
}
if (access("/sys/subsystem", F_OK) >= 0)
/* subsystems (only buses support coldplug) */
if (match_subsystem(enumerator, "subsystem")) {
k = enumerator_scan_dir_and_add_devices(enumerator, subsysdir, NULL, NULL);
- if (k < 0) {
- log_debug_errno(k, "sd-device-enumerator: Failed to scan subsystems: %m");
- r = k;
- }
+ if (k < 0)
+ r = log_debug_errno(k, "sd-device-enumerator: Failed to scan subsystems: %m");
}
/* subsystem drivers */
if (match_subsystem(enumerator, "drivers")) {
k = enumerator_scan_dir(enumerator, subsysdir, "drivers", "drivers");
- if (k < 0) {
- log_debug_errno(k, "sd-device-enumerator: Failed to scan drivers: %m");
- r = k;
- }
+ if (k < 0)
+ r = log_debug_errno(k, "sd-device-enumerator: Failed to scan drivers: %m");
}
typesafe_qsort(enumerator->devices, enumerator->n_devices, device_compare);