Refactor: memcached_io_read should return memcached_return error codes

[awesomized/libmemcached] / libmemcached / memcached_response.c

diff --git a/libmemcached/memcached_response.c b/libmemcached/memcached_response.c
index 554169300fa61a279029d903a7359bb2a16a62c4..845052db865d3e058b791a4ffe5f0ffe58779d76 100644 (file)
--- a/libmemcached/memcached_response.c
+++ b/libmemcached/memcached_response.c
@@ -80,7 +80,6 @@ static memcached_return textual_value_fetch(memcached_server_st *ptr,
   char *end_ptr;
   char *next_ptr;
   size_t value_length;
-  size_t read_length;
   size_t to_read;
   char *value_ptr;
 
@@ -167,7 +166,6 @@ static memcached_return textual_value_fetch(memcached_server_st *ptr,
   }
 
   value_ptr= memcached_string_value(&result->value);
-  read_length= 0;
   /* 
     We read the \r\n into the string since not doing so is more 
     cycles then the waster of memory to do so.
@@ -176,7 +174,11 @@ static memcached_return textual_value_fetch(memcached_server_st *ptr,
     some people lazy about using the return length.
   */
   to_read= (value_length) + 2;
-  read_length= memcached_io_read(ptr, value_ptr, to_read);
+  ssize_t read_length= 0;
+  memcached_return rrc= memcached_io_read(ptr, value_ptr, to_read, &read_length);
+  if (rrc != MEMCACHED_SUCCESS)
+    return rrc;
+
   if (read_length != (size_t)(value_length + 2))
   {
     goto read_error;