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

[thirdparty/git.git] / fast-import.c

diff --git a/fast-import.c b/fast-import.c
index 84dfde9d2f47d65757778982fea2e6c480f5c79b..2c500d6be32e8b83e8c7bd0c3768f3b9e6a08907 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -72,6 +72,7 @@ Format of STDIN stream:
   path_str    ::= path    | '"' quoted(path)    '"' ;
 
   declen ::= # unsigned 32 bit value, ascii base10 notation;
+  bigint ::= # unsigned integer value, ascii base10 notation;
   binary_data ::= # file content, not interpreted;
 
   sp ::= # ASCII space character;
@@ -81,7 +82,7 @@ Format of STDIN stream:
         # an idnum.  This is to distinguish it from a ref or tag name as
      # GIT does not permit ':' in ref or tag strings.
         #
-  idnum   ::= ':' declen;
+  idnum   ::= ':' bigint;
   path    ::= # GIT style file path, e.g. "a/b/c";
   ref     ::= # GIT ref name, e.g. "refs/heads/MOZ_GECKO_EXPERIMENT";
   tag     ::= # GIT tag name, e.g. "FIREFOX_1_5";
@@ -129,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
@@ -156,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 */
 };
 
@@ -191,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];
 };