projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge Monty
[m6w6/libmemcached]
/
libmemcached
/
memcached_storage.c
diff --git
a/libmemcached/memcached_storage.c
b/libmemcached/memcached_storage.c
index 713f831d2c4fe399cfddd8443e4b453a5a2ea5ca..b950dc92f45e8bebc02a052636533019714987d5 100644
(file)
--- a/
libmemcached/memcached_storage.c
+++ b/
libmemcached/memcached_storage.c
@@
-37,7
+37,7
@@
static char *storage_op_string(memcached_storage_action verb)
return "cas ";
default:
return "tosserror"; /* This is impossible, fixes issue for compiler warning in VisualStudio */
return "cas ";
default:
return "tosserror"; /* This is impossible, fixes issue for compiler warning in VisualStudio */
- }
;
+ }
/* NOTREACHED */
}
/* NOTREACHED */
}
@@
-384,6
+384,9
@@
static inline uint8_t get_com_code(memcached_storage_action verb, bool noreply)
case PREPEND_OP:
ret=PROTOCOL_BINARY_CMD_PREPENDQ;
break;
case PREPEND_OP:
ret=PROTOCOL_BINARY_CMD_PREPENDQ;
break;
+ default:
+ WATCHPOINT_ASSERT(verb);
+ break;
}
else
switch (verb)
}
else
switch (verb)
@@
-404,6
+407,9
@@
static inline uint8_t get_com_code(memcached_storage_action verb, bool noreply)
case PREPEND_OP:
ret=PROTOCOL_BINARY_CMD_PREPEND;
break;
case PREPEND_OP:
ret=PROTOCOL_BINARY_CMD_PREPEND;
break;
+ default:
+ WATCHPOINT_ASSERT(verb);
+ break;
}
return ret;
}
return ret;
@@
-474,7
+480,7
@@
static memcached_return memcached_send_binary(memcached_st *ptr,
{
request.message.header.request.opcode= PROTOCOL_BINARY_CMD_SETQ;
{
request.message.header.request.opcode= PROTOCOL_BINARY_CMD_SETQ;
- for (
int x= 0; x < ptr->number_of_replicas; ++x
)
+ for (
uint32_t x= 0; x < ptr->number_of_replicas; x++
)
{
++server_key;
if (server_key == ptr->number_of_hosts)
{
++server_key;
if (server_key == ptr->number_of_hosts)