diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2008-03-13 10:53:26 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2008-03-13 10:53:26 -0400 |
| commit | a040a99b6cc4bf9f10d39747ca6947f0462a2eb2 (patch) | |
| tree | 3ebb2978e9768b271f7f15dc5bd89455c4eb3f9e /e2fsck/pass1b.c | |
| parent | 399033a6ab713bc1f8ebad90e47fced0e7491b62 (diff) | |
| parent | 2a60480627b28a368c82b87c0795c771c1f8769a (diff) | |
| download | android_external_e2fsprogs-a040a99b6cc4bf9f10d39747ca6947f0462a2eb2.tar.gz android_external_e2fsprogs-a040a99b6cc4bf9f10d39747ca6947f0462a2eb2.tar.bz2 android_external_e2fsprogs-a040a99b6cc4bf9f10d39747ca6947f0462a2eb2.zip | |
Merge branch 'maint'
Conflicts:
lib/ext2fs/ext2_err.et.in
Diffstat (limited to 'e2fsck/pass1b.c')
| -rw-r--r-- | e2fsck/pass1b.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/e2fsck/pass1b.c b/e2fsck/pass1b.c index 6956d23f..06cf87b4 100644 --- a/e2fsck/pass1b.c +++ b/e2fsck/pass1b.c @@ -564,7 +564,7 @@ static int delete_file_block(ext2_filsys fs, decrement_badcount(ctx, *block_nr, p); } else com_err("delete_file_block", 0, - _("internal error; can't find dup_blk for %u\n"), + _("internal error: can't find dup_blk for %u\n"), *block_nr); } else { ext2fs_unmark_block_bitmap(ctx->block_found_map, *block_nr); @@ -697,7 +697,7 @@ static int clone_file_block(ext2_filsys fs, return BLOCK_CHANGED; } else com_err("clone_file_block", 0, - _("internal error; can't find dup_blk for %u\n"), + _("internal error: can't find dup_blk for %u\n"), *block_nr); } return 0; |