diff options
| author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2007-07-24 23:54:25 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-24 17:28:10 -0700 |
| commit | 1843d8d545de0e94dc4c7d3c9125fb47a99962c4 (patch) | |
| tree | 08a132c95c8c6e165143419dbc5f59f6706047fb /unpack-trees.c | |
| parent | 24d00634948452d0bec1b373b6a2eb9145fc8bfc (diff) | |
| download | git-1843d8d545de0e94dc4c7d3c9125fb47a99962c4.tar.gz git-1843d8d545de0e94dc4c7d3c9125fb47a99962c4.tar.xz | |
cleanup unpack-trees.c: shrink struct tree_entry_list
Remove the two write-only fields executable and symlink from struct
tree_entry_list. Also replace usage of the field directory with
S_ISDIR checks on the mode field, and then remove this now obsolete
field, too. Noticed by David Kastrup.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 7cc029e56..3b3271843 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -11,9 +11,6 @@ struct tree_entry_list { struct tree_entry_list *next; - unsigned directory : 1; - unsigned executable : 1; - unsigned symlink : 1; unsigned int mode; const char *name; const unsigned char *sha1; @@ -38,9 +35,6 @@ static struct tree_entry_list *create_tree_entry_list(struct tree *tree) entry->name = one.path; entry->sha1 = one.sha1; entry->mode = one.mode; - entry->directory = S_ISDIR(one.mode) != 0; - entry->executable = (one.mode & S_IXUSR) != 0; - entry->symlink = S_ISLNK(one.mode) != 0; entry->next = NULL; *list_p = entry; @@ -141,9 +135,9 @@ static int unpack_trees_rec(struct tree_entry_list **posns, int len, #endif if (!first || entcmp(first, firstdir, posns[i]->name, - posns[i]->directory) > 0) { + S_ISDIR(posns[i]->mode)) > 0) { first = posns[i]->name; - firstdir = posns[i]->directory; + firstdir = S_ISDIR(posns[i]->mode); } } /* No name means we're done */ @@ -177,7 +171,7 @@ static int unpack_trees_rec(struct tree_entry_list **posns, int len, continue; } - if (posns[i]->directory) { + if (S_ISDIR(posns[i]->mode)) { struct tree *tree = lookup_tree(posns[i]->sha1); any_dirs = 1; parse_tree(tree); |