[PATCH 1/3] Unify signedness in hashing calls
- From
Dan McGee <dpmcgee@gmail.com>
- Date
- May 19, 2009, 04:34 UTC
- Message-ID
- <1242707644-29893-1-git-send-email-dpmcgee@gmail.com>
- In-Reply-To
- <449c10960905182132h2c1b38b4jd28721adaeb38484@mail.gmail.com>
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> --- decorate.c | 4 ++-- object.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/decorate.c b/decorate.c index e6fd8a7..2f8a63e 100644 --- a/decorate.c +++ b/decorate.c @@ -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, /* 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) diff --git a/object.c b/object.c index e1feef9..a6ef439 100644 --- a/object.c +++ b/object.c @@ -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 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)
-- 1.6.3.1