+/* LibMemcached
+ * Copyright (C) 2006-2009 Brian Aker
+ * All rights reserved.
+ *
+ * Use and distribution licensed under the BSD license. See
+ * the COPYING file in the parent directory for full text.
+ *
+ * Summary: String structure used for libmemcached.
+ *
+ */
+
/*
This is a partial implementation for fetching/creating memcached_server_st objects.
*/
if (!ptr)
return NULL; /* MEMCACHED_MEMORY_ALLOCATION_FAILURE */
- ptr->is_allocated= true;
+ ptr->options.is_allocated= true;
}
else
+ {
memset(ptr, 0, sizeof(memcached_server_st));
-
+ }
+
ptr->root= memc;
return ptr;
}
-memcached_server_st *memcached_server_create_with(memcached_st *memc, memcached_server_st *host,
- const char *hostname, unsigned int port,
- uint32_t weight, memcached_connection type)
+memcached_server_st *memcached_server_create_with(memcached_st *memc, memcached_server_st *host,
+ const char *hostname, in_port_t port,
+ uint32_t weight, memcached_connection_t type)
{
host= memcached_server_create(memc, host);
memcached_quit_server(ptr, 0);
if (ptr->cached_server_error)
- {
free(ptr->cached_server_error);
- ptr->cached_server_error= NULL;
- }
if (ptr->address_info)
- {
freeaddrinfo(ptr->address_info);
- ptr->address_info= NULL;
- }
- if (ptr->is_allocated)
+
+ if (memcached_is_allocated(ptr))
+ {
ptr->root->call_free(ptr->root, ptr);
+ }
else
+ {
memset(ptr, 0, sizeof(memcached_server_st));
+ }
}
/*
*/
memcached_server_st *memcached_server_clone(memcached_server_st *clone, memcached_server_st *ptr)
{
- memcached_server_st *rv = NULL;
+ memcached_server_st *rv= NULL;
/* We just do a normal create if ptr is missing */
if (ptr == NULL)
return NULL;
- rv = memcached_server_create_with(ptr->root, clone,
+ rv = memcached_server_create_with(ptr->root, clone,
ptr->hostname, ptr->port, ptr->weight,
ptr->type);
if (rv != NULL)
}
-memcached_return memcached_server_cursor(memcached_st *ptr,
- memcached_server_function *callback,
- void *context,
- unsigned int number_of_callbacks)
+memcached_return_t memcached_server_cursor(memcached_st *ptr,
+ memcached_server_fn *callback,
+ void *context,
+ uint32_t number_of_callbacks)
{
unsigned int y;
return MEMCACHED_SUCCESS;
}
-memcached_server_st *memcached_server_by_key(memcached_st *ptr, const char *key, size_t key_length, memcached_return *error)
+memcached_server_st *memcached_server_by_key(memcached_st *ptr, const char *key, size_t key_length, memcached_return_t *error)
{
uint32_t server_key;
- *error= memcached_validate_key_length(key_length,
- ptr->flags & MEM_BINARY_PROTOCOL);
+ *error= memcached_validate_key_length(key_length,
+ ptr->flags.binary_protocol);
unlikely (*error != MEMCACHED_SUCCESS)
return NULL;
return NULL;
}
- if ((ptr->flags & MEM_VERIFY_KEY) && (memcached_key_test((char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
+ if (ptr->flags.verify_key && (memcached_key_test((const char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
{
*error= MEMCACHED_BAD_KEY_PROVIDED;
return NULL;
return memcached_server_clone(NULL, &ptr->hosts[server_key]);
}
+
+const char *memcached_server_error(memcached_server_st *ptr)
+{
+ if (ptr)
+ return ptr->cached_server_error;
+ else
+ return NULL;
+}
+
+void memcached_server_error_reset(memcached_server_st *ptr)
+{
+ ptr->cached_server_error[0]= 0;
+}
+
+memcached_server_st *memcached_server_get_last_disconnect(memcached_st *ptr)
+{
+ return ptr->last_disconnected_server;
+}