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>

diff --git a/perl/Git/Packet.pm b/perl/Git/Packet.pm
index 14dd06d1d4afde0dbf9a70251d49ae672e000c39..b75738bed4b52ac0085eb6a4919ba954d8fcfe98 100644 (file)
--- 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;
 
 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();
 }
 
 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 );
                $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();
 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 {
 }
 
 sub packet_bin_write {