From: Brian Aker <brian@tangent.org>
Date: Fri, 25 Mar 2011 05:22:45 +0000 (-0700)
Subject: Merge in code changes for all of the new parser.
X-Git-Tag: 0.51~15^2~75
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=3dee67d04099cc5e2986ed94aa612f429f54d6fb;p=m6w6%2Flibmemcached

Merge in code changes for all of the new parser.
---

3dee67d04099cc5e2986ed94aa612f429f54d6fb
diff --cc libmemcached/hash.c
index dda30395,d1515f69..ce47a448
--- a/libmemcached/hash.c
+++ b/libmemcached/hash.c
@@@ -78,10 -78,10 +78,10 @@@ static inline uint32_t _generate_hash_w
      char temp[temp_length];
  
      if (temp_length > MEMCACHED_MAX_KEY -1)
 -      return EXIT_SUCCESS;
 +      return 0;
  
-     strncpy(temp, ptr->prefix_key, ptr->prefix_key_length);
-     strncpy(temp + ptr->prefix_key_length, key, key_length);
+     strncpy(temp, memcached_array_string(ptr->prefix_key), memcached_array_size(ptr->prefix_key));
+     strncpy(temp + memcached_array_size(ptr->prefix_key), key, key_length);
  
      return generate_hash(ptr, temp, temp_length);
    }