projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix for bad location of include directory
[awesomized/libmemcached]
/
lib
/
memcached_auto.c
diff --git
a/lib/memcached_auto.c
b/lib/memcached_auto.c
index 36780dc5409f3dee8dc5151cf1c8dc1ed96cd06a..a607ed66e23298881c2ee5bfd6d3ea429aafbb62 100644
(file)
--- a/
lib/memcached_auto.c
+++ b/
lib/memcached_auto.c
@@
-11,13
+11,13
@@
static memcached_return memcached_auto(memcached_st *ptr,
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
unsigned int server_key;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
unsigned int server_key;
-
if
(key_length == 0)
+
unlikely
(key_length == 0)
return MEMCACHED_NO_KEY_PROVIDED;
return MEMCACHED_NO_KEY_PROVIDED;
-
if
(ptr->hosts == NULL || ptr->number_of_hosts == 0)
+
unlikely
(ptr->hosts == NULL || ptr->number_of_hosts == 0)
return MEMCACHED_NO_SERVERS;
return MEMCACHED_NO_SERVERS;
- if (
key_test(&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED
)
+ if (
(ptr->flags & MEM_VERIFY_KEY) && (memcachd_key_test(&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);
@@
-26,7
+26,7
@@
static memcached_return memcached_auto(memcached_st *ptr,
"%s %.*s %u\r\n", verb,
(int)key_length, key,
offset);
"%s %.*s %u\r\n", verb,
(int)key_length, key,
offset);
-
if
(send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
+
unlikely
(send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
return MEMCACHED_WRITE_FAILURE;
rc= memcached_do(&ptr->hosts[server_key], buffer, send_length, 1);
return MEMCACHED_WRITE_FAILURE;
rc= memcached_do(&ptr->hosts[server_key], buffer, send_length, 1);