diff: drop options parameter from diffcore_fix_diff_index()

peff · gitster · commit 784c0daed543 · 2019-02-14T15:26:14.000-08:00
The sole purpose of this function is to fix the sorting order of the
queued diff entries. It doesn't need to know about any diff options, so
we can drop the unused parameter.

Signed-off-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/diff-lib.c b/diff-lib.c
@@ -531,7 +531,7 @@ int run_diff_index(struct rev_info *revs, int cached)
 		exit(128);
 
 	diff_set_mnemonic_prefix(&revs->diffopt, "c/", cached ? "i/" : "w/");
-	diffcore_fix_diff_index(&revs->diffopt);
+	diffcore_fix_diff_index();
 	diffcore_std(&revs->diffopt);
 	diff_flush(&revs->diffopt);
 	trace_performance_leave("diff-index");
diff --git a/diff.c b/diff.c
@@ -6224,7 +6224,7 @@ static int diffnamecmp(const void *a_, const void *b_)
 	return strcmp(name_a, name_b);
 }
 
-void diffcore_fix_diff_index(struct diff_options *options)
+void diffcore_fix_diff_index(void)
 {
 	struct diff_queue_struct *q = &diff_queued_diff;
 	QSORT(q->queue, q->nr, diffnamecmp);
diff --git a/diff.h b/diff.h
@@ -367,7 +367,7 @@ int git_config_rename(const char *var, const char *value);
 #define DIFF_PICKAXE_IGNORE_CASE	32
 
 void diffcore_std(struct diff_options *);
-void diffcore_fix_diff_index(struct diff_options *);
+void diffcore_fix_diff_index(void);
 
 #define COMMON_DIFF_OPTIONS_HELP \
 "\ncommon diff options:\n" \

Original file line number	Diff line number	Diff line change
`@@ -6224,7 +6224,7 @@ static int diffnamecmp(const void a_, const void b_)`
`6224`	`6224`	`return strcmp(name_a, name_b);`
`6225`	`6225`	`}`
`6226`	`6226`
`6227`		`-void diffcore_fix_diff_index(struct diff_options *options)`
	`6227`	`+void diffcore_fix_diff_index(void)`
`6228`	`6228`	`{`
`6229`	`6229`	`struct diff_queue_struct *q = &diff_queued_diff;`
`6230`	`6230`	`QSORT(q->queue, q->nr, diffnamecmp);`