X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_storage.c;h=97ca33cc50a7a71519452dcc8e988d2b3a55bac4;hb=adb3aa8ec1a70976f92cd05a8bab4174905d3005;hp=0243de5055d6d8f2a10f65b64df40bd1e5b16ec3;hpb=7e0ffed050b62cc5dcf5d16c148185074bfd7d50;p=m6w6%2Flibmemcached

diff --git a/libmemcached/memcached_storage.c b/libmemcached/memcached_storage.c
index 0243de50..97ca33cc 100644
--- a/libmemcached/memcached_storage.c
+++ b/libmemcached/memcached_storage.c
@@ -77,7 +77,7 @@ static inline memcached_return memcached_send(memcached_st *ptr,
   unlikely (ptr->number_of_hosts == 0)
     return MEMCACHED_NO_SERVERS;
 
-  if ((ptr->flags & MEM_VERIFY_KEY) && (memcachd_key_test((char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
+  if ((ptr->flags & MEM_VERIFY_KEY) && (memcached_key_test((char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
     return MEMCACHED_BAD_KEY_PROVIDED;
 
   server_key= memcached_generate_hash(ptr, master_key, master_key_length);
@@ -341,7 +341,9 @@ memcached_return memcached_cas_by_key(memcached_st *ptr,
 
 static inline uint8_t get_com_code(memcached_storage_action verb, bool noreply)
 {
-   uint8_t ret;
+  /* 0 isn't a value we want, but GCC 4.2 seems to think ret can otherwise
+   * be used uninitialized in this function. FAIL */
+  uint8_t ret= 0;
 
   if (noreply)
     switch (verb)