From 7d924c9139e33e7599d7aed0446e634c427a5f15 Mon Sep 17 00:00:00 2001 From: "brian m. carlson" Date: Sun, 17 Apr 2016 23:10:39 +0000 Subject: struct name_entry: use struct object_id instead of unsigned char sha1[20] Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano --- fsck.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'fsck.c') diff --git a/fsck.c b/fsck.c index ca4c685377..606eba8c19 100644 --- a/fsck.c +++ b/fsck.c @@ -312,9 +312,9 @@ static int fsck_walk_tree(struct tree *tree, void *data, struct fsck_options *op if (S_ISGITLINK(entry.mode)) continue; if (S_ISDIR(entry.mode)) - result = options->walk(&lookup_tree(entry.sha1)->object, OBJ_TREE, data, options); + result = options->walk(&lookup_tree(entry.oid->hash)->object, OBJ_TREE, data, options); else if (S_ISREG(entry.mode) || S_ISLNK(entry.mode)) - result = options->walk(&lookup_blob(entry.sha1)->object, OBJ_BLOB, data, options); + result = options->walk(&lookup_blob(entry.oid->hash)->object, OBJ_BLOB, data, options); else { result = error("in tree %s: entry %s has bad mode %.6o", oid_to_hex(&tree->object.oid), entry.path, entry.mode); -- cgit v1.2.1 From ce6663a9da77c0adc0743e801946dc1a49f4a186 Mon Sep 17 00:00:00 2001 From: "brian m. carlson" Date: Sun, 17 Apr 2016 23:10:40 +0000 Subject: tree-walk: convert tree_entry_extract() to use struct object_id Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano --- fsck.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'fsck.c') diff --git a/fsck.c b/fsck.c index 606eba8c19..92b17f5d6a 100644 --- a/fsck.c +++ b/fsck.c @@ -450,11 +450,11 @@ static int fsck_tree(struct tree *item, struct fsck_options *options) while (desc.size) { unsigned mode; const char *name; - const unsigned char *sha1; + const struct object_id *oid; - sha1 = tree_entry_extract(&desc, &name, &mode); + oid = tree_entry_extract(&desc, &name, &mode); - has_null_sha1 |= is_null_sha1(sha1); + has_null_sha1 |= is_null_oid(oid); has_full_path |= !!strchr(name, '/'); has_empty_name |= !*name; has_dot |= !strcmp(name, "."); -- cgit v1.2.1