projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Added -I option to aclocal so the system finds the right libtool.m4 file.
[m6w6/libmemcached]
/
libmemcached
/
memcached_storage.c
diff --git
a/libmemcached/memcached_storage.c
b/libmemcached/memcached_storage.c
index 0243de5055d6d8f2a10f65b64df40bd1e5b16ec3..97ca33cc50a7a71519452dcc8e988d2b3a55bac4 100644
(file)
--- 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;
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) && (memcach
e
d_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);
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)
{
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)
if (noreply)
switch (verb)