[PATCH v3][GSOC] fsck: use bitwise-or assignment operator to set flag
- From
Hiroyuki Sano <sh19910711@gmail.com>
- Date
- Mar 19, 2014, 23:02 UTC
- Message-ID
- <1395270124-2242-1-git-send-email-sh19910711@gmail.com>
fsck_tree() has two different ways to set a flag, which are the followings:
1. Using a if-statement that guards assignment.
2. Using a bitwise-or assignment operator.
Currently, many with the former way, and one with the latter way.
In this patch, unify them to the latter way, because it makes the code shorter and easier to read, and it is brief and to the point.
Signed-off-by: Hiroyuki Sano <sh19910711@gmail.com> --- fsck.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/fsck.c b/fsck.c index b3022ad..abed62b 100644 --- a/fsck.c +++ b/fsck.c @@ -165,18 +165,12 @@ static int fsck_tree(struct tree *item, int strict, fsck_error error_func) sha1 = tree_entry_extract(&desc, &name, &mode); - if (is_null_sha1(sha1)) - has_null_sha1 = 1; - if (strchr(name, '/')) - has_full_path = 1; - if (!*name) - has_empty_name = 1; - if (!strcmp(name, ".")) - has_dot = 1; - if (!strcmp(name, "..")) - has_dotdot = 1; - if (!strcmp(name, ".git")) - has_dotgit = 1; + has_null_sha1 |= is_null_sha1(sha1); + has_full_path |= !!strchr(name, '/'); + has_empty_name |= !*name; + has_dot |= !strcmp(name, "."); + has_dotdot |= !strcmp(name, ".."); + has_dotgit |= !strcmp(name, ".git"); has_zero_pad |= *(char *)desc.buffer == '0'; update_tree_entry(&desc);
-- 1.9.0