diff options
| author | Christian Couder <christian.couder@gmail.com> | 2017-11-21 17:09:38 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-22 16:23:55 +0900 |
| commit | cb1c64b4a8eeda9bc576063c3c9eea34d5693560 (patch) | |
| tree | 51b90350cf751db8a166edf050405172b23e1fd8 /perl | |
| parent | 0fe8d516bb70c675fc9cea9339247b01f7e96cad (diff) | |
| download | git-cb1c64b4a8eeda9bc576063c3c9eea34d5693560.tar.gz git-cb1c64b4a8eeda9bc576063c3c9eea34d5693560.tar.xz | |
Git/Packet: clarify that packet_required_key_val_read allows EOF
The function calls itself "required", but it does not die when it
sees an unexpected EOF.
Let's rename it to "packet_key_val_read()".
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'perl')
| -rw-r--r-- | perl/Git/Packet.pm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/perl/Git/Packet.pm b/perl/Git/Packet.pm index 255b28c09..14dd06d1d 100644 --- a/perl/Git/Packet.pm +++ b/perl/Git/Packet.pm @@ -17,7 +17,7 @@ our @EXPORT = qw( packet_compare_lists packet_bin_read packet_txt_read - packet_required_key_val_read + packet_key_val_read packet_bin_write packet_txt_write packet_flush @@ -83,7 +83,12 @@ sub packet_txt_read { return ( $res, $buf ); } -sub packet_required_key_val_read { +# Read a text packet, expecting that it is in the form "key=value" for +# the given $key. An EOF does not trigger any error and is reported +# back to the caller (like packet_txt_read() does). Die if the "key" +# part of "key=value" does not match the given $key, or the value part +# is empty. +sub packet_key_val_read { my ( $key ) = @_; my ( $res, $buf ) = packet_txt_read(); unless ( $res == -1 or ( $buf =~ s/^$key=// and $buf ne '' ) ) { |