Revert r114067, r114071, r114075, r114079, r114081, r114082, r114084, r114086, r11408...

[lhc/web/wiklou.git] / includes / objectcache / MemcachedClient.php

diff --git a/includes/objectcache/MemcachedClient.php b/includes/objectcache/MemcachedClient.php
index 4f49f7d..f8208f6 100644 (file)
--- a/includes/objectcache/MemcachedClient.php
+++ b/includes/objectcache/MemcachedClient.php
@@ -344,20 +344,11 @@ class MWMemcached {
                return false;
        }
 
-       /**
-        * @param $key
-        * @param $timeout int
-        * @return bool
-        */
        public function lock( $key, $timeout = 0 ) {
                /* stub */
                return true;
        }
 
-       /**
-        * @param $key
-        * @return bool
-        */
        public function unlock( $key ) {
                /* stub */
                return true;
@@ -480,7 +471,7 @@ class MWMemcached {
                        $this->stats['get_multi'] = 1;
                }
                $sock_keys = array();
-               $socks = array();
+
                foreach ( $keys as $key ) {
                        $sock = $this->get_sock( $key );
                        if ( !is_resource( $sock ) ) {
@@ -494,7 +485,6 @@ class MWMemcached {
                        $sock_keys[$sock][] = $key;
                }
 
-               $gather = array();
                // Send out the requests
                foreach ( $socks as $sock ) {
                        $cmd = 'get';
@@ -589,7 +579,6 @@ class MWMemcached {
                        return array();
                }
 
-               $ret = array();
                while ( true ) {
                        $res = fgets( $sock );
                        $ret[] = $res;
@@ -755,9 +744,6 @@ class MWMemcached {
                $this->_dead_host( $host );
        }
 
-       /**
-        * @param $host
-        */
        function _dead_host( $host ) {
                $parts = explode( ':', $host );
                $ip = $parts[0];
@@ -788,8 +774,8 @@ class MWMemcached {
                }
 
                $hv = is_array( $key ) ? intval( $key[0] ) : $this->_hashfunc( $key );
+
                if ( $this->_buckets === null ) {
-                       $bu = array();
                        foreach ( $this->_servers as $v ) {
                                if ( is_array( $v ) ) {
                                        for( $i = 0; $i < $v[1]; $i++ ) {
@@ -865,8 +851,7 @@ class MWMemcached {
                        $this->stats[$cmd] = 1;
                }
                if ( !$this->_safe_fwrite( $sock, "$cmd $key $amt\r\n" ) ) {
-                       $this->_dead_sock( $sock );
-                       return null;
+                       return $this->_dead_sock( $sock );
                }
 
                $line = fgets( $sock );
@@ -1013,8 +998,7 @@ class MWMemcached {
                        }
                }
                if ( !$this->_safe_fwrite( $sock, "$cmd $key $flags $exp $len\r\n$val\r\n" ) ) {
-                       $this->_dead_sock( $sock );
-                       return false;
+                       return $this->_dead_sock( $sock );
                }
 
                $line = trim( fgets( $sock ) );
@@ -1054,8 +1038,7 @@ class MWMemcached {
                }
 
                if ( !$this->_connect_sock( $sock, $host ) ) {
-                       $this->_dead_host( $host );
-                       return null;
+                       return $this->_dead_host( $host );
                }
 
                // Do not buffer writes
@@ -1066,9 +1049,6 @@ class MWMemcached {
                return $this->_cache_sock[$host];
        }
 
-       /**
-        * @param $str string
-        */
        function _debugprint( $str ) {
                print( $str );
        }
@@ -1100,9 +1080,6 @@ class MWMemcached {
 
        /**
         * Original behaviour
-        * @param $f
-        * @param $buf
-        * @param $len bool
         * @return int
         */
        function _safe_fwrite( $f, $buf, $len = false ) {
@@ -1116,7 +1093,6 @@ class MWMemcached {
 
        /**
         * Flush the read buffer of a stream
-        * @param $f Resource
         */
        function _flush_read_buffer( $f ) {
                if ( !is_resource( $f ) ) {