X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.cc;h=f35e7cc90a0834e95cc13c29ddeec20134e0bec5;hb=7abcaebdc4c3dd11b779eaef58a7371fb82ae888;hp=f2e8993b5f57200b25372a416890eb34af35fd4b;hpb=4924131d4d62d724d7e590cb2c5668ac5c8a3006;p=m6w6%2Flibmemcached

diff --git a/libmemcached/memcached.cc b/libmemcached/memcached.cc
index f2e8993b..f35e7cc9 100644
--- a/libmemcached/memcached.cc
+++ b/libmemcached/memcached.cc
@@ -36,6 +36,8 @@
  */
 
 #include <libmemcached/common.h>
+
+#include <libmemcached/options.hpp>
 #include <libmemcached/virtual_bucket.h>
 
 #if 0
@@ -161,7 +163,7 @@ static void _free(memcached_st *ptr, bool release_st)
   memcached_array_free(ptr->prefix_key);
   ptr->prefix_key= NULL;
 
-  memcached_error_free(ptr);
+  memcached_error_free(*ptr);
 
   if (ptr->sasl.callbacks)
   {
@@ -238,7 +240,7 @@ memcached_st *memcached(const char *string, size_t length)
 
   if (memcached_success(rc) and memcached_parse_filename(self))
   {
-    rc= memcached_parse_configure_file(self, memcached_parse_filename(self), memcached_parse_filename_length(self));
+    rc= memcached_parse_configure_file(*self, memcached_parse_filename(self), memcached_parse_filename_length(self));
   }
     
   if (memcached_failed(rc))
@@ -266,7 +268,7 @@ memcached_return_t memcached_reset(memcached_st *ptr)
 
   if (ptr->configure.filename)
   {
-    return memcached_parse_configure_file(ptr, memcached_param_array(ptr->configure.filename));
+    return memcached_parse_configure_file(*ptr, memcached_param_array(ptr->configure.filename));
   }
 
   return MEMCACHED_SUCCESS;
@@ -311,9 +313,8 @@ void memcached_free(memcached_st *ptr)
 memcached_st *memcached_clone(memcached_st *clone, const memcached_st *source)
 {
   memcached_return_t rc= MEMCACHED_SUCCESS;
-  memcached_st *new_clone;
 
-  if (source == NULL)
+  if (not source)
     return memcached_create(clone);
 
   if (clone && memcached_is_allocated(clone))
@@ -321,9 +322,9 @@ memcached_st *memcached_clone(memcached_st *clone, const memcached_st *source)
     return NULL;
   }
 
-  new_clone= memcached_create(clone);
+  memcached_st *new_clone= memcached_create(clone);
 
-  if (new_clone == NULL)
+  if (not new_clone)
     return NULL;
 
   new_clone->flags= source->flags;