clean up and optimize nth_packed_object_sha1() usage

Nicolas Pitre · Junio C Hamano · commit d72308e01c59 · 2007-04-05T14:59:47.000-07:00
Let's avoid the open coded pack index reference in pack-object and use
nth_packed_object_sha1() instead.  This will help encapsulating index
format differences in one place.

And while at it there is no reason to copy SHA1's over and over while a
direct pointer to it in the index will do just fine.

Signed-off-by: Nicolas Pitre &lt;nico@cam.org&gt;
Acked-by: Shawn O. Pearce &lt;spearce@spearce.org&gt;
Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git a/builtin-fsck.c b/builtin-fsck.c
@@ -348,7 +348,7 @@ static int fsck_tag(struct tag *tag)
 	return 0;
 }
 
-static int fsck_sha1(unsigned char *sha1)
+static int fsck_sha1(const unsigned char *sha1)
 {
 	struct object *obj = parse_object(sha1);
 	if (!obj) {
@@ -648,11 +648,8 @@ int cmd_fsck(int argc, char **argv, const char *prefix)
 
 		for (p = packed_git; p; p = p->next) {
 			uint32_t i, num = num_packed_objects(p);
-			for (i = 0; i < num; i++) {
-				unsigned char sha1[20];
-				nth_packed_object_sha1(p, i, sha1);
-				fsck_sha1(sha1);
-			}
+			for (i = 0; i < num; i++)
+				fsck_sha1(nth_packed_object_sha1(p, i));
 		}
 	}
 
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
@@ -222,7 +222,7 @@ static const unsigned char *find_packed_object_name(struct packed_git *p,
 						    off_t ofs)
 {
 	struct revindex_entry *entry = find_packed_object(p, ofs);
-	return ((unsigned char *)p->index_data) + 4 * 256 + 24 * entry->nr + 4;
+	return nth_packed_object_sha1(p, entry->nr);
 }
 
 static void *delta_against(void *buf, unsigned long size, struct object_entry *entry)
diff --git a/cache.h b/cache.h
@@ -428,7 +428,7 @@ extern unsigned char* use_pack(struct packed_git *, struct pack_window **, off_t
 extern void unuse_pack(struct pack_window **);
 extern struct packed_git *add_packed_git(const char *, int, int);
 extern uint32_t num_packed_objects(const struct packed_git *p);
-extern int nth_packed_object_sha1(const struct packed_git *, uint32_t, unsigned char*);
+extern const unsigned char *nth_packed_object_sha1(const struct packed_git *, uint32_t);
 extern off_t find_pack_entry_one(const unsigned char *, struct packed_git *);
 extern void *unpack_entry(struct packed_git *, off_t, enum object_type *, unsigned long *);
 extern unsigned long unpack_object_header_gently(const unsigned char *buf, unsigned long len, enum object_type *type, unsigned long *sizep);
diff --git a/pack-check.c b/pack-check.c
@@ -42,13 +42,14 @@ static int verify_packfile(struct packed_git *p,
 	 */
 	nr_objects = num_packed_objects(p);
 	for (i = 0, err = 0; i < nr_objects; i++) {
-		unsigned char sha1[20];
+		const unsigned char *sha1;
 		void *data;
 		enum object_type type;
 		unsigned long size;
 		off_t offset;
 
-		if (nth_packed_object_sha1(p, i, sha1))
+		sha1 = nth_packed_object_sha1(p, i);
+		if (!sha1)
 			die("internal error pack-check nth-packed-object");
 		offset = find_pack_entry_one(sha1, p);
 		if (!offset)
@@ -82,14 +83,16 @@ static void show_pack_info(struct packed_git *p)
 	memset(chain_histogram, 0, sizeof(chain_histogram));
 
 	for (i = 0; i < nr_objects; i++) {
-		unsigned char sha1[20], base_sha1[20];
+		const unsigned char *sha1;
+		unsigned char base_sha1[20];
 		const char *type;
 		unsigned long size;
 		unsigned long store_size;
 		off_t offset;
 		unsigned int delta_chain_length;
 
-		if (nth_packed_object_sha1(p, i, sha1))
+		sha1 = nth_packed_object_sha1(p, i);
+		if (!sha1)
 			die("internal error pack-check nth-packed-object");
 		offset = find_pack_entry_one(sha1, p);
 		if (!offset)
diff --git a/sha1_file.c b/sha1_file.c
@@ -1532,15 +1532,14 @@ uint32_t num_packed_objects(const struct packed_git *p)
 	return (uint32_t)((p->index_size - 20 - 20 - 4*256) / 24);
 }
 
-int nth_packed_object_sha1(const struct packed_git *p, uint32_t n,
-			   unsigned char* sha1)
+const unsigned char *nth_packed_object_sha1(const struct packed_git *p,
+					    uint32_t n)
 {
 	const unsigned char *index = p->index_data;
 	index += 4 * 256;
 	if (num_packed_objects(p) <= n)
-		return -1;
-	hashcpy(sha1, index + 24 * n + 4);
-	return 0;
+		return NULL;
+	return index + 24 * n + 4;
 }
 
 off_t find_pack_entry_one(const unsigned char *sha1,
diff --git a/sha1_name.c b/sha1_name.c
@@ -71,7 +71,7 @@ static int match_sha(unsigned len, const unsigned char *a, const unsigned char *
 static int find_short_packed_object(int len, const unsigned char *match, unsigned char *sha1)
 {
 	struct packed_git *p;
-	unsigned char found_sha1[20];
+	const unsigned char *found_sha1 = NULL;
 	int found = 0;
 
 	prepare_packed_git();
@@ -80,10 +80,10 @@ static int find_short_packed_object(int len, const unsigned char *match, unsigne
 		uint32_t first = 0, last = num;
 		while (first < last) {
 			uint32_t mid = (first + last) / 2;
-			unsigned char now[20];
+			const unsigned char *now;
 			int cmp;
 
-			nth_packed_object_sha1(p, mid, now);
+			now = nth_packed_object_sha1(p, mid);
 			cmp = hashcmp(match, now);
 			if (!cmp) {
 				first = mid;
@@ -96,14 +96,14 @@ static int find_short_packed_object(int len, const unsigned char *match, unsigne
 			last = mid;
 		}
 		if (first < num) {
-			unsigned char now[20], next[20];
-			nth_packed_object_sha1(p, first, now);
+			const unsigned char *now, *next;
+		       now = nth_packed_object_sha1(p, first);
 			if (match_sha(len, match, now)) {
-				if (nth_packed_object_sha1(p, first+1, next) ||
-				    !match_sha(len, match, next)) {
+				next = nth_packed_object_sha1(p, first+1);
+			       if (!next|| !match_sha(len, match, next)) {
 					/* unique within this pack */
 					if (!found) {
-						hashcpy(found_sha1, now);
+						found_sha1 = now;
 						found++;
 					}
 					else if (hashcmp(found_sha1, now)) {

Original file line number	Diff line number	Diff line change
`@@ -348,7 +348,7 @@ static int fsck_tag(struct tag *tag)`
`348`	`348`	`return 0;`
`349`	`349`	`}`
`350`	`350`
`351`		`-static int fsck_sha1(unsigned char *sha1)`
	`351`	`+static int fsck_sha1(const unsigned char *sha1)`
`352`	`352`	`{`
`353`	`353`	`struct object *obj = parse_object(sha1);`
`354`	`354`	`if (!obj) {`
`@@ -648,11 +648,8 @@ int cmd_fsck(int argc, char *argv, const char prefix)`
`648`	`648`
`649`	`649`	`for (p = packed_git; p; p = p->next) {`
`650`	`650`	`uint32_t i, num = num_packed_objects(p);`
`651`		`- for (i = 0; i < num; i++) {`
`652`		`- unsigned char sha1[20];`
`653`		`- nth_packed_object_sha1(p, i, sha1);`
`654`		`- fsck_sha1(sha1);`
`655`		`- }`
	`651`	`+ for (i = 0; i < num; i++)`
	`652`	`+ fsck_sha1(nth_packed_object_sha1(p, i));`
`656`	`653`	`}`
`657`	`654`	`}`
`658`	`655`
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ static const unsigned char find_packed_object_name(struct packed_git p,`
`222`	`222`	`off_t ofs)`
`223`	`223`	`{`
`224`	`224`	`struct revindex_entry *entry = find_packed_object(p, ofs);`
`225`		`- return ((unsigned char )p->index_data) + 4 256 + 24 * entry->nr + 4;`
	`225`	`+ return nth_packed_object_sha1(p, entry->nr);`
`226`	`226`	`}`
`227`	`227`
`228`	`228`	`static void delta_against(void buf, unsigned long size, struct object_entry *entry)`
Original file line number	Diff line number	Diff line change
`@@ -1532,15 +1532,14 @@ uint32_t num_packed_objects(const struct packed_git *p)`
`1532`	`1532`	`return (uint32_t)((p->index_size - 20 - 20 - 4*256) / 24);`
`1533`	`1533`	`}`
`1534`	`1534`
`1535`		`-int nth_packed_object_sha1(const struct packed_git *p, uint32_t n,`
`1536`		`- unsigned char* sha1)`
	`1535`	`+const unsigned char nth_packed_object_sha1(const struct packed_git p,`
	`1536`	`+ uint32_t n)`
`1537`	`1537`	`{`
`1538`	`1538`	`const unsigned char *index = p->index_data;`
`1539`	`1539`	`index += 4 * 256;`
`1540`	`1540`	`if (num_packed_objects(p) <= n)`
`1541`		`- return -1;`
`1542`		`- hashcpy(sha1, index + 24 * n + 4);`
`1543`		`- return 0;`
	`1541`	`+ return NULL;`
	`1542`	`+ return index + 24 * n + 4;`
`1544`	`1543`	`}`
`1545`	`1544`
`1546`	`1545`	`off_t find_pack_entry_one(const unsigned char *sha1,`