Fix allocation on stat so that it uses malloc() since a user will need to use free...

diff --git a/libmemcached/connect.cc b/libmemcached/connect.cc
index fa4b7317c02ad4324f9b46711418fc312e9388fb..b59c0ecbbf781a4a2a1b37668c2b8c039c892f64 100644 (file)
--- a/libmemcached/connect.cc
+++ b/libmemcached/connect.cc
@@ -631,6 +631,9 @@ static memcached_return_t network_connect(org::libmemcached::Instance* server)
       server->fd= INVALID_SOCKET;
       continue;
 
+    case ECONNREFUSED:
+      // Probably not running service
+
     default:
       break;
     }
@@ -830,16 +833,6 @@ static memcached_return_t _memcached_connect(org::libmemcached::Instance* server
   return rc;
 }
 
-memcached_return_t memcached_connect_try(org::libmemcached::Instance* server)
-{
-  if (server and server->root and server->root->state.is_parsing)
-  {
-    return MEMCACHED_SUCCESS;
-  }
-
-  return _memcached_connect(server, false);
-}
-
 memcached_return_t memcached_connect(org::libmemcached::Instance* server)
 {
   return _memcached_connect(server, true);

diff --git a/libmemcached/connect.hpp b/libmemcached/connect.hpp
index 964195130e49950e7e6c19e2fe32b529ff864b7d..de1c8df57a5a2abe55a96a149bb5e12329575f5e 100644 (file)
--- a/libmemcached/connect.hpp
+++ b/libmemcached/connect.hpp
@@ -37,6 +37,4 @@
 
 #pragma once
 
-memcached_return_t memcached_connect_try(org::libmemcached::Instance*);
 memcached_return_t memcached_connect(org::libmemcached::Instance*);
-

diff --git a/libmemcached/instance.cc b/libmemcached/instance.cc
index ed840e55b31bdea89e77f288b8db8607b555f55d..50d6388ef884587da588532f6df46ba3b8a6f17f 100644 (file)
--- a/libmemcached/instance.cc
+++ b/libmemcached/instance.cc
@@ -160,11 +160,6 @@ org::libmemcached::Instance* __instance_create_with(memcached_st *memc,
     memcached_io_init_udp_header(self, 0);
   }
 
-  if (memc)
-  {
-    memcached_connect_try(self);
-  }
-
   return self;
 }
 

diff --git a/libmemcached/stats.cc b/libmemcached/stats.cc
index 434949485620a095834847f82353b1234b48e7a7..eb3376802664956d50af89f060b8372b5e5bca47 100644 (file)
--- a/libmemcached/stats.cc
+++ b/libmemcached/stats.cc
@@ -232,7 +232,6 @@ char *memcached_stat_get_value(const memcached_st *ptr, memcached_stat_st *memc_
 {
   char buffer[SMALL_STRING_LEN];
   int length;
-  char *ret;
 
   *error= MEMCACHED_SUCCESS;
 
@@ -336,7 +335,8 @@ char *memcached_stat_get_value(const memcached_st *ptr, memcached_stat_st *memc_
     return NULL;
   }
 
-  ret= static_cast<char *>(libmemcached_malloc(ptr, (size_t) (length + 1)));
+  // User is responsible for free() memory, so use malloc()
+  char *ret= static_cast<char *>(malloc(size_t(length +1)));
   memcpy(ret, buffer, (size_t) length);
   ret[length]= '\0';