projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fixed strings returned by get to be null terminated (request by Cal
[m6w6/libmemcached]
/
lib
/
memcached_get.c
diff --git
a/lib/memcached_get.c
b/lib/memcached_get.c
index 49b64f3b23d97e0cdec9e74ead4c2021462b8a11..4894b2a05ef32334a9f26029057412ee5ac2dda7 100644
(file)
--- a/
lib/memcached_get.c
+++ b/
lib/memcached_get.c
@@
-34,10
+34,13
@@
static char *memcached_value_fetch(memcached_st *ptr, char *key, size_t *key_len
if (load_key)
{
memset(key, 0, MEMCACHED_MAX_KEY);
if (load_key)
{
memset(key, 0, MEMCACHED_MAX_KEY);
+ *key_length= 0;
+
for (; end_ptr == string_ptr || *string_ptr != ' '; string_ptr++)
{
*key= *string_ptr;
key++;
for (; end_ptr == string_ptr || *string_ptr != ' '; string_ptr++)
{
*key= *string_ptr;
key++;
+ (*key_length)++;
}
}
else /* Skip characters */
}
}
else /* Skip characters */
@@
-93,6
+96,13
@@
static char *memcached_value_fetch(memcached_st *ptr, char *key, size_t *key_len
value_ptr= value;
read_length= 0;
value_ptr= value;
read_length= 0;
+ /*
+ We read the \r\n into the string since not doing so is more
+ cycles then the waster of memory to do so.
+
+ We are null terminating through, which will most likely make
+ some people lazy about using the return length.
+ */
to_read= (*value_length) + 2;
read_length= memcached_io_read(ptr, server_key,
to_read= (*value_length) + 2;
read_length= memcached_io_read(ptr, server_key,
@@
-104,6
+114,9
@@
static char *memcached_value_fetch(memcached_st *ptr, char *key, size_t *key_len
goto read_error;
}
goto read_error;
}
+ value[*value_length]= 0;
+ value[(*value_length) + 1]= 0;
+
return value;
}
}
return value;
}
}
@@
-127,14
+140,14
@@
char *memcached_get(memcached_st *ptr, char *key, size_t key_length,
char *value;
LIBMEMCACHED_MEMCACHED_GET_START();
char *value;
LIBMEMCACHED_MEMCACHED_GET_START();
+ server_key= memcached_generate_hash(ptr, key, key_length);
+
*value_length= 0;
*value_length= 0;
- *error= memcached_connect(ptr);
+ *error= memcached_connect(ptr
, server_key
);
if (*error != MEMCACHED_SUCCESS)
goto error;
if (*error != MEMCACHED_SUCCESS)
goto error;
- server_key= memcached_generate_hash(key, key_length) % ptr->number_of_hosts;
-
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, "get %.*s\r\n",
(int)key_length, key);
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, "get %.*s\r\n",
(int)key_length, key);
@@
-192,11
+205,6
@@
memcached_return memcached_mget(memcached_st *ptr,
ptr->cursor_server= 0;
memset(buffer, 0, HUGE_STRING_LEN);
ptr->cursor_server= 0;
memset(buffer, 0, HUGE_STRING_LEN);
- rc= memcached_connect(ptr);
-
- if (rc != MEMCACHED_SUCCESS)
- return rc;
-
cursor_key_exec= (memcached_string_st **)malloc(sizeof(memcached_string_st *) * ptr->number_of_hosts);
memset(cursor_key_exec, 0, sizeof(memcached_string_st *) * ptr->number_of_hosts);
cursor_key_exec= (memcached_string_st **)malloc(sizeof(memcached_string_st *) * ptr->number_of_hosts);
memset(cursor_key_exec, 0, sizeof(memcached_string_st *) * ptr->number_of_hosts);
@@
-205,7
+213,7
@@
memcached_return memcached_mget(memcached_st *ptr,
{
unsigned int server_key;
{
unsigned int server_key;
- server_key= memcached_generate_hash(
keys[x], key_length[x]) % ptr->number_of_hosts
;
+ server_key= memcached_generate_hash(
ptr, keys[x], key_length[x])
;
if (cursor_key_exec[server_key])
{
if (cursor_key_exec[server_key])
{
@@
-237,6
+245,9
@@
memcached_return memcached_mget(memcached_st *ptr,
{
if (cursor_key_exec[x])
{
{
if (cursor_key_exec[x])
{
+ /* We need to doo something about non-connnected hosts in the future */
+ rc= memcached_connect(ptr, x);
+
memcached_string_st *string= cursor_key_exec[x];
memcached_string_append(ptr, string, "\r\n", 2);
memcached_string_st *string= cursor_key_exec[x];
memcached_string_append(ptr, string, "\r\n", 2);