#include "common.h"
#include "memcached_io.h"
-memcached_return memcached_response(memcached_st *ptr,
+memcached_return memcached_response(memcached_server_st *ptr,
char *buffer, size_t buffer_length,
- memcached_result_st *result,
- unsigned int server_key)
+ memcached_result_st *result)
{
unsigned int x;
size_t send_length;
send_length= 0;
/* We may have old commands in the buffer not set, first purge */
- if (ptr->flags & MEM_NO_BLOCK)
- (void)memcached_io_write(ptr, server_key, NULL, 0, 1);
+ if (ptr->root->flags & MEM_NO_BLOCK)
+ (void)memcached_io_write(ptr, NULL, 0, 1);
- max_messages= memcached_server_response_count(ptr, server_key);
+ max_messages= memcached_server_response_count(ptr);
for (x= 0; x < max_messages; x++)
{
size_t total_length= 0;
{
unsigned int read_length;
- read_length= memcached_io_read(ptr, server_key,
- buffer_ptr, 1);
+ read_length= memcached_io_read(ptr, buffer_ptr, 1);
if (read_length != 1)
return MEMCACHED_UNKNOWN_READ_FAILURE;
buffer_ptr++;
*buffer_ptr= 0;
- memcached_server_response_decrement(ptr, server_key);
+ memcached_server_response_decrement(ptr);
}
switch(buffer[0])
memcached_return rc;
/* We add back in one because we will need to search for END */
- memcached_server_response_increment(ptr, server_key);
+ memcached_server_response_increment(ptr);
if (result)
- rc= value_fetch(ptr, buffer, result, server_key);
+ rc= value_fetch(ptr, buffer, result);
else
- rc= value_fetch(ptr, buffer, &ptr->result, server_key);
+ rc= value_fetch(ptr, buffer, &ptr->root->result);
return rc;
}
{
if (buffer[2] == 'A') /* STORED STATS */
{
- memcached_server_response_increment(ptr, server_key);
+ memcached_server_response_increment(ptr);
return MEMCACHED_STAT;
}
else if (buffer[1] == 'E')