projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merging Patrick's work on C++ interface.
[m6w6/libmemcached]
/
lib
/
memcached_auto.c
diff --git
a/lib/memcached_auto.c
b/lib/memcached_auto.c
index f2ed0b8ff2dc924290987db2af2fb85e70306b1f..4af85e97bd385d56951aed7b192022482f23119b 100644
(file)
--- a/
lib/memcached_auto.c
+++ b/
lib/memcached_auto.c
@@
-26,25
+26,25
@@
static memcached_return memcached_auto(memcached_st *ptr,
if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
return MEMCACHED_WRITE_FAILURE;
if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
return MEMCACHED_WRITE_FAILURE;
- rc= memcached_do(
ptr, server_key
, buffer, send_length, 1);
+ rc= memcached_do(
&ptr->hosts[server_key]
, buffer, send_length, 1);
if (rc != MEMCACHED_SUCCESS)
return rc;
if (rc != MEMCACHED_SUCCESS)
return rc;
- rc= memcached_response(
ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key
);
+ rc= memcached_response(
&ptr->hosts[server_key], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL
);
/*
So why recheck responce? Because the protocol is brain dead :)
The number returned might end up equaling one of the string
/*
So why recheck responce? Because the protocol is brain dead :)
The number returned might end up equaling one of the string
- values. Less chance of a mistake with
mem
cmp() so we will
+ values. Less chance of a mistake with
strn
cmp() so we will
use it. We still called memcached_response() though since it
worked its magic for non-blocking IO.
*/
use it. We still called memcached_response() though since it
worked its magic for non-blocking IO.
*/
- if (!
memcmp(buffer, "ERROR\r\n", MEMCACHED_DEFAULT_COMMAND_SIZE
))
+ if (!
strncmp(buffer, "ERROR\r\n", 7
))
{
*value= 0;
rc= MEMCACHED_PROTOCOL_ERROR;
}
{
*value= 0;
rc= MEMCACHED_PROTOCOL_ERROR;
}
- else if (!
memcmp(buffer, "NOT_FOUND\r\n", MEMCACHED_DEFAULT_COMMAND_SIZE
))
+ else if (!
strncmp(buffer, "NOT_FOUND\r\n", 11
))
{
*value= 0;
rc= MEMCACHED_NOTFOUND;
{
*value= 0;
rc= MEMCACHED_NOTFOUND;
@@
-60,7
+60,7
@@
static memcached_return memcached_auto(memcached_st *ptr,
memcached_return memcached_increment(memcached_st *ptr,
char *key, size_t key_length,
memcached_return memcached_increment(memcached_st *ptr,
char *key, size_t key_length,
- u
nsigned in
t offset,
+ u
int32_
t offset,
uint64_t *value)
{
memcached_return rc;
uint64_t *value)
{
memcached_return rc;
@@
-74,7
+74,7
@@
memcached_return memcached_increment(memcached_st *ptr,
memcached_return memcached_decrement(memcached_st *ptr,
char *key, size_t key_length,
memcached_return memcached_decrement(memcached_st *ptr,
char *key, size_t key_length,
- u
nsigned in
t offset,
+ u
int32_
t offset,
uint64_t *value)
{
memcached_return rc;
uint64_t *value)
{
memcached_return rc;