*
* Libmemcached library
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/
* Copyright (C) 2006-2009 Brian Aker All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#include <libmemcached/common.h>
-char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length,
+char *memcached_fetch(memcached_st *shell, char *key, size_t *key_length,
size_t *value_length,
uint32_t *flags,
memcached_return_t *error)
{
- memcached_result_st *result_buffer= &ptr->result;
+ Memcached* ptr= memcached2Memcached(shell);
memcached_return_t unused;
if (error == NULL)
{
return NULL;
}
+ memcached_result_st *result_buffer= &ptr->result;
result_buffer= memcached_fetch_result(ptr, result_buffer, error);
if (result_buffer == NULL or memcached_failed(*error))
{
memcached_return_t *error)
{
memcached_return_t unused;
- if (not error)
+ if (error == NULL)
+ {
error= &unused;
+ }
- if (not ptr)
+ if (ptr == NULL)
{
*error= MEMCACHED_INVALID_ARGUMENTS;
return NULL;
// create one.
if (memcached_is_initialized(&ptr->result))
{
- if (not (result= memcached_result_create(ptr, NULL)))
+ if ((result= memcached_result_create(ptr, NULL)) == NULL)
{
*error= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
return NULL;
}
*error= MEMCACHED_MAXIMUM_RETURN; // We use this to see if we ever go into the loop
- memcached_server_st *server;
- while ((server= memcached_io_get_readable_server(ptr)))
+ memcached_instance_st *server;
+ memcached_return_t read_ret= MEMCACHED_SUCCESS;
+ while ((server= memcached_io_get_readable_server(ptr, read_ret)))
{
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
*error= memcached_response(server, buffer, sizeof(buffer), result);
return NULL;
}
-memcached_return_t memcached_fetch_execute(memcached_st *ptr,
+memcached_return_t memcached_fetch_execute(memcached_st *shell,
memcached_execute_fn *callback,
void *context,
uint32_t number_of_callbacks)
{
+ Memcached* ptr= memcached2Memcached(shell);
memcached_result_st *result= &ptr->result;
memcached_return_t rc;
bool some_errors= false;