mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
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>
This commit is contained in:
parent
2104838bf9
commit
6f64f6d9d2
|
@ -130,11 +130,11 @@ struct object_entry_pool
|
||||||
|
|
||||||
struct mark_set
|
struct mark_set
|
||||||
{
|
{
|
||||||
int shift;
|
|
||||||
union {
|
union {
|
||||||
struct object_entry *marked[1024];
|
struct object_entry *marked[1024];
|
||||||
struct mark_set *sets[1024];
|
struct mark_set *sets[1024];
|
||||||
} data;
|
} data;
|
||||||
|
unsigned int shift;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct last_object
|
struct last_object
|
||||||
|
@ -157,7 +157,7 @@ struct mem_pool
|
||||||
struct atom_str
|
struct atom_str
|
||||||
{
|
{
|
||||||
struct atom_str *next_atom;
|
struct atom_str *next_atom;
|
||||||
int str_len;
|
unsigned int str_len;
|
||||||
char str_dat[FLEX_ARRAY]; /* more */
|
char str_dat[FLEX_ARRAY]; /* more */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -192,8 +192,8 @@ struct branch
|
||||||
struct branch *table_next_branch;
|
struct branch *table_next_branch;
|
||||||
struct branch *active_next_branch;
|
struct branch *active_next_branch;
|
||||||
const char *name;
|
const char *name;
|
||||||
unsigned long last_commit;
|
|
||||||
struct tree_entry branch_tree;
|
struct tree_entry branch_tree;
|
||||||
|
unsigned long last_commit;
|
||||||
unsigned int pack_id;
|
unsigned int pack_id;
|
||||||
unsigned char sha1[20];
|
unsigned char sha1[20];
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue