diff options
author | Brian Aker <brian@tangent.org> | 2011-07-01 09:49:58 -0700 |
---|---|---|
committer | Brian Aker <brian@tangent.org> | 2011-07-01 09:49:58 -0700 |
commit | 7abcaebdc4c3dd11b779eaef58a7371fb82ae888 (patch) | |
tree | d512d49eb50783e03f742bd06d8e23ff483180ce /libmemcached/response.cc | |
parent | 5a65c28db362c4d62419075c5c9e416fd855a9f9 (diff) | |
download | libmemcached-7abcaebdc4c3dd11b779eaef58a7371fb82ae888.tar.gz |
Updating test framework for startup/shutdown of memcached.
Diffstat (limited to 'libmemcached/response.cc')
-rw-r--r-- | libmemcached/response.cc | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/libmemcached/response.cc b/libmemcached/response.cc index 44ce840a..ce649bcb 100644 --- a/libmemcached/response.cc +++ b/libmemcached/response.cc @@ -218,7 +218,7 @@ static memcached_return_t textual_value_fetch(memcached_server_write_instance_st if (memcached_failed(rrc) and rrc == MEMCACHED_IN_PROGRESS) { memcached_quit_server(ptr, true); - return memcached_set_error(*ptr, rrc, MEMCACHED_AT); + return memcached_set_error(*ptr, MEMCACHED_IN_PROGRESS, MEMCACHED_AT); } else if (memcached_failed(rrc)) { @@ -291,28 +291,7 @@ static memcached_return_t textual_read_one_response(memcached_server_write_insta while (*endptr != '\r' && *endptr != '\n') endptr++; - /* - Yes, we could make this "efficent" but to do that we would need - to maintain more state for the size of the buffer. Why waste - memory in the struct, which is important, for something that - rarely should happen? - */ - char *rel_ptr= (char *)libmemcached_realloc(ptr->root, - ptr->cached_server_error, - (size_t) (endptr - startptr + 1)); - - if (rel_ptr == NULL) - { - /* If we happened to have some memory, we just null it since we don't know the size */ - if (ptr->cached_server_error) - ptr->cached_server_error[0]= 0; - return MEMCACHED_SERVER_ERROR; - } - ptr->cached_server_error= rel_ptr; - - memcpy(ptr->cached_server_error, startptr, (size_t) (endptr - startptr)); - ptr->cached_server_error[endptr - startptr]= 0; - return MEMCACHED_SERVER_ERROR; + return memcached_set_error(*ptr, MEMCACHED_SERVER_ERROR, MEMCACHED_AT, startptr, size_t(endptr - startptr)); } else if (buffer[1] == 'T') { |