X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fcommon.h;h=7abeefd773be66b696d942dee281a8faf7de4a3f;hb=baf931721d1b37ac06ea5126ac038cca2d413d91;hp=40787d3863ea1ab4ce7f466f199ba361dbb66cb2;hpb=b0e52309fcc12077506ff7d0d7d55311d64a073e;p=m6w6%2Flibmemcached diff --git a/libmemcached/common.h b/libmemcached/common.h index 40787d38..7abeefd7 100644 --- a/libmemcached/common.h +++ b/libmemcached/common.h @@ -76,7 +76,8 @@ typedef enum { MEM_KETAMA_WEIGHTED= (1 << 11), MEM_BINARY_PROTOCOL= (1 << 12), MEM_HASH_WITH_PREFIX_KEY= (1 << 13), - MEM_NOREPLY= (1 << 14) + MEM_NOREPLY= (1 << 14), + MEM_USE_UDP= (1 << 15) } memcached_flags; /* Hashing algo */ @@ -106,18 +107,18 @@ 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); -uint32_t generate_hash_value(const char *key, size_t key_length, memcached_hash hash_algorithm); - uint32_t generate_hash(memcached_st *ptr, const char *key, size_t key_length); memcached_return memcached_server_remove(memcached_server_st *st_ptr); +#ifndef HAVE_HTONLL extern uint64_t ntohll(uint64_t); extern uint64_t htonll(uint64_t); +#endif memcached_return memcached_purge(memcached_server_st *ptr); @@ -133,7 +134,7 @@ static inline memcached_return memcached_validate_key_length(size_t key_length, } else { - unlikely (key_length > 250) + unlikely (key_length >= MEMCACHED_MAX_KEY) return MEMCACHED_BAD_KEY_PROVIDED; }