projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix coding style violations
[m6w6/libmemcached]
/
libmemcached
/
memcached_stats.c
diff --git
a/libmemcached/memcached_stats.c
b/libmemcached/memcached_stats.c
index 96f0eb1cfb7ebe28261b1d785c0fdf8f90c973bf..3ad236d2108c347f8eb778c52e7211442b8cc222 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);
@@
-335,6
+340,12
@@
memcached_stat_st *memcached_stat(memcached_st *ptr, char *args, memcached_retur
memcached_return rc;
memcached_stat_st *stats;
memcached_return rc;
memcached_stat_st *stats;
+ if (ptr->flags & MEM_USE_UDP)
+ {
+ *error= MEMCACHED_NOT_SUPPORTED;
+ return NULL;
+ }
+
if (ptr->call_malloc)
stats= (memcached_stat_st *)ptr->call_malloc(ptr, sizeof(memcached_stat_st)*(ptr->number_of_hosts));
else
if (ptr->call_malloc)
stats= (memcached_stat_st *)ptr->call_malloc(ptr, sizeof(memcached_stat_st)*(ptr->number_of_hosts));
else
@@
-343,11
+354,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));