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>
This commit is contained in:
parent
cb1c64b4a8
commit
4a543708cc
@ -68,16 +68,16 @@ sub packet_bin_read {
|
|||||||
|
|
||||||
sub remove_final_lf_or_die {
|
sub remove_final_lf_or_die {
|
||||||
my $buf = shift;
|
my $buf = shift;
|
||||||
unless ( $buf =~ s/\n$// ) {
|
if ( $buf =~ s/\n$// ) {
|
||||||
die "A non-binary line MUST be terminated by an LF.\n"
|
return $buf;
|
||||||
. "Received: '$buf'";
|
|
||||||
}
|
}
|
||||||
return $buf;
|
die "A non-binary line MUST be terminated by an LF.\n"
|
||||||
|
. "Received: '$buf'";
|
||||||
}
|
}
|
||||||
|
|
||||||
sub packet_txt_read {
|
sub packet_txt_read {
|
||||||
my ( $res, $buf ) = packet_bin_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);
|
$buf = remove_final_lf_or_die($buf);
|
||||||
}
|
}
|
||||||
return ( $res, $buf );
|
return ( $res, $buf );
|
||||||
@ -91,10 +91,10 @@ sub packet_txt_read {
|
|||||||
sub packet_key_val_read {
|
sub packet_key_val_read {
|
||||||
my ( $key ) = @_;
|
my ( $key ) = @_;
|
||||||
my ( $res, $buf ) = packet_txt_read();
|
my ( $res, $buf ) = packet_txt_read();
|
||||||
unless ( $res == -1 or ( $buf =~ s/^$key=// and $buf ne '' ) ) {
|
if ( $res == -1 or ( $buf =~ s/^$key=// and $buf ne '' ) ) {
|
||||||
die "bad $key: '$buf'";
|
return ( $res, $buf );
|
||||||
}
|
}
|
||||||
return ( $res, $buf );
|
die "bad $key: '$buf'";
|
||||||
}
|
}
|
||||||
|
|
||||||
sub packet_bin_write {
|
sub packet_bin_write {
|
||||||
|
Loading…
Reference in New Issue
Block a user