projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
A few 32-bit fixes.
[m6w6/libmemcached]
/
libmemcached
/
memcached_storage.c
diff --git
a/libmemcached/memcached_storage.c
b/libmemcached/memcached_storage.c
index 9acc7c3bcaef41f91acf357ced485de3b5218cac..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);
@@
-105,7
+105,8
@@
static inline memcached_return memcached_send(memcached_st *ptr,
(unsigned long long)expiration, value_length,
(ptr->flags & MEM_NOREPLY) ? " noreply" : "");
(unsigned long long)expiration, value_length,
(ptr->flags & MEM_NOREPLY) ? " noreply" : "");
- if (ptr->flags & MEM_USE_UDP && ptr->flags & MEM_BUFFER_REQUESTS) {
+ if (ptr->flags & MEM_USE_UDP && ptr->flags & MEM_BUFFER_REQUESTS)
+ {
size_t cmd_size= write_length + value_length + 2;
if (cmd_size > MAX_UDP_DATAGRAM_LENGTH - UDP_DATAGRAM_HEADER_LENGTH)
return MEMCACHED_WRITE_FAILURE;
size_t cmd_size= write_length + value_length + 2;
if (cmd_size > MAX_UDP_DATAGRAM_LENGTH - UDP_DATAGRAM_HEADER_LENGTH)
return MEMCACHED_WRITE_FAILURE;
@@
-338,8
+339,11
@@
memcached_return memcached_cas_by_key(memcached_st *ptr,
return rc;
}
return rc;
}
-static inline uint8_t get_com_code(memcached_storage_action verb, bool noreply) {
- uint8_t ret;
+static inline uint8_t get_com_code(memcached_storage_action verb, bool noreply)
+{
+ /* 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)