char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length,
size_t *value_length,
uint32_t *flags,
- memcached_return *error)
+ memcached_return_t *error)
{
memcached_result_st *result_buffer= &ptr->result;
- unlikely (ptr->flags & MEM_USE_UDP)
+ unlikely (ptr->flags.use_udp)
{
*error= MEMCACHED_NOT_SUPPORTED;
return NULL;
memcached_result_st *memcached_fetch_result(memcached_st *ptr,
memcached_result_st *result,
- memcached_return *error)
+ memcached_return_t *error)
{
memcached_server_st *server;
- unlikely (ptr->flags & MEM_USE_UDP)
+ unlikely (ptr->flags.use_udp)
{
*error= MEMCACHED_NOT_SUPPORTED;
return NULL;
return result;
else if (*error == MEMCACHED_END)
memcached_server_response_reset(server);
- else
+ else if (*error != MEMCACHED_NOTFOUND)
break;
}
/* We have completed reading data */
- if (result->is_allocated)
+ if (memcached_is_allocated(result))
+ {
memcached_result_free(result);
+ }
else
+ {
memcached_string_reset(&result->value);
+ }
return NULL;
}
-memcached_return memcached_fetch_execute(memcached_st *ptr,
- memcached_execute_function *callback,
- void *context,
- unsigned int number_of_callbacks)
+memcached_return_t memcached_fetch_execute(memcached_st *ptr,
+ memcached_execute_fn *callback,
+ void *context,
+ uint32_t number_of_callbacks)
{
memcached_result_st *result= &ptr->result;
- memcached_return rc= MEMCACHED_FAILURE;
+ memcached_return_t rc= MEMCACHED_FAILURE;
unsigned int x;
- while ((result= memcached_fetch_result(ptr, result, &rc)) != NULL) {
+ while ((result= memcached_fetch_result(ptr, result, &rc)) != NULL)
+ {
if (rc == MEMCACHED_SUCCESS)
{
for (x= 0; x < number_of_callbacks; x++)