Browse Source

Unify signedness in hashing calls

Our hash_obj and hashtable_index calls and functions were doing a lot of
funny things with signedness. Unify all of it to 'unsigned int'.

Signed-off-by: Dan McGee <dpmcgee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Dan McGee 16 years ago committed by Junio C Hamano
parent
commit
91fe2f9091
  1. 4
      decorate.c
  2. 8
      object.c

4
decorate.c

@ -18,7 +18,7 @@ static void *insert_decoration(struct decoration *n, const struct object *base, @@ -18,7 +18,7 @@ static void *insert_decoration(struct decoration *n, const struct object *base,
{
int size = n->size;
struct object_decoration *hash = n->hash;
int j = hash_obj(base, size);
unsigned int j = hash_obj(base, size);

while (hash[j].base) {
if (hash[j].base == base) {
@ -70,7 +70,7 @@ void *add_decoration(struct decoration *n, const struct object *obj, @@ -70,7 +70,7 @@ void *add_decoration(struct decoration *n, const struct object *obj,
/* Lookup a decoration pointer */
void *lookup_decoration(struct decoration *n, const struct object *obj)
{
int j;
unsigned int j;

/* nothing to lookup */
if (!n->size)

8
object.c

@ -52,7 +52,7 @@ static unsigned int hash_obj(struct object *obj, unsigned int n) @@ -52,7 +52,7 @@ static unsigned int hash_obj(struct object *obj, unsigned int n)

static void insert_obj_hash(struct object *obj, struct object **hash, unsigned int size)
{
int j = hash_obj(obj, size);
unsigned int j = hash_obj(obj, size);

while (hash[j]) {
j++;
@ -62,16 +62,16 @@ static void insert_obj_hash(struct object *obj, struct object **hash, unsigned i @@ -62,16 +62,16 @@ static void insert_obj_hash(struct object *obj, struct object **hash, unsigned i
hash[j] = obj;
}

static int hashtable_index(const unsigned char *sha1)
static unsigned int hashtable_index(const unsigned char *sha1)
{
unsigned int i;
memcpy(&i, sha1, sizeof(unsigned int));
return (int)(i % obj_hash_size);
return i % obj_hash_size;
}

struct object *lookup_object(const unsigned char *sha1)
{
int i;
unsigned int i;
struct object *obj;

if (!obj_hash)

Loading…
Cancel
Save