Abstraction (which will save us merge hell with 1.2).

[awesomized/libmemcached] / libmemcached / storage.cc

diff --git a/libmemcached/storage.cc b/libmemcached/storage.cc
index e17b7609d5a5ac4ddb34fbd9ae019d091069167f..558d2ed529904a3197c208fd579c3dbf57ffabc8 100644 (file)
--- a/libmemcached/storage.cc
+++ b/libmemcached/storage.cc
@@ -138,7 +138,7 @@ static inline uint8_t get_com_code(const memcached_storage_action_t verb, const
   return PROTOCOL_BINARY_CMD_SET;
 }
 
-static memcached_return_t memcached_send_binary(memcached_st *ptr,
+static memcached_return_t memcached_send_binary(Memcached *ptr,
                                                 org::libmemcached::Instance* server,
                                                 uint32_t server_key,
                                                 const char *key,
@@ -245,7 +245,7 @@ static memcached_return_t memcached_send_binary(memcached_st *ptr,
   return memcached_response(server, NULL, 0, NULL);
 }
 
-static memcached_return_t memcached_send_ascii(memcached_st *ptr,
+static memcached_return_t memcached_send_ascii(Memcached *ptr,
                                                org::libmemcached::Instance* instance,
                                                const char *key,
                                                const size_t key_length,
@@ -351,7 +351,7 @@ static memcached_return_t memcached_send_ascii(memcached_st *ptr,
   return rc;
 }
 
-static inline memcached_return_t memcached_send(memcached_st *ptr,
+static inline memcached_return_t memcached_send(memcached_st *shell,
                                                 const char *group_key, size_t group_key_length,
                                                 const char *key, size_t key_length,
                                                 const char *value, size_t value_length,
@@ -360,6 +360,7 @@ static inline memcached_return_t memcached_send(memcached_st *ptr,
                                                 const uint64_t cas,
                                                 memcached_storage_action_t verb)
 {
+  Memcached* ptr= memcached2Memcached(shell);
   memcached_return_t rc;
   if (memcached_failed(rc= initialize_query(ptr, true)))
   {