"Geoffrey Irving" <irving@xxxxxxx> writes:
> From c4e60c28fe66985ac8224da832589c982010744e Mon Sep 17 00:00:00 2001
> From: Geoffrey Irving <irving@xxxxxxx>
> Date: Tue, 8 Jul 2008 19:47:22 -0700
> Subject: [PATCH 2/3] cached-sha1-map: refactoring hash traversal code
>
> Pulling common code from get_cached_sha1_entry and set_cached_sha1_entry
> into static find_helper function.
> ---
Sign-off?
> cached-sha1-map.c | 68 +++++++++++++++++++++++++++++-----------------------
> 1 files changed, 38 insertions(+), 30 deletions(-)
The refactoring is good, and it should have been that way from the
beginning. Please don't send in "introduce foo.c [1/N]", "oops, initial
version of foo.c was crap, here is a fixup [2/N]".
> diff --git a/cached-sha1-map.c b/cached-sha1-map.c
> index e363745..147c7a2 100644
> --- a/cached-sha1-map.c
> +++ b/cached-sha1-map.c
> @@ -140,43 +144,47 @@ int get_cached_sha1_entry(struct cached_sha1_map *cache,
> mask = cache->size - 1;
>
> for (i = get_hash_index(key) & mask; ; i = (i+1) & mask) {
> - if (!hashcmp(key, cache->entries[i].key)) {
> - hashcpy(value, cache->entries[i].value);
> - return 0;
> - } else if (is_null_sha1(cache->entries[i].key))
> - return -1;
> + if (!hashcmp(key, cache->entries[i].key))
> + return i;
> + else if (is_null_sha1(cache->entries[i].key))
> + return ~i;
> }
> }
>
> +int get_cached_sha1_entry(struct cached_sha1_map *cache,
> + const unsigned char *key, unsigned char *value)
> +{
> + long i = find_helper(cache, key);
> + if(i < 0)
> + return -1;
Does this have to be extern?
If you are designing an API from scratch, and if you want a long, use it
consistently. Do not demote an int to shorter int in a callchain
unnecessarily.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
