ll_union_merge(): rename path_unused parameter
The "path" parameter to ll_union_merge() is named "path_unused", since we don't ourselves use it. But we do pass it to ll_xdl_merge(), which may look at it (it gets passed to ll_binary_merge(), which may pass it to warning()). Let's rename it to correct this inaccuracy (both of the other functions correctly do not call this "unused"). Note that we also pass drv_unused, but it truly is unused by the rest of the stack (it only exists at all to provide a generic interface that matches what ll_ext_merge() needs). Reported-by: Elijah Newren <newren@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Jun 10, 2021 at 12:14 UTC
382b601acde12b298bb84faa11b3f42868716a0d
1 file changed
+2
-2
ll-merge.c
+2
-2
@@ -138,7 +138,7 @@ static int ll_xdl_merge(const struct ll_merge_driver *drv_unused,
138
139
static int ll_union_merge(const struct ll_merge_driver *drv_unused,
140
mmbuffer_t *result,
141
- const char *path_unused,
141
+ const char *path,
142
mmfile_t *orig, const char *orig_name,
143
mmfile_t *src1, const char *name1,
144
mmfile_t *src2, const char *name2,
@@ -150,7 +150,7 @@ static int ll_union_merge(const struct ll_merge_driver *drv_unused,
150
assert(opts);
151
o = *opts;
152
o.variant = XDL_MERGE_FAVOR_UNION;
153
- return ll_xdl_merge(drv_unused, result, path_unused,
153
+ return ll_xdl_merge(drv_unused, result, path,
154
orig, orig_name, src1, name1, src2, name2,
155
&o, marker_size);
156
}