From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
Simplify the post-run error and warning reporting logic so that in
subsequent patches we can be more specific about what types of things
went wrong.
Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
---
scrub/xfs_scrub.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/scrub/xfs_scrub.c b/scrub/xfs_scrub.c
index e9fc3650..c7305694 100644
--- a/scrub/xfs_scrub.c
+++ b/scrub/xfs_scrub.c
@@ -516,24 +516,20 @@ report_outcome(
total_errors = ctx->errors_found + ctx->runtime_errors;
if (total_errors == 0 && ctx->warnings_found == 0) {
- log_info(ctx, _("No errors found."));
+ log_info(ctx, _("No problems found."));
return;
}
- if (total_errors == 0) {
- fprintf(stderr, _("%s: warnings found: %llu\n"), ctx->mntpoint,
- ctx->warnings_found);
- log_warn(ctx, _("warnings found: %llu"), ctx->warnings_found);
- } else if (ctx->warnings_found == 0) {
+ if (total_errors > 0) {
fprintf(stderr, _("%s: errors found: %llu\n"), ctx->mntpoint,
total_errors);
log_err(ctx, _("errors found: %llu"), total_errors);
- } else {
- fprintf(stderr, _("%s: errors found: %llu; warnings found: %llu\n"),
- ctx->mntpoint, total_errors,
+ }
+
+ if (ctx->warnings_found > 0) {
+ fprintf(stderr, _("%s: warnings found: %llu\n"), ctx->mntpoint,
ctx->warnings_found);
- log_err(ctx, _("errors found: %llu; warnings found: %llu"),
- total_errors, ctx->warnings_found);
+ log_warn(ctx, _("warnings found: %llu"), ctx->warnings_found);
}
/*
