From: Shawn O. Pearce <spearce@spearce.org>
Date: Wed, 17 Jan 2007 05:57:23 +0000 (-0500)
Subject: Correct a few types to be unsigned in fast-import.
X-Git-Tag: v1.5.0-rc4~14^2~23
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6f64f6d9d2b12cdae1648cbf536685c888f3b981;p=git.git

Correct a few types to be unsigned in fast-import.

The length of an atom string cannot be negative.  So make it
explicit and declare it as an unsigned value.

The shift width in a mark table node also cannot be negative.
I'm also moving it to after the pointer arrays to prevent any
possible alignment problems on a 64 bit system.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/fast-import.c b/fast-import.c
index f1b26d103..2c500d6be 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -130,11 +130,11 @@ struct object_entry_pool
 
 struct mark_set
 {
-	int shift;
 	union {
 		struct object_entry *marked[1024];
 		struct mark_set *sets[1024];
 	} data;
+	unsigned int shift;
 };
 
 struct last_object
@@ -157,7 +157,7 @@ struct mem_pool
 struct atom_str
 {
 	struct atom_str *next_atom;
-	int str_len;
+	unsigned int str_len;
 	char str_dat[FLEX_ARRAY]; /* more */
 };
 
@@ -192,8 +192,8 @@ struct branch
 	struct branch *table_next_branch;
 	struct branch *active_next_branch;
 	const char *name;
-	unsigned long last_commit;
 	struct tree_entry branch_tree;
+	unsigned long last_commit;
 	unsigned int pack_id;
 	unsigned char sha1[20];
 };