.no_block= false,
.no_reply= false,
.randomize_replica_read= false,
- .reuse_memory= false,
.support_cas= false,
.tcp_nodelay= false,
.use_sort_hosts= false,
self->snd_timeout= 0;
self->rcv_timeout= 0;
self->server_failure_limit= 0;
+ self->query_id= 0;
/* TODO, Document why we picked these defaults */
self->io_msg_watermark= 500;
static void _free(memcached_st *ptr, bool release_st)
{
/* If we have anything open, lets close it now */
- memcached_quit(ptr);
+ send_quit(ptr);
memcached_server_list_free(memcached_server_list(ptr));
memcached_result_free(&ptr->result);
memcached_st *self= memcached_create(NULL);
if (! self)
+ {
+ errno= ENOMEM;
return NULL;
+ }
memcached_return_t rc;
- if ((rc= memcached_parse_configuration(self, string, length)) != MEMCACHED_SUCCESS)
+ rc= memcached_parse_configuration(self, string, length);
+
+ if (rc == MEMCACHED_SUCCESS && memcached_parse_filename(self))
{
- return self;
+ rc= memcached_parse_configure_file(self, memcached_parse_filename(self), memcached_parse_filename_length(self));
}
- if (memcached_parse_filename(self))
+
+ if (rc != MEMCACHED_SUCCESS)
{
- rc= memcached_parse_configure_file(self, memcached_parse_filename(self), memcached_parse_filename_length(self));
+ memcached_free(self);
+ errno= EINVAL;
+ return NULL;
}
+ errno= 0;
+
return self;
}
return MEMCACHED_INVALID_ARGUMENTS;
bool stored_is_allocated= memcached_is_allocated(ptr);
+ uint64_t query_id= ptr->query_id;
_free(ptr, false);
memcached_create(ptr);
memcached_set_allocated(ptr, stored_is_allocated);
+ ptr->query_id= query_id;
if (ptr->configure.filename)
{
void memcached_servers_reset(memcached_st *ptr)
{
+ if (! ptr)
+ return;
+
memcached_server_list_free(memcached_server_list(ptr));
memcached_server_list_set(ptr, NULL);
void memcached_reset_last_disconnected_server(memcached_st *ptr)
{
+ if (! ptr)
+ return;
+
if (ptr->last_disconnected_server)
{
memcached_server_free(ptr->last_disconnected_server);
void memcached_free(memcached_st *ptr)
{
+ if (! ptr)
+ return;
+
_free(ptr, true);
}