[libhijk-perl] 02/06: remove a few variables that are used only once.

[Robin Sheat]

This is an automated email from the git hooks/post-receive script.

eythian-guest pushed a commit to annotated tag 0.18
in repository libhijk-perl.

commit fb5280f2c6c4d53a39e48889592a38650b96ba68
Author: Kang-min Liu <gugod at gugod.org>
Date:   Thu Sep 25 22:11:05 2014 +0200

    remove a few variables that are used only once.
---
 lib/Hijk.pm | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/lib/Hijk.pm b/lib/Hijk.pm
index 2305169..87218bd 100644
--- a/lib/Hijk.pm
+++ b/lib/Hijk.pm
@@ -18,14 +18,10 @@ sub Hijk::Error::RESPONSE_READ_ERROR     () { 1 << 5 } # 32
 sub Hijk::Error::RESPONSE_BAD_READ_VALUE () { 1 << 6 } # 64
 sub Hijk::Error::RESPONSE_ERROR          () { Hijk::Error::RESPONSE_READ_ERROR | Hijk::Error::RESPONSE_BAD_READ_VALUE } # 96
 
-sub _selectable_timeout {
-    my $t = shift;
-    return defined($t) && $t <=0 ? undef : $t;
-}
-
 sub _read_http_message {
     my ($fd, $read_length, $read_timeout, $parse_chunked, $head_as_array) = @_;
-    $read_timeout = _selectable_timeout($read_timeout);
+    $read_timeout = undef if defined($read_timeout) && $read_timeout <= 0;
+
     my ($body,$buf,$decapitated,$nbytes,$proto);
     my $status_code = 0;
     my $header = $head_as_array ? [] : {};
@@ -33,9 +29,8 @@ sub _read_http_message {
     my $head = "";
     vec(my $rin = '', $fd, 1) = 1;
     do {
-        my $nfound = select($rin, undef, undef, $read_timeout);
         return (undef,undef,0,undef,undef, Hijk::Error::READ_TIMEOUT)
-            if ($nfound != 1 || (defined($read_timeout) && $read_timeout <= 0));
+            if ((select($rin, undef, undef, $read_timeout) != 1) || (defined($read_timeout) && $read_timeout <= 0));
 
         my $nbytes = POSIX::read($fd, $buf, $read_length);
         return ($proto, undef, $status_code, $header, $body)
@@ -142,9 +137,8 @@ sub _read_chunked_body {
     while(1) {
         # just read a 10k block and process it until it is consumed
         if (length($buf) == 0 || length($buf) < $chunk_size) {
-            my $nfound = select($rin, undef, undef, $read_timeout);
             return (undef, Hijk::Error::READ_TIMEOUT)
-                if ($nfound != 1 || (defined($read_timeout) && $read_timeout <= 0));
+                if ((select($rin, undef, undef, $read_timeout) != 1) || (defined($read_timeout) && $read_timeout <= 0));
             my $current_buf = "";
             my $nbytes = POSIX::read($fd, $current_buf, $read_length);
             if (!defined($nbytes)) {
@@ -238,10 +232,9 @@ sub _construct_socket {
         die "Failed to connect $!";
     }
 
-    $connect_timeout = _selectable_timeout( $connect_timeout );
+    $connect_timeout = undef if defined($connect_timeout) && $connect_timeout <= 0;
     vec(my $rout = '', fileno($soc), 1) = 1;
-    my $nfound = select(undef, $rout, undef, $connect_timeout);
-    if ($nfound != 1) {
+    if (select(undef, $rout, undef, $connect_timeout) != 1) {
         if (defined($connect_timeout)) {
             return (undef, {error => Hijk::Error::CONNECT_TIMEOUT});
         } else {
@@ -318,9 +311,7 @@ sub request {
 
     vec(my $rout = '', fileno($soc), 1) = 1;
     while ($left > 0) {
-        my $nfound = select(undef, $rout, undef, undef);
-
-        if ($nfound != 1) {
+        if (select(undef, $rout, undef, undef) != 1) {
             delete $args->{socket_cache}->{$cache_key} if defined $cache_key;
             return {
                 error         => Hijk::Error::REQUEST_SELECT_ERROR,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libhijk-perl.git