From: Stefan Beller Date: Mon, 02 Apr 2018 22:48:50 GMT Subject: [PATCH 3/7] diff.c: do not pass diff options as keydata to hashmap Message-ID: <20180402224854.86922-4-sbeller@google.com> In-Reply-To: <20180402224854.86922-1-sbeller@google.com> The diff options are passed to the compare function as 'hashmap_cmp_fn_data', which are given when the hashmaps are initialized. A later patch will make use of the keydata to signal different settings for comparision. Signed-off-by: Stefan Beller --- diff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/diff.c b/diff.c index 4c59f5f5d3..52f6e02130 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.17.0.484.g0c8726318c-goog