Refactor: memcachd_key_test -> memcached_key_test

diff --git a/libmemcached/common.h b/libmemcached/common.h
index b7a657092842dd2f9579456591ecce6e509ff387..7abeefd773be66b696d942dee281a8faf7de4a3f 100644 (file)
--- a/libmemcached/common.h
+++ b/libmemcached/common.h
@@ -107,8 +107,8 @@ memcached_return value_fetch(memcached_server_st *ptr,
                              memcached_result_st *result);
 void server_list_free(memcached_st *ptr, memcached_server_st *servers);
 
-memcached_return memcachd_key_test(char **keys, size_t *key_length,
-                                   unsigned int number_of_keys);
+memcached_return memcached_key_test(char **keys, size_t *key_length,
+                                    unsigned int number_of_keys);
 
 memcached_return run_distribution(memcached_st *ptr);
 

diff --git a/libmemcached/memcached_auto.c b/libmemcached/memcached_auto.c
index 787ef6875213b57147566ef60dae26308e8ea390..ade0b59b98e6d632ebe6e994361bd1138327dae4 100644 (file)
--- a/libmemcached/memcached_auto.c
+++ b/libmemcached/memcached_auto.c
@@ -15,7 +15,7 @@ static memcached_return memcached_auto(memcached_st *ptr,
   unlikely (ptr->hosts == NULL || ptr->number_of_hosts == 0)
     return MEMCACHED_NO_SERVERS;
 
-  if ((ptr->flags & MEM_VERIFY_KEY) && (memcachd_key_test((char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
+  if ((ptr->flags & MEM_VERIFY_KEY) && (memcached_key_test((char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
     return MEMCACHED_BAD_KEY_PROVIDED;
 
   server_key= memcached_generate_hash(ptr, key, key_length);

diff --git a/libmemcached/memcached_callback.c b/libmemcached/memcached_callback.c
index d1c042429b4d5fd4569a98a649f0ede6f2ac957f..bcae1a720cf6acbf69f2bcd325f1ea37bbcb8989 100644 (file)
--- a/libmemcached/memcached_callback.c
+++ b/libmemcached/memcached_callback.c
@@ -21,7 +21,7 @@ memcached_return memcached_callback_set(memcached_st *ptr,
       {
         size_t key_length= strlen(key);
 
-        if (memcachd_key_test((char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED)
+        if (memcached_key_test((char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED)
         {
           return MEMCACHED_BAD_KEY_PROVIDED;
         }

diff --git a/libmemcached/memcached_get.c b/libmemcached/memcached_get.c
index 2de7acbdbc7bde3eac8cd2399031c81cab7057c3..9688286450d508392b5cfc9b31b9e7a6ba097833 100644 (file)
--- a/libmemcached/memcached_get.c
+++ b/libmemcached/memcached_get.c
@@ -138,7 +138,7 @@ memcached_return memcached_mget_by_key(memcached_st *ptr,
   if (ptr->number_of_hosts == 0)
     return MEMCACHED_NO_SERVERS;
 
-  if ((ptr->flags & MEM_VERIFY_KEY) && (memcachd_key_test(keys, key_length, number_of_keys) == MEMCACHED_BAD_KEY_PROVIDED))
+  if ((ptr->flags & MEM_VERIFY_KEY) && (memcached_key_test(keys, key_length, number_of_keys) == MEMCACHED_BAD_KEY_PROVIDED))
     return MEMCACHED_BAD_KEY_PROVIDED;
 
   if (ptr->flags & MEM_SUPPORT_CAS)
@@ -149,7 +149,7 @@ memcached_return memcached_mget_by_key(memcached_st *ptr,
 
   if (master_key && master_key_length)
   {
-    if ((ptr->flags & MEM_VERIFY_KEY) && (memcachd_key_test((char **)&master_key, &master_key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
+    if ((ptr->flags & MEM_VERIFY_KEY) && (memcached_key_test((char **)&master_key, &master_key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
       return MEMCACHED_BAD_KEY_PROVIDED;
     master_server_key= memcached_generate_hash(ptr, master_key, master_key_length);
   }

diff --git a/libmemcached/memcached_key.c b/libmemcached/memcached_key.c
index 738dff8787d4e96739d29e468be2f311e6da8b8a..bbbd940dbee3c0add01ea38a9fdd69c8517afd7f 100644 (file)
--- a/libmemcached/memcached_key.c
+++ b/libmemcached/memcached_key.c
@@ -1,7 +1,7 @@
 #include "common.h"
 
-memcached_return memcachd_key_test(char **keys, size_t *key_length, 
-                                   unsigned int number_of_keys)
+memcached_return memcached_key_test(char **keys, size_t *key_length, 
+                                    unsigned int number_of_keys)
 {
   uint32_t x;
   memcached_return rc;

diff --git a/libmemcached/memcached_server.c b/libmemcached/memcached_server.c
index 38d810481175e11affc5974e71bdb90f5176323a..4aebfd3b7367506dfb030cb64794226fd56d2b29 100644 (file)
--- a/libmemcached/memcached_server.c
+++ b/libmemcached/memcached_server.c
@@ -126,7 +126,7 @@ memcached_server_st *memcached_server_by_key(memcached_st *ptr,  const char *key
     return NULL;
   }
 
-  if ((ptr->flags & MEM_VERIFY_KEY) && (memcachd_key_test((char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
+  if ((ptr->flags & MEM_VERIFY_KEY) && (memcached_key_test((char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
   {
     *error= MEMCACHED_BAD_KEY_PROVIDED;
     return NULL;

diff --git a/libmemcached/memcached_storage.c b/libmemcached/memcached_storage.c
index 0243de5055d6d8f2a10f65b64df40bd1e5b16ec3..ea8b1d249b98d5d1189d4d151bf5191120f3f5b6 100644 (file)
--- a/libmemcached/memcached_storage.c
+++ b/libmemcached/memcached_storage.c
@@ -77,7 +77,7 @@ static inline memcached_return memcached_send(memcached_st *ptr,
   unlikely (ptr->number_of_hosts == 0)
     return MEMCACHED_NO_SERVERS;
 
-  if ((ptr->flags & MEM_VERIFY_KEY) && (memcachd_key_test((char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
+  if ((ptr->flags & MEM_VERIFY_KEY) && (memcached_key_test((char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
     return MEMCACHED_BAD_KEY_PROVIDED;
 
   server_key= memcached_generate_hash(ptr, master_key, master_key_length);