X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fcommon.h;h=40787d3863ea1ab4ce7f466f199ba361dbb66cb2;hb=29c13aacae8a79791e8912ff7520601aa8136d83;hp=1b1b13c3c1ac4354a54a7e36def16d844ef355d5;hpb=b7f043ada7b39b3e9e244a7f6864a31cd08ad650;p=awesomized%2Flibmemcached

diff --git a/libmemcached/common.h b/libmemcached/common.h
index 1b1b13c3..40787d38 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
@@ -82,7 +75,8 @@ typedef enum {
   /* 11 used for weighted ketama */
   MEM_KETAMA_WEIGHTED= (1 << 11),
   MEM_BINARY_PROTOCOL= (1 << 12),
-  MEM_HASH_WITH_PREFIX_KEY= (1 << 13)
+  MEM_HASH_WITH_PREFIX_KEY= (1 << 13),
+  MEM_NOREPLY= (1 << 14)
 } memcached_flags;
 
 /* Hashing algo */
@@ -125,10 +119,25 @@ memcached_return memcached_server_remove(memcached_server_st *st_ptr);
 extern uint64_t ntohll(uint64_t);
 extern uint64_t htonll(uint64_t);
 
-void host_reset(memcached_st *ptr, memcached_server_st *host, 
-                const char *hostname, unsigned int port, uint32_t weight,
-                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 > 250) 
+      return MEMCACHED_BAD_KEY_PROVIDED;
+  }
+
+  return MEMCACHED_SUCCESS;
+}
+
 #endif /* __COMMON_H__ */