git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Brandon Casey <drafnel@gmail.com>
To: git@vger.kernel.org
Cc: jrnieder@gmail.com, pclouds@gmail.com, gitster@pobox.com,
	Brandon Casey <drafnel@gmail.com>
Subject: [PATCH v3 01/11] sequencer.c: rework search for start of footer to improve clarity
Date: Sun, 27 Jan 2013 17:11:45 -0800	[thread overview]
Message-ID: <1359335515-13818-2-git-send-email-drafnel@gmail.com> (raw)
In-Reply-To: <1359335515-13818-1-git-send-email-drafnel@gmail.com>

This code sequence is somewhat difficult to read.  Let's rewrite it
using more descriptive variable names to try to make it easier to
understand.

Signed-off-by: Brandon Casey <drafnel@gmail.com>
---
 sequencer.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/sequencer.c b/sequencer.c
index aef5e8a..cd211b2 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -1024,16 +1024,19 @@ int sequencer_pick_revisions(struct replay_opts *opts)
 static int ends_rfc2822_footer(struct strbuf *sb, int ignore_footer)
 {
 	int ch;
-	int hit = 0;
+	int last_char_was_nl, this_char_is_nl;
 	int i, j, k;
 	int len = sb->len - ignore_footer;
 	int first = 1;
 	const char *buf = sb->buf;
 
+	/* find start of last paragraph */
+	last_char_was_nl = 0;
 	for (i = len - 1; i > 0; i--) {
-		if (hit && buf[i] == '\n')
+		this_char_is_nl = (buf[i] == '\n');
+		if (last_char_was_nl && this_char_is_nl)
 			break;
-		hit = (buf[i] == '\n');
+		last_char_was_nl = this_char_is_nl;
 	}
 
 	while (i < len - 1 && buf[i] == '\n')
-- 
1.8.1.1.450.g0327af3

  reply	other threads:[~2013-01-28  1:12 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-28  1:11 [PATCH v3 00/11] unify appending of sob Brandon Casey
2013-01-28  1:11 ` Brandon Casey [this message]
2013-01-28  1:27   ` [PATCH v3 01/11] sequencer.c: rework search for start of footer to improve clarity Jonathan Nieder
2013-01-28  1:11 ` [PATCH v3 02/11] commit, cherry-pick -s: remove broken support for multiline rfc2822 fields Brandon Casey
2013-01-28  1:29   ` Jonathan Nieder
2013-01-28  1:11 ` [PATCH v3 03/11] t/test-lib-functions.sh: allow to specify the tag name to test_commit Brandon Casey
2013-01-28  1:11 ` [PATCH v3 04/11] t/t3511: add some tests of 'cherry-pick -s' functionality Brandon Casey
2013-01-28  2:08   ` Jonathan Nieder
2013-01-28  1:11 ` [PATCH v3 05/11] sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer Brandon Casey
2013-01-28  2:21   ` Jonathan Nieder
2013-01-28  2:51     ` Jonathan Nieder
2013-01-28  5:38       ` Brandon Casey
2013-01-28  1:11 ` [PATCH v3 06/11] sequencer.c: always separate "(cherry picked from" from commit body Brandon Casey
2013-01-28  2:34   ` Jonathan Nieder
2013-02-10 23:25     ` Brandon Casey
2013-01-28  1:11 ` [PATCH v3 07/11] sequencer.c: teach append_signoff how to detect duplicate s-o-b Brandon Casey
2013-01-28  3:08   ` Jonathan Nieder
2013-01-28  3:14   ` Jonathan Nieder
2013-02-10 23:36     ` Brandon Casey
2013-01-28  1:11 ` [PATCH v3 08/11] sequencer.c: teach append_signoff to avoid adding a duplicate newline Brandon Casey
2013-01-28  3:23   ` Jonathan Nieder
2013-01-28  1:11 ` [PATCH v3 09/11] t4014: more tests about appending s-o-b lines Brandon Casey
2013-01-28  3:31   ` Jonathan Nieder
2013-01-28  5:42     ` Junio C Hamano
2013-01-28  5:51       ` Junio C Hamano
2013-01-28  1:11 ` [PATCH v3 10/11] format-patch: update append_signoff prototype Brandon Casey
2013-01-28  3:35   ` Jonathan Nieder
2013-01-28  1:11 ` [PATCH v3 11/11] Unify appending signoff in format-patch, commit and sequencer Brandon Casey
2013-01-28  3:39   ` Jonathan Nieder
2013-02-10 23:55     ` Brandon Casey
2013-02-11  9:00       ` Jonathan Nieder
2013-02-11 18:49         ` Brandon Casey
2013-01-28  3:48 ` [PATCH v3 00/11] unify appending of sob Jonathan Nieder
2013-01-28  5:49   ` Junio C Hamano
2013-01-30 17:37     ` Junio C Hamano
2013-01-31 18:45       ` Brandon Casey

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=1359335515-13818-2-git-send-email-drafnel@gmail.com \
    --to=drafnel@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    --cc=pclouds@gmail.com \
    /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).