From 4fb40c2b8206f7bdffedd8d58d2f9c031227b01b Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Sat, 15 Jan 2011 19:08:42 -0600 Subject: [PATCH] ll-merge: simplify opts == NULL case As long as sizeof(struct ll_merge_options) is small, there is not much reason not to keep a copy of the default merge options in the BSS section. In return, we get clearer code and one less stack frame in the opts == NULL case. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- ll-merge.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/ll-merge.c b/ll-merge.c index 007dd3e4d..6ce512efc 100644 --- a/ll-merge.c +++ b/ll-merge.c @@ -351,16 +351,13 @@ int ll_merge(mmbuffer_t *result_buf, const struct ll_merge_options *opts) { static struct git_attr_check check[2]; + static const struct ll_merge_options default_opts; const char *ll_driver_name = NULL; int marker_size = DEFAULT_CONFLICT_MARKER_SIZE; const struct ll_merge_driver *driver; - if (!opts) { - struct ll_merge_options default_opts = {0}; - return ll_merge(result_buf, path, ancestor, ancestor_label, - ours, our_label, theirs, their_label, - &default_opts); - } + if (!opts) + opts = &default_opts; if (opts->renormalize) { normalize_file(ancestor, path); -- 2.11.0