projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in all current libmemcached work, plus restore older, working,
[awesomized/libmemcached]
/
libmemcached
/
auto.c
diff --git
a/libmemcached/auto.c
b/libmemcached/auto.c
index c2033b37ceb96dad9302e850ee39a90da4fed1d3..7bd0cc12518c100521466635c4f85f3901e967df 100644
(file)
--- a/
libmemcached/auto.c
+++ b/
libmemcached/auto.c
@@
-9,7
+9,7
@@
*
*/
*
*/
-#include "common.h"
+#include "
libmemcached/
common.h"
static memcached_return_t text_incr_decr(memcached_st *ptr,
const char *verb,
static memcached_return_t text_incr_decr(memcached_st *ptr,
const char *verb,
@@
-36,8
+36,7
@@
static memcached_return_t text_incr_decr(memcached_st *ptr,
int send_length;
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
"%s %.*s%.*s %" PRIu64 "%s\r\n", verb,
int send_length;
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
"%s %.*s%.*s %" PRIu64 "%s\r\n", verb,
- (int)ptr->prefix_key_length,
- ptr->prefix_key,
+ memcached_print_array(ptr->prefix_key),
(int)key_length, key,
offset, no_reply ? " noreply" : "");
if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE || send_length < 0)
(int)key_length, key,
offset, no_reply ? " noreply" : "");
if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE || send_length < 0)
@@
-108,10
+107,10
@@
static memcached_return_t 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((uint16_t)(key_length +
ptr->prefix_key_length
));
+ request.message.header.request.keylen= htons((uint16_t)(key_length +
memcached_array_size(ptr->prefix_key)
));
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((uint32_t)(key_length +
ptr->prefix_key_length +
request.message.header.request.extlen));
+ request.message.header.request.bodylen= htonl((uint32_t)(key_length +
memcached_array_size(ptr->prefix_key) +
request.message.header.request.extlen));
request.message.body.delta= htonll(offset);
request.message.body.initial= htonll(initial);
request.message.body.expiration= htonl((uint32_t) expiration);
request.message.body.delta= htonll(offset);
request.message.body.initial= htonll(initial);
request.message.body.expiration= htonl((uint32_t) expiration);
@@
-119,7
+118,7
@@
static memcached_return_t binary_incr_decr(memcached_st *ptr, uint8_t cmd,
struct libmemcached_io_vector_st vector[]=
{
{ .length= sizeof(request.bytes), .buffer= request.bytes },
struct libmemcached_io_vector_st vector[]=
{
{ .length= sizeof(request.bytes), .buffer= request.bytes },
- { .length=
ptr->prefix_key_length
, .buffer= ptr->prefix_key },
+ { .length=
memcached_array_size(ptr->prefix_key)
, .buffer= ptr->prefix_key },
{ .length= key_length, .buffer= key }
};
{ .length= key_length, .buffer= key }
};