projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-197
[m6w6/libmemcached]
/
libmemcached
/
stats.cc
diff --git
a/libmemcached/stats.cc
b/libmemcached/stats.cc
index eb3376802664956d50af89f060b8372b5e5bca47..6bab673d0273322cf7b412523f86bb29e6ee3820 100644
(file)
--- a/
libmemcached/stats.cc
+++ b/
libmemcached/stats.cc
@@
-227,9
+227,21
@@
static memcached_return_t set_data(memcached_stat_st *memc_stat, const char *key
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
}
-char *memcached_stat_get_value(const memcached_st *
ptr
, memcached_stat_st *memc_stat,
+char *memcached_stat_get_value(const memcached_st *, memcached_stat_st *memc_stat,
const char *key, memcached_return_t *error)
{
const char *key, memcached_return_t *error)
{
+ memcached_return_t not_used;
+ if (error == NULL)
+ {
+ error= ¬_used;
+ }
+
+ if (memc_stat == NULL)
+ {
+ *error= MEMCACHED_INVALID_ARGUMENTS;
+ return NULL;
+ }
+
char buffer[SMALL_STRING_LEN];
int length;
char buffer[SMALL_STRING_LEN];
int length;