diff options
| author | Eric Sandeen <sandeen@redhat.com> | 2011-09-16 15:49:27 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2011-09-16 18:43:05 -0400 |
| commit | f85a9ae6397ff074193322a12ed721dbf5751e41 (patch) | |
| tree | 0b1c0c7c119539dfd989dd2f0b561182ebe2323c | |
| parent | 06e41ddea9aa7d01c9804d0da162a00efdc42d84 (diff) | |
| download | e2fsprogs-f85a9ae6397ff074193322a12ed721dbf5751e41.tar.gz | |
e2fsck: Don't store old_op from ehandler_operation if we don't restore it.
old_op is set but never used, because we restore "0"
not old_op. So don't bother with it.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
| -rw-r--r-- | e2fsck/pass1.c | 3 | ||||
| -rw-r--r-- | e2fsck/pass2.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c index 16ddcdaa..4c3fe3f1 100644 --- a/e2fsck/pass1.c +++ b/e2fsck/pass1.c @@ -402,7 +402,6 @@ static void check_is_really_dir(e2fsck_t ctx, struct problem_context *pctx, { struct ext2_inode *inode = pctx->inode; struct ext2_dir_entry *dirent; - const char *old_op; errcode_t retval; blk64_t blk; unsigned int i, rec_len, not_device = 0; @@ -472,7 +471,7 @@ static void check_is_really_dir(e2fsck_t ctx, struct problem_context *pctx, return; /* read the first block */ - old_op = ehandler_operation(_("reading directory block")); + ehandler_operation(_("reading directory block")); retval = ext2fs_read_dir_block3(ctx->fs, blk, buf, 0); ehandler_operation(0); if (retval) diff --git a/e2fsck/pass2.c b/e2fsck/pass2.c index 9c44aa20..43ba5b29 100644 --- a/e2fsck/pass2.c +++ b/e2fsck/pass2.c @@ -711,7 +711,6 @@ static int check_dir_block(ext2_filsys fs, struct ext2_dir_entry *dirent, *prev; ext2_dirhash_t hash; unsigned int offset = 0; - const char * old_op; int dir_modified = 0; int dot_state; unsigned int rec_len; @@ -774,7 +773,7 @@ static int check_dir_block(ext2_filsys fs, db->blockcnt, ino); #endif - old_op = ehandler_operation(_("reading directory block")); + ehandler_operation(_("reading directory block")); cd->pctx.errcode = ext2fs_read_dir_block3(fs, block_nr, buf, 0); ehandler_operation(0); if (cd->pctx.errcode == EXT2_ET_DIR_CORRUPTED) |