[PATCH v3 3/8] diff.c: do not pass diff options as keydata to hashmap
- From
Stefan Beller <sbeller@google.com>
- Date
- Jun 22, 2018, 01:57 UTC
- Message-ID
- <20180622015725.219575-4-sbeller@google.com>
- In-Reply-To
- <20180622015725.219575-1-sbeller@google.com>
When we initialize the hashmap, we give it a pointer to the diff_options, which it then passes along to each call of the hashmap_cmp_fn function. There's no need to pass it a second time as the "keydata" parameter, and our comparison functions never look at keydata.
This was a mistake left over from an earlier round of 2e2d5ac184 (diff.c: color moved lines differently, 2017-06-30), before hashmap learned to pass the data pointer for us.
Explanation-by: Jeff King <peff@peff.net> Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- diff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/diff.c b/diff.c index 136d44b4556..112e6af2cc8 100644 --- a/diff.c +++ b/diff.c @@ -842,13 +842,13 @@ static void mark_color_as_moved(struct diff_options *o, case DIFF_SYMBOL_PLUS: hm = del_lines; key = prepare_entry(o, n); - match = hashmap_get(hm, key, o); + match = hashmap_get(hm, key, NULL); free(key); break; case DIFF_SYMBOL_MINUS: hm = add_lines; key = prepare_entry(o, n); - match = hashmap_get(hm, key, o); + match = hashmap_get(hm, key, NULL); free(key); break; default:
-- 2.18.0.rc2.346.g013aa6912e-goog