projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Added prototype for memcached_flush_buffers
[awesomized/libmemcached]
/
libmemcached
/
memcached_stats.c
diff --git
a/libmemcached/memcached_stats.c
b/libmemcached/memcached_stats.c
index 1b5576e7f072a2bbe3e8f54ef7a80a7a51ba2b43..9069bccbed6e0a74bb2cae1977b420b4e8fd10ab 100644
(file)
--- a/
libmemcached/memcached_stats.c
+++ b/
libmemcached/memcached_stats.c
@@
-143,7
+143,7
@@
static void set_data(memcached_stat_st *stat, char *key, char *value)
}
char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *stat,
}
char *memcached_stat_get_value(memcached_st *ptr, memcached_stat_st *stat,
- char *key, memcached_return *error)
+ c
onst c
har *key, memcached_return *error)
{
char buffer[SMALL_STRING_LEN];
size_t length;
{
char buffer[SMALL_STRING_LEN];
size_t length;
@@
-227,6
+227,11
@@
static memcached_return binary_stats_fetch(memcached_st *ptr,
if (args != NULL)
{
int len= strlen(args);
if (args != NULL)
{
int len= strlen(args);
+
+ rc= memcached_validate_key_length(len, true);
+ unlikely (rc != MEMCACHED_SUCCESS)
+ return rc;
+
request.message.header.request.keylen= htons((uint16_t)len);
request.message.header.request.bodylen= htonl(len);
request.message.header.request.keylen= htons((uint16_t)len);
request.message.header.request.bodylen= htonl(len);
@@
-343,11
+348,6
@@
memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_retur
if (!stats)
{
*error= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
if (!stats)
{
*error= MEMCACHED_MEMORY_ALLOCATION_FAILURE;
- if (ptr->call_free)
- ptr->call_free(ptr, stats);
- else
- free(stats);
-
return NULL;
}
memset(stats, 0, sizeof(memcached_stat_st)*(ptr->number_of_hosts));
return NULL;
}
memset(stats, 0, sizeof(memcached_stat_st)*(ptr->number_of_hosts));
@@
-394,7
+394,7
@@
memcached_return memcached_stat_servername(memcached_stat_st *stat, char *args,
We make a copy of the keys since at some point in the not so distant future
we will add support for "found" keys.
*/
We make a copy of the keys since at some point in the not so distant future
we will add support for "found" keys.
*/
-char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *stat,
+char ** memcached_stat_get_keys(memcached_st *ptr, memcached_stat_st *stat
__attribute__((unused))
,
memcached_return *error)
{
char **list;
memcached_return *error)
{
char **list;