X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fcommon.h;h=e5dffe5b1567a206853a5335ef4fa04628b7bd4d;hb=adb3aa8ec1a70976f92cd05a8bab4174905d3005;hp=40787d3863ea1ab4ce7f466f199ba361dbb66cb2;hpb=b0e52309fcc12077506ff7d0d7d55311d64a073e;p=m6w6%2Flibmemcached

diff --git a/libmemcached/common.h b/libmemcached/common.h
index 40787d38..e5dffe5b 100644
--- a/libmemcached/common.h
+++ b/libmemcached/common.h
@@ -5,6 +5,8 @@
 #ifndef __COMMON_H__
 #define __COMMON_H__
 
+#include "libmemcached/libmemcached_config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -22,6 +24,12 @@
 #include <sys/un.h>
 #include <netinet/tcp.h>
 
+
+#include "libmemcached/memcached.h"
+#include "libmemcached/memcached_io.h"
+
+#include "libmemcached/memcached/protocol_binary.h"
+
 #ifdef TIME_WITH_SYS_TIME
 # include <sys/time.h>
 # include <time.h>
@@ -35,12 +43,6 @@
 
 
 
-#include <memcached.h>
-#include "memcached_io.h"
-
-#include "memcached/protocol_binary.h"
-#include "libmemcached_config.h"
-
 #if !defined(__GNUC__) || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
 
 #define likely(x)       if((x))
@@ -76,14 +78,18 @@ 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),
+  MEM_AUTO_EJECT_HOSTS= (1 << 16)
 } memcached_flags;
 
 /* Hashing algo */
 void md5_signature(const unsigned char *key, unsigned int length, unsigned char *result);
 uint32_t hash_crc32(const char *data,
                     size_t data_len);
+#ifdef HAVE_HSIEH_HASH
 uint32_t hsieh_hash(const char *key, size_t key_length);
+#endif
 uint32_t murmur_hash(const char *key, size_t key_length);
 uint32_t jenkins_hash(const void *key, size_t length, uint32_t initval);
 
@@ -106,18 +112,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 +139,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;
   }