diff options
author | Christian Couder <christian.couder@gmail.com> | 2017-11-21 17:09:39 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-11-22 16:23:55 +0900 |
commit | 4a543708cc1dd9bdc1e359078118a5279a2cfe11 (patch) | |
tree | ff22f6210a20ddfd78c7e24d457252b95acdf2d3 /perl/Git | |
parent | Git/Packet: clarify that packet_required_key_val_read allows EOF (diff) | |
download | tgif-4a543708cc1dd9bdc1e359078118a5279a2cfe11.tar.xz |
Git/Packet.pm: use 'if' instead of 'unless'
The code is more understandable with 'if' instead of 'unless'.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'perl/Git')
-rw-r--r-- | perl/Git/Packet.pm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/perl/Git/Packet.pm b/perl/Git/Packet.pm index 14dd06d1d4..b75738bed4 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 ); @@ -91,10 +91,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 { |