X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fhash.c;h=1c11c50de2c043bd6df6301945a11f5a3977a2ce;hb=ea47169abd0793bb7eb1b72e4de411ae9b43dce4;hp=e6458c25d816f3e7288c95403b78958ced90c93b;hpb=acd4e556bf8e21005dc42500e3f76b40adb89949;p=m6w6%2Flibmemcached

diff --git a/libmemcached/hash.c b/libmemcached/hash.c
index e6458c25..1c11c50d 100644
--- a/libmemcached/hash.c
+++ b/libmemcached/hash.c
@@ -1,9 +1,20 @@
+/* LibMemcached
+ * Copyright (C) 2006-2010 Brian Aker
+ * All rights reserved.
+ *
+ * Use and distribution licensed under the BSD license.  See
+ * the COPYING file in the parent directory for full text.
+ *
+ * Summary: 
+ *
+ */
+
 #include "common.h"
 
 
 uint32_t memcached_generate_hash_value(const char *key, size_t key_length, memcached_hash_t hash_algorithm)
 {
-  return libhashkit_generate_value(key, key_length, (hashkit_hash_algorithm_t)hash_algorithm);
+  return libhashkit_digest(key, key_length, (hashkit_hash_algorithm_t)hash_algorithm);
 }
 
 uint32_t generate_hash(memcached_st *ptr, const char *key, size_t key_length)
@@ -16,8 +27,7 @@ uint32_t generate_hash(memcached_st *ptr, const char *key, size_t key_length)
   if (memcached_server_count(ptr) == 1)
     return 0;
 
-  hash= hashkit_generate_value(&ptr->hashkit, key, key_length);
-  WATCHPOINT_ASSERT(hash);
+  hash= hashkit_digest(&ptr->hashkit, key, key_length);
 
   return hash;
 }
@@ -92,8 +102,6 @@ uint32_t memcached_generate_hash(memcached_st *ptr, const char *key, size_t key_
     hash= generate_hash(ptr, key, key_length);
   }
 
-  WATCHPOINT_ASSERT(hash);
-
   if (memcached_behavior_get(ptr, MEMCACHED_BEHAVIOR_AUTO_EJECT_HOSTS) && ptr->next_distribution_rebuild)
   {
     struct timeval now;
@@ -107,3 +115,8 @@ uint32_t memcached_generate_hash(memcached_st *ptr, const char *key, size_t key_
 
   return dispatch_host(ptr, hash);
 }
+
+hashkit_st *memcached_get_hashkit(memcached_st *ptr)
+{
+  return &ptr->hashkit;
+}