[PATCH v2 6/8] t0021/rot13-filter: refactor checking final lf

From: Christian Couder <christian.couder@gmail.com>
Date: Nov 5, 2017, 21:38 UTC
Message-ID: <20171105213836.11717-7-chriscool@tuxfamily.org>
In-Reply-To: <20171105213836.11717-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 | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/t/t0021/rot13-filter.pl b/t/t0021/rot13-filter.pl
index 2f74ab2e45..d47b7f5666 100644
--- a/t/t0021/rot13-filter.pl
+++ b/t/t0021/rot13-filter.pl
@@ -93,12 +93,20 @@ sub packet_bin_read {
 	}
 }
 
-sub packet_txt_read {
-	my ( $res, $buf ) = packet_bin_read();
-	unless ( $res == -1 or $buf eq '' or $buf =~ s/\n$// ) {
+sub remove_final_lf_or_die {
+	my $buf = shift;
+	unless ( $buf =~ s/\n$// ) {
 		die "A non-binary line MUST be terminated by an LF.\n"
 		    . "Received: '$buf'";
 	}
+	return $buf;
+}
+
+sub packet_txt_read {
+	my ( $res, $buf ) = packet_bin_read();
+	unless ( $res == -1 or $buf eq '' ) {
+		$buf = remove_final_lf_or_die($buf);
+	}
 	return ( $res, $buf );
 }

-- 
2.15.0.7.ga9ff306ed9.dirty