From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
Ben Peart <Ben.Peart@microsoft.com>,
Jonathan Tan <jonathantanmy@google.com>,
Nguyen Thai Ngoc Duy <pclouds@gmail.com>,
Mike Hommey <mh@glandium.org>,
Lars Schneider <larsxschneider@gmail.com>,
Eric Wong <e@80x24.org>,
Christian Couder <chriscool@tuxfamily.org>
Subject: [PATCH v3 6/8] t0021/rot13-filter: refactor checking final lf
Date: Fri, 10 Nov 2017 14:21:58 +0100 [thread overview]
Message-ID: <20171110132200.7871-7-chriscool@tuxfamily.org> (raw)
In-Reply-To: <20171110132200.7871-1-chriscool@tuxfamily.org>
As checking for a lf character at the end of a buffer
will be useful in another function, let's refactor this
functionality into a small remove_final_lf_or_die()
helper function.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
t/t0021/rot13-filter.pl | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/t/t0021/rot13-filter.pl b/t/t0021/rot13-filter.pl
index 9e18be66b6..8f255b6131 100644
--- a/t/t0021/rot13-filter.pl
+++ b/t/t0021/rot13-filter.pl
@@ -93,15 +93,23 @@ sub packet_bin_read {
}
}
-sub packet_txt_read {
- my ( $res, $buf ) = packet_bin_read();
- if ( $res == -1 or $buf eq '' or $buf =~ s/\n$// ) {
- return ( $res, $buf );
+sub remove_final_lf_or_die {
+ my $buf = shift;
+ if ( $buf =~ s/\n$// ) {
+ return $buf;
}
die "A non-binary line MUST be terminated by an LF.\n"
. "Received: '$buf'";
}
+sub packet_txt_read {
+ my ( $res, $buf ) = packet_bin_read();
+ if ( $res != -1 and $buf ne '' ) {
+ $buf = remove_final_lf_or_die($buf);
+ }
+ return ( $res, $buf );
+}
+
# Read a text line and check that it is in the form "key=value"
sub packet_key_val_read {
my ( $key ) = @_;
--
2.15.0.132.g7ad97d78be
next prev parent reply other threads:[~2017-11-10 13:23 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-10 13:21 [PATCH v3 0/8] Create Git/Packet.pm Christian Couder
2017-11-10 13:21 ` [PATCH v3 1/8] t0021/rot13-filter: fix list comparison Christian Couder
2017-11-10 13:21 ` [PATCH v3 2/8] t0021/rot13-filter: refactor packet reading functions Christian Couder
2017-11-10 13:21 ` [PATCH v3 3/8] t0021/rot13-filter: improve 'if .. elsif .. else' style Christian Couder
2017-11-10 13:21 ` [PATCH v3 4/8] t0021/rot13-filter: improve error message Christian Couder
2017-11-10 13:21 ` [PATCH v3 5/8] t0021/rot13-filter: add packet_initialize() Christian Couder
2017-11-10 13:21 ` Christian Couder [this message]
2017-11-10 13:21 ` [PATCH v3 7/8] t0021/rot13-filter: add capability functions Christian Couder
2017-11-10 13:22 ` [PATCH v3 8/8] Add Git/Packet.pm from parts of t0021/rot13-filter.pl Christian Couder
2017-11-10 19:03 ` [PATCH v3 0/8] Create Git/Packet.pm Junio C Hamano
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=20171110132200.7871-7-chriscool@tuxfamily.org \
--to=christian.couder@gmail.com \
--cc=Ben.Peart@microsoft.com \
--cc=chriscool@tuxfamily.org \
--cc=e@80x24.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jonathantanmy@google.com \
--cc=larsxschneider@gmail.com \
--cc=mh@glandium.org \
--cc=pclouds@gmail.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).