From 97fa086c7ea61d12f86581325c22e69426dd25a2 Mon Sep 17 00:00:00 2001 From: Steve Yen Date: Sat, 21 Mar 2009 14:09:45 +0100 Subject: [PATCH 1/1] Refactor: memcachd_key_test -> memcached_key_test --- libmemcached/common.h | 4 ++-- libmemcached/memcached_auto.c | 2 +- libmemcached/memcached_callback.c | 2 +- libmemcached/memcached_get.c | 4 ++-- libmemcached/memcached_key.c | 4 ++-- libmemcached/memcached_server.c | 2 +- libmemcached/memcached_storage.c | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libmemcached/common.h b/libmemcached/common.h index b7a65709..7abeefd7 100644 --- 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 787ef687..ade0b59b 100644 --- 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 d1c04242..bcae1a72 100644 --- 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 2de7acbd..96882864 100644 --- 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 738dff87..bbbd940d 100644 --- 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 38d81048..4aebfd3b 100644 --- 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 0243de50..ea8b1d24 100644 --- 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); -- 2.30.2