From 1301def84c5f6467180ddfca64f1758a086cf4dc Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Tue, 3 Jun 2014 21:59:31 -0400 Subject: [PATCH] e2fsck: make a prompt message simpler and thus translatable It can be made simpler because there is no need to differentiate between having an internal journal inode and having an external journal device. Signed-off-by: Benno Schulenberg Signed-off-by: Theodore Ts'o --- e2fsck/journal.c | 1 - e2fsck/problem.c | 2 +- tests/f_extra_journal/expect.1 | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/e2fsck/journal.c b/e2fsck/journal.c index 11ccec58..905c0bf6 100644 --- a/e2fsck/journal.c +++ b/e2fsck/journal.c @@ -759,7 +759,6 @@ errcode_t e2fsck_check_ext3_journal(e2fsck_t ctx) no_has_journal: if (!(sb->s_feature_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL)) { recover = sb->s_feature_incompat & EXT3_FEATURE_INCOMPAT_RECOVER; - pctx.str = "inode"; if (fix_problem(ctx, PR_0_JOURNAL_HAS_JOURNAL, &pctx)) { if (recover && !fix_problem(ctx, PR_0_JOURNAL_RECOVER_SET, &pctx)) diff --git a/e2fsck/problem.c b/e2fsck/problem.c index 2296c970..c721d9db 100644 --- a/e2fsck/problem.c +++ b/e2fsck/problem.c @@ -225,7 +225,7 @@ static struct e2fsck_problem problem_table[] = { /* Superblock has_journal flag is clear but has a journal */ { PR_0_JOURNAL_HAS_JOURNAL, - N_("@S has_@j flag is clear, but a @j %s is present.\n"), + N_("@S has_@j flag is clear, but a @j is present.\n"), PROMPT_CLEAR, PR_PREEN_OK }, /* Superblock needs_recovery flag is set but not journal is present */ diff --git a/tests/f_extra_journal/expect.1 b/tests/f_extra_journal/expect.1 index 8a74adb3..4917396b 100644 --- a/tests/f_extra_journal/expect.1 +++ b/tests/f_extra_journal/expect.1 @@ -1,4 +1,4 @@ -Superblock has_journal flag is clear, but a journal inode is present. +Superblock has_journal flag is clear, but a journal is present. Clear? yes Pass 1: Checking inodes, blocks, and sizes