projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Import parser/etc
[awesomized/libmemcached]
/
libmemcached
/
auto.c
diff --git
a/libmemcached/auto.c
b/libmemcached/auto.c
index a221144f06a75851e39d2779a1c4cad1ddf09d4e..c2033b37ceb96dad9302e850ee39a90da4fed1d3 100644
(file)
--- a/
libmemcached/auto.c
+++ b/
libmemcached/auto.c
@@
-24,8
+24,8
@@
static memcached_return_t text_incr_decr(memcached_st *ptr,
memcached_server_write_instance_st instance;
bool no_reply= ptr->flags.no_reply;
memcached_server_write_instance_st instance;
bool no_reply= ptr->flags.no_reply;
-
unlikely
(memcached_server_count(ptr) == 0)
- return
MEMCACHED_NO_SERVERS
;
+
if
(memcached_server_count(ptr) == 0)
+ return
memcached_set_error(ptr, MEMCACHED_NO_SERVERS, NULL)
;
if (ptr->flags.verify_key && (memcached_key_test((const char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
return MEMCACHED_BAD_KEY_PROVIDED;
if (ptr->flags.verify_key && (memcached_key_test((const char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
return MEMCACHED_BAD_KEY_PROVIDED;
@@
-91,8
+91,8
@@
static memcached_return_t binary_incr_decr(memcached_st *ptr, uint8_t cmd,
memcached_server_write_instance_st instance;
bool no_reply= ptr->flags.no_reply;
memcached_server_write_instance_st instance;
bool no_reply= ptr->flags.no_reply;
-
unlikely
(memcached_server_count(ptr) == 0)
- return
MEMCACHED_NO_SERVERS
;
+
if
(memcached_server_count(ptr) == 0)
+ return
memcached_set_error(ptr, MEMCACHED_NO_SERVERS, NULL)
;
server_key= memcached_generate_hash_with_redistribution(ptr, master_key, master_key_length);
instance= memcached_server_instance_fetch(ptr, server_key);
server_key= memcached_generate_hash_with_redistribution(ptr, master_key, master_key_length);
instance= memcached_server_instance_fetch(ptr, server_key);
@@
-140,6
+140,10
@@
memcached_return_t memcached_increment(memcached_st *ptr,
uint32_t offset,
uint64_t *value)
{
uint32_t offset,
uint64_t *value)
{
+ uint64_t local_value;
+ if (! value)
+ value= &local_value;
+
return memcached_increment_by_key(ptr, key, key_length, key, key_length, offset, value);
}
return memcached_increment_by_key(ptr, key, key_length, key, key_length, offset, value);
}
@@
-148,6
+152,10
@@
memcached_return_t memcached_decrement(memcached_st *ptr,
uint32_t offset,
uint64_t *value)
{
uint32_t offset,
uint64_t *value)
{
+ uint64_t local_value;
+ if (! value)
+ value= &local_value;
+
return memcached_decrement_by_key(ptr, key, key_length, key, key_length, offset, value);
}
return memcached_decrement_by_key(ptr, key, key_length, key, key_length, offset, value);
}
@@
-161,6
+169,10
@@
memcached_return_t memcached_increment_by_key(memcached_st *ptr,
unlikely (rc != MEMCACHED_SUCCESS)
return rc;
unlikely (rc != MEMCACHED_SUCCESS)
return rc;
+ uint64_t local_value;
+ if (! value)
+ value= &local_value;
+
LIBMEMCACHED_MEMCACHED_INCREMENT_START();
if (ptr->flags.binary_protocol)
{
LIBMEMCACHED_MEMCACHED_INCREMENT_START();
if (ptr->flags.binary_protocol)
{
@@
-189,6
+201,10
@@
memcached_return_t memcached_decrement_by_key(memcached_st *ptr,
unlikely (rc != MEMCACHED_SUCCESS)
return rc;
unlikely (rc != MEMCACHED_SUCCESS)
return rc;
+ uint64_t local_value;
+ if (! value)
+ value= &local_value;
+
LIBMEMCACHED_MEMCACHED_DECREMENT_START();
if (ptr->flags.binary_protocol)
{
LIBMEMCACHED_MEMCACHED_DECREMENT_START();
if (ptr->flags.binary_protocol)
{
@@
-215,6
+231,10
@@
memcached_return_t memcached_increment_with_initial(memcached_st *ptr,
time_t expiration,
uint64_t *value)
{
time_t expiration,
uint64_t *value)
{
+ uint64_t local_value;
+ if (! value)
+ value= &local_value;
+
return memcached_increment_with_initial_by_key(ptr, key, key_length,
key, key_length,
offset, initial, expiration, value);
return memcached_increment_with_initial_by_key(ptr, key, key_length,
key, key_length,
offset, initial, expiration, value);
@@
-234,6
+254,10
@@
memcached_return_t memcached_increment_with_initial_by_key(memcached_st *ptr,
unlikely (rc != MEMCACHED_SUCCESS)
return rc;
unlikely (rc != MEMCACHED_SUCCESS)
return rc;
+ uint64_t local_value;
+ if (! value)
+ value= &local_value;
+
LIBMEMCACHED_MEMCACHED_INCREMENT_WITH_INITIAL_START();
if (ptr->flags.binary_protocol)
rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_INCREMENT,
LIBMEMCACHED_MEMCACHED_INCREMENT_WITH_INITIAL_START();
if (ptr->flags.binary_protocol)
rc= binary_incr_decr(ptr, PROTOCOL_BINARY_CMD_INCREMENT,
@@
-256,6
+280,10
@@
memcached_return_t memcached_decrement_with_initial(memcached_st *ptr,
time_t expiration,
uint64_t *value)
{
time_t expiration,
uint64_t *value)
{
+ uint64_t local_value;
+ if (! value)
+ value= &local_value;
+
return memcached_decrement_with_initial_by_key(ptr, key, key_length,
key, key_length,
offset, initial, expiration, value);
return memcached_decrement_with_initial_by_key(ptr, key, key_length,
key, key_length,
offset, initial, expiration, value);
@@
-275,6
+303,10
@@
memcached_return_t memcached_decrement_with_initial_by_key(memcached_st *ptr,
unlikely (rc != MEMCACHED_SUCCESS)
return rc;
unlikely (rc != MEMCACHED_SUCCESS)
return rc;
+ uint64_t local_value;
+ if (! value)
+ value= &local_value;
+
LIBMEMCACHED_MEMCACHED_INCREMENT_WITH_INITIAL_START();
if (ptr->flags.binary_protocol)
{
LIBMEMCACHED_MEMCACHED_INCREMENT_WITH_INITIAL_START();
if (ptr->flags.binary_protocol)
{