From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH 3/4] xdiff/xmerge: simplify xdl_recs_copy_0
Date: Sun, 13 Jun 2021 17:58:35 -0500 [thread overview]
Message-ID: <20210613225836.1009569-4-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20210613225836.1009569-1-felipe.contreras@gmail.com>
Remove one unnecessary indentation level.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
xdiff/xmerge.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/xdiff/xmerge.c b/xdiff/xmerge.c
index ab3448ca88..b5b3f56f92 100644
--- a/xdiff/xmerge.c
+++ b/xdiff/xmerge.c
@@ -122,19 +122,19 @@ static int xdl_recs_copy_0(int use_orig, xdfenv_t *xe, int i, int count, int nee
for (i = 0; i < count; size += recs[i++]->size)
if (dest)
memcpy(dest + size, recs[i]->ptr, recs[i]->size);
- if (add_nl) {
- i = recs[count - 1]->size;
- if (i == 0 || recs[count - 1]->ptr[i - 1] != '\n') {
- if (needs_cr) {
- if (dest)
- dest[size] = '\r';
- size++;
- }
-
+ if (!add_nl)
+ return size;
+ i = recs[count - 1]->size;
+ if (i == 0 || recs[count - 1]->ptr[i - 1] != '\n') {
+ if (needs_cr) {
if (dest)
- dest[size] = '\n';
+ dest[size] = '\r';
size++;
}
+
+ if (dest)
+ dest[size] = '\n';
+ size++;
}
return size;
}
--
2.32.0
next prev parent reply other threads:[~2021-06-13 23:00 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-13 22:58 [PATCH 0/4] merge: cleanups and fix Felipe Contreras
2021-06-13 22:58 ` [PATCH 1/4] merge: simplify initialization Felipe Contreras
2021-06-15 19:27 ` Ævar Arnfjörð Bjarmason
2021-06-17 22:35 ` Felipe Contreras
2021-06-13 22:58 ` [PATCH 2/4] merge: fix Yoda conditions Felipe Contreras
2021-06-13 22:58 ` Felipe Contreras [this message]
2021-06-13 22:58 ` [PATCH 4/4] xdiff/xmerge: fix chg0 initialization Felipe Contreras
2021-06-14 15:34 ` Elijah Newren
2021-06-15 7:51 ` Felipe Contreras
2021-06-15 15:21 ` Elijah Newren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210613225836.1009569-4-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).