projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Extending tests...
[awesomized/libmemcached]
/
lib
/
memcached_auto.c
diff --git
a/lib/memcached_auto.c
b/lib/memcached_auto.c
index 69b975c1603598296c8618bba6b532eb981e4ecc..b9b74628810a9f7e96dc8df5d61f6290ceb4856d 100644
(file)
--- a/
lib/memcached_auto.c
+++ b/
lib/memcached_auto.c
@@
-4,17
+4,20
@@
static memcached_return memcached_auto(memcached_st *ptr,
char *verb,
char *key, size_t key_length,
unsigned int offset,
char *verb,
char *key, size_t key_length,
unsigned int offset,
- u
nsigned in
t *value)
+ u
int64_
t *value)
{
{
- size_t send_length
, sent_length
;
+ size_t send_length;
memcached_return rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
unsigned int server_key;
memcached_return rc;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
unsigned int server_key;
- server_key= memcached_generate_hash(ptr, key, key_length);
+ if (key_length == 0)
+ return MEMCACHED_NO_KEY_PROVIDED;
- if ((rc= memcached_connect(ptr, server_key)) != MEMCACHED_SUCCESS)
- return rc;
+ if (ptr->hosts == NULL || ptr->number_of_hosts == 0)
+ return MEMCACHED_NO_SERVERS;
+
+ server_key= memcached_generate_hash(ptr, key, key_length);
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
"%s %.*s %u\r\n", verb,
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
"%s %.*s %u\r\n", verb,
@@
-22,12
+25,10
@@
static memcached_return memcached_auto(memcached_st *ptr,
offset);
if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
return MEMCACHED_WRITE_FAILURE;
offset);
if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
return MEMCACHED_WRITE_FAILURE;
- sent_length= memcached_io_write(ptr, server_key, buffer, send_length, 1);
- if (sent_length == -1 || sent_length != send_length)
- return MEMCACHED_WRITE_FAILURE;
-
- memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE);
+ rc= memcached_do(ptr, server_key, buffer, send_length, 1);
+ if (rc != MEMCACHED_SUCCESS)
+ return rc;
rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, server_key);
@@
-50,7
+51,7
@@
static memcached_return memcached_auto(memcached_st *ptr,
}
else
{
}
else
{
- *value=
strto
l(buffer, (char **)NULL, 10);
+ *value=
(uint64_t)strtol
l(buffer, (char **)NULL, 10);
rc= MEMCACHED_SUCCESS;
}
rc= MEMCACHED_SUCCESS;
}
@@
-59,8
+60,8
@@
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
nsigned in
t *value)
+ u
int32_
t offset,
+ u
int64_
t *value)
{
memcached_return rc;
{
memcached_return rc;
@@
-73,8
+74,8
@@
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
nsigned in
t *value)
+ u
int32_
t offset,
+ u
int64_
t *value)
{
memcached_return rc;
{
memcached_return rc;