projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Various small build fixes to reduce warnings.
[m6w6/libmemcached]
/
libmemcached
/
memcached_auto.c
diff --git
a/libmemcached/memcached_auto.c
b/libmemcached/memcached_auto.c
index 2cb810db19f9df6ae844a6aecbf5938129fe6551..c0c6269af7a71ce64f71d7c9e15a830fe9e1b0ed 100644
(file)
--- a/
libmemcached/memcached_auto.c
+++ b/
libmemcached/memcached_auto.c
@@
-15,7
+15,7
@@
static memcached_return memcached_auto(memcached_st *ptr,
unlikely (ptr->hosts == NULL || ptr->number_of_hosts == 0)
return MEMCACHED_NO_SERVERS;
unlikely (ptr->hosts == NULL || ptr->number_of_hosts == 0)
return MEMCACHED_NO_SERVERS;
- if ((ptr->flags & MEM_VERIFY_KEY) && (memcached_key_test((char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
+ if ((ptr->flags & MEM_VERIFY_KEY) && (memcached_key_test((c
onst c
har **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
return MEMCACHED_BAD_KEY_PROVIDED;
server_key= memcached_generate_hash(ptr, key, key_length);
return MEMCACHED_BAD_KEY_PROVIDED;
server_key= memcached_generate_hash(ptr, key, key_length);
@@
-85,13
+85,13
@@
static memcached_return binary_incr_decr(memcached_st *ptr, uint8_t cmd,
request.message.header.request.magic= PROTOCOL_BINARY_REQ;
request.message.header.request.opcode= cmd;
request.message.header.request.magic= PROTOCOL_BINARY_REQ;
request.message.header.request.opcode= cmd;
- request.message.header.request.keylen= htons(key_length);
+ request.message.header.request.keylen= htons(
(uint16_t)
key_length);
request.message.header.request.extlen= 20;
request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
request.message.header.request.extlen= 20;
request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
- request.message.header.request.bodylen= htonl(
key_length + request.message.header.request.extlen);
+ request.message.header.request.bodylen= htonl(
(uint32_t) (key_length + request.message.header.request.extlen));
request.message.body.delta= htonll(offset);
request.message.body.initial= htonll(initial);
request.message.body.delta= htonll(offset);
request.message.body.initial= htonll(initial);
- request.message.body.expiration= htonl(expiration);
+ request.message.body.expiration= htonl(
(uint32_t)
expiration);
if ((memcached_do(&ptr->hosts[server_key], request.bytes,
sizeof(request.bytes), 0)!=MEMCACHED_SUCCESS) ||
if ((memcached_do(&ptr->hosts[server_key], request.bytes,
sizeof(request.bytes), 0)!=MEMCACHED_SUCCESS) ||