git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 2/2] Git/Packet.pm: use 'if' instead of 'unless'

From
Christian Couder <christian.couder@gmail.com>
Date
Nov 21, 2017, 16:09 UTC
Message-ID
<20171121160939.22962-2-chriscool@tuxfamily.org>
In-Reply-To
<20171121160939.22962-1-chriscool@tuxfamily.org>
The code is more understandable with 'if' instead of 'unless'.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 perl/Git/Packet.pm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/perl/Git/Packet.pm b/perl/Git/Packet.pm
index 82da0cf0db..1682403ffc 100644
--- a/perl/Git/Packet.pm
+++ b/perl/Git/Packet.pm
@@ -68,16 +68,16 @@ sub packet_bin_read {
 
 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'";
+	if ( $buf =~ s/\n$// ) {
+		return $buf;
 	}
-	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();
-	unless ( $res == -1 or $buf eq '' ) {
+	if ( $res != -1 and $buf ne '' ) {
 		$buf = remove_final_lf_or_die($buf);
 	}
 	return ( $res, $buf );
@@ -87,10 +87,10 @@ sub packet_txt_read {
 sub packet_key_val_read {
 	my ( $key ) = @_;
 	my ( $res, $buf ) = packet_txt_read();
-	unless ( $res == -1 or ( $buf =~ s/^$key=// and $buf ne '' ) ) {
-		die "bad $key: '$buf'";
+	if ( $res == -1 or ( $buf =~ s/^$key=// and $buf ne '' ) ) {
+		return ( $res, $buf );
 	}
-	return ( $res, $buf );
+	die "bad $key: '$buf'";
 }
 
 sub packet_bin_write {
-- 
2.15.0.318.g4f69657937
Previous: Christian CouderNext: Jonathan Nieder
Message 2 of 11 in “Git/Packet.pm: rename packet_required_key_val_read()”
  1. 1/2 Git/Packet.pm: rename packet_required_key_val_read()Christian Couder, Nov 21, 2017
  2. 2/2 Git/Packet.pm: use 'if' instead of 'unless'Christian Couder, Nov 21, 2017
  3. Jonathan NiederNov 21, 2017
  4. Junio C HamanoNov 22, 2017
  5. Jonathan NiederNov 21, 2017
  6. Junio C HamanoNov 22, 2017
  7. Jonathan NiederNov 22, 2017
  8. Junio C HamanoNov 22, 2017
  9. Jonathan NiederNov 22, 2017
  10. Christian CouderNov 22, 2017
  11. Junio C HamanoNov 22, 2017

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.