From 09e4d67a0810f61cc8444bcd9fdc55736875a02d Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Wed, 11 Jul 2012 14:40:36 -0600 Subject: [PATCH] LU-169 e2fsck: rename "bool" variables Since "bool" is a valid C type, declarations of the form "int bool" will cause compiler errors if is included. Rename these variables to avoid this name clash. This was introduced via libcfs/posix_types.h including since Lustre commit 9f3469f1d00099b9301ba2b90c846c924ce7796b. Signed-off-by: Andreas Dilger Change-Id: Ib99cbb579951fb7467aaf06f86bfe1513b00500c --- e2fsck/e2fsck.h | 2 +- e2fsck/pass1.c | 4 ++-- e2fsck/problem.c | 8 ++++---- misc/e2image.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h index c5a4083..63b6f3b 100644 --- a/e2fsck/e2fsck.h +++ b/e2fsck/e2fsck.h @@ -510,7 +510,7 @@ extern void e2fsck_hide_quota(e2fsck_t ctx); /* pass1.c */ extern void e2fsck_setup_tdb_icount(e2fsck_t ctx, int flags, ext2_icount_t *ret); -extern void e2fsck_use_inode_shortcuts(e2fsck_t ctx, int bool); +extern void e2fsck_use_inode_shortcuts(e2fsck_t ctx, int use_shortcuts); extern int e2fsck_pass1_check_device_inode(ext2_filsys fs, struct ext2_inode *inode); extern int e2fsck_pass1_check_symlink(ext2_filsys fs, ext2_ino_t ino, diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c index bdf2616..fc55f65 100644 --- a/e2fsck/pass1.c +++ b/e2fsck/pass1.c @@ -3204,11 +3204,11 @@ static errcode_t e2fsck_get_alloc_block(ext2_filsys fs, blk64_t goal, return (0); } -void e2fsck_use_inode_shortcuts(e2fsck_t ctx, int bool) +void e2fsck_use_inode_shortcuts(e2fsck_t ctx, int use_shortcuts) { ext2_filsys fs = ctx->fs; - if (bool) { + if (use_shortcuts) { fs->get_blocks = pass1_get_blocks; fs->check_directory = pass1_check_directory; fs->read_inode = pass1_read_inode; diff --git a/e2fsck/problem.c b/e2fsck/problem.c index c8b355b..4273531 100644 --- a/e2fsck/problem.c +++ b/e2fsck/problem.c @@ -1883,11 +1883,11 @@ void clear_problem_context(struct problem_context *ctx) static void reconfigure_bool(e2fsck_t ctx, struct e2fsck_problem *ptr, const char *key, int mask, const char *name) { - int bool; + int val; - bool = (ptr->flags & mask); - profile_get_boolean(ctx->profile, "problems", key, name, bool, &bool); - if (bool) + val = (ptr->flags & mask); + profile_get_boolean(ctx->profile, "problems", key, name, val, &val); + if (val) ptr->flags |= mask; else ptr->flags &= ~mask; diff --git a/misc/e2image.c b/misc/e2image.c index 3a956ef..e6ea52a 100644 --- a/misc/e2image.c +++ b/misc/e2image.c @@ -270,9 +270,9 @@ static errcode_t meta_read_inode(ext2_filsys fs EXT2FS_ATTR((unused)), return 0; } -static void use_inode_shortcuts(ext2_filsys fs, int bool) +static void use_inode_shortcuts(ext2_filsys fs, int use_shortcuts) { - if (bool) { + if (use_shortcuts) { fs->get_blocks = meta_get_blocks; fs->check_directory = meta_check_directory; fs->read_inode = meta_read_inode; -- 1.8.3.1