git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 2/4] pack-objects: use unsigned int for counter and offset values

From
Dan McGee <dpmcgee@gmail.com>
Date
Oct 18, 2011, 05:21 UTC
Message-ID
<1318915284-6361-2-git-send-email-dpmcgee@gmail.com>
In-Reply-To
<1318915284-6361-1-git-send-email-dpmcgee@gmail.com>

This is done in some of the new pack layout code introduced in commit 1b4bb16b9ec331c. This more closely matches the nr_objects global that is unsigned that these variables are based off of and bounded by.

Signed-off-by: Dan McGee <dpmcgee@gmail.com>
---
 builtin/pack-objects.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 0ab3a3b..0de10d2 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -455,7 +455,7 @@ static int mark_tagged(const char *path, const unsigned char *sha1, int flag,
 }
 
 static inline void add_to_write_order(struct object_entry **wo,
-			       int *endp,
+			       unsigned int *endp,
 			       struct object_entry *e)
 {
 	if (e->filled)
@@ -465,7 +465,7 @@ static inline void add_to_write_order(struct object_entry **wo,
 }
 
 static void add_descendants_to_write_order(struct object_entry **wo,
-					   int *endp,
+					   unsigned int *endp,
 					   struct object_entry *e)
 {
 	struct object_entry *child;
@@ -477,7 +477,7 @@ static void add_descendants_to_write_order(struct object_entry **wo,
 }
 
 static void add_family_to_write_order(struct object_entry **wo,
-				      int *endp,
+				      unsigned int *endp,
 				      struct object_entry *e)
 {
 	struct object_entry *root;
@@ -490,7 +490,7 @@ static void add_family_to_write_order(struct object_entry **wo,
 
 static struct object_entry **compute_write_order(void)
 {
-	int i, wo_end;
+	unsigned int i, wo_end;
 
 	struct object_entry **wo = xmalloc(nr_objects * sizeof(*wo));
 
@@ -506,8 +506,8 @@ static struct object_entry **compute_write_order(void)
 	 * Make sure delta_sibling is sorted in the original
 	 * recency order.
 	 */
-	for (i = nr_objects - 1; 0 <= i; i--) {
-		struct object_entry *e = &objects[i];
+	for (i = nr_objects; i > 0;) {
+		struct object_entry *e = &objects[--i];
 		if (!e->delta)
 			continue;
 		/* Mark me as the first child */
-- 
1.7.7
Previous: Dan McGeeNext: Dan McGee
Message 2 of 10 in “pack-objects: mark add_to_write_order() as inline”
  1. 1/4 pack-objects: mark add_to_write_order() as inlineDan McGee, Oct 18, 2011
  2. 2/4 pack-objects: use unsigned int for counter and offset valuesDan McGee, Oct 18, 2011
  3. 3/4 pack-objects: don't traverse objects unnecessarilyDan McGee, Oct 18, 2011
  4. Junio C HamanoOct 27, 2011
  5. Dan McGeeNov 9, 2011
  6. Junio C HamanoNov 12, 2011
  7. Dan McGeeNov 13, 2011
  8. Junio C HamanoNov 14, 2011
  9. 4/4 pack-objects: rewrite add_descendants_to_write_order() iterativelyDan McGee, Oct 18, 2011
  10. Junio C HamanoOct 27, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.