X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fcommon.h;h=7abeefd773be66b696d942dee281a8faf7de4a3f;hb=baf931721d1b37ac06ea5126ac038cca2d413d91;hp=24d4cce82a7e96d6b5a6c91b67ac4457a32a05b3;hpb=a9d5b6c6db3a99ba92ef4b298702ecfbbd5145af;p=awesomized%2Flibmemcached

diff --git a/libmemcached/common.h b/libmemcached/common.h
index 24d4cce8..7abeefd7 100644
--- a/libmemcached/common.h
+++ b/libmemcached/common.h
@@ -39,7 +39,7 @@
 #include "memcached_io.h"
 
 #include "memcached/protocol_binary.h"
-#include <libmemcached_config.h>
+#include "libmemcached_config.h"
 
 #if !defined(__GNUC__) || (__GNUC__ == 2 && __GNUC_MINOR__ < 96)
 
@@ -52,13 +52,6 @@
 #define unlikely(x)     if(__builtin_expect((x), 0))
 #endif
 
-
-#ifdef HAVE_DTRACE
-#define _DTRACE_VERSION 1
-#else
-#undef _DTRACE_VERSION
-#endif
-
 #include "libmemcached_probes.h"
 
 #define MEMCACHED_BLOCK_SIZE 1024
@@ -81,7 +74,10 @@ typedef enum {
   MEM_VERIFY_KEY= (1 << 10),
   /* 11 used for weighted ketama */
   MEM_KETAMA_WEIGHTED= (1 << 11),
-  MEM_BINARY_PROTOCOL= (1 << 12)
+  MEM_BINARY_PROTOCOL= (1 << 12),
+  MEM_HASH_WITH_PREFIX_KEY= (1 << 13),
+  MEM_NOREPLY= (1 << 14),
+  MEM_USE_UDP= (1 << 15)
 } memcached_flags;
 
 /* Hashing algo */
@@ -111,21 +107,38 @@ 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
 
-void host_reset(memcached_st *ptr, memcached_server_st *host, 
-                char *hostname, unsigned int port,
-                memcached_connection type);
+memcached_return memcached_purge(memcached_server_st *ptr);
+
+static inline memcached_return memcached_validate_key_length(size_t key_length, 
+                                                             bool binary) {
+  unlikely (key_length == 0)
+    return MEMCACHED_BAD_KEY_PROVIDED;
+  
+  if (binary)
+  {
+    unlikely (key_length > 0xffff)
+      return MEMCACHED_BAD_KEY_PROVIDED;
+  }
+  else
+  {
+    unlikely (key_length >= MEMCACHED_MAX_KEY) 
+      return MEMCACHED_BAD_KEY_PROVIDED;
+  }
+
+  return MEMCACHED_SUCCESS;
+}
 
 #endif /* __COMMON_H__ */