Skip to content

Commit

Permalink
fsck: use bitwise-or assignment operator to set flag
Browse files Browse the repository at this point in the history
fsck_tree() has two different ways to set a flag variable, either by
using a if-statement that guards an assignment, or by using a
bitwise-or assignment operator.  Most are done with the former, and
only one variable is assigned with the latter.

Since all the conditions are short-and-sweet, we can afford to
uniformly use the latter style, which makes the resulting code
shorter and easier to read.

Signed-off-by: Hiroyuki Sano <sh19910711@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Hiroyuki Sano authored and Junio C Hamano committed Mar 20, 2014
1 parent 7bbc4e8 commit effd12e
Showing 1 changed file with 6 additions and 12 deletions.
18 changes: 6 additions & 12 deletions fsck.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit effd12e

Please sign in to comment.