[PATCH v1.7.4-rc2] ll-merge: simplify opts == NULL case
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Jan 16, 2011, 01:08 UTC
- Message-ID
- <20110116010841.GA18049@burratino>
- In-Reply-To
- <7vpqx5mipt.fsf@alter.siamese.dyndns.org>
Junio C Hamano wrote:
> Jonathan Nieder <jrnieder@gmail.com> writes:
Show 7 quoted lines
>> + 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);
>
> Fun---expecting tail recursion elimination ;-)?Fun but not warranted. Let's simplify.
-- 8< -- Subject: 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 <jrnieder@gmail.com> --- ll-merge.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/ll-merge.c b/ll-merge.c index 007dd3e..6ce512e 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);
-- 1.7.4.rc2