projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge bzr://10.0.3.21 Build: jenkins-Libmemcached-469
[awesomized/libmemcached]
/
libmemcached
/
stats.cc
diff --git
a/libmemcached/stats.cc
b/libmemcached/stats.cc
index 01a8baf6d51303799a08c3c17e656a3b72df2c26..180b0d982204c3e34b089d78c7428eba3dc8b292 100644
(file)
--- a/
libmemcached/stats.cc
+++ b/
libmemcached/stats.cc
@@
-346,7
+346,7
@@
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
*
, memcached_stat_st *memc_stat,
+char *memcached_stat_get_value(const memcached_st
* shell
, memcached_stat_st *memc_stat,
const char *key, memcached_return_t *error)
{
memcached_return_t not_used;
const char *key, memcached_return_t *error)
{
memcached_return_t not_used;
@@
-456,13
+456,15
@@
char *memcached_stat_get_value(const memcached_st *, memcached_stat_st *memc_sta
}
else
{
}
else
{
- *error= MEMCACHED_NOTFOUND;
+ Memcached* memc= (Memcached*)memcached2Memcached(shell);
+ *error= memcached_set_error(*memc, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT, memcached_literal_param("Invalid key provided"));
return NULL;
}
if (length >= SMALL_STRING_LEN || length < 0)
{
return NULL;
}
if (length >= SMALL_STRING_LEN || length < 0)
{
- *error= MEMCACHED_FAILURE;
+ Memcached* memc= (Memcached*)memcached2Memcached(shell);
+ *error= memcached_set_error(*memc, MEMCACHED_FAILURE, MEMCACHED_AT, memcached_literal_param("Internal failure occured with buffer, please report this bug."));
return NULL;
}
return NULL;
}
@@
-477,7
+479,7
@@
char *memcached_stat_get_value(const memcached_st *, memcached_stat_st *memc_sta
static memcached_return_t binary_stats_fetch(memcached_stat_st *memc_stat,
const char *args,
const size_t args_length,
static memcached_return_t binary_stats_fetch(memcached_stat_st *memc_stat,
const char *args,
const size_t args_length,
-
org::libmemcached::Instance
* instance,
+
memcached_instance_st
* instance,
struct local_context *check)
{
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
struct local_context *check)
{
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
@@
-567,7
+569,7
@@
static memcached_return_t binary_stats_fetch(memcached_stat_st *memc_stat,
static memcached_return_t ascii_stats_fetch(memcached_stat_st *memc_stat,
const char *args,
const size_t args_length,
static memcached_return_t ascii_stats_fetch(memcached_stat_st *memc_stat,
const char *args,
const size_t args_length,
-
org::libmemcached::Instance
* instance,
+
memcached_instance_st
* instance,
struct local_context *check)
{
libmemcached_io_vector_st vector[]=
struct local_context *check)
{
libmemcached_io_vector_st vector[]=
@@
-658,8
+660,7
@@
memcached_stat_st *memcached_stat(memcached_st *shell, char *args, memcached_ret
if (args)
{
args_length= strlen(args);
if (args)
{
args_length= strlen(args);
- rc= memcached_validate_key_length(args_length, self->flags.binary_protocol);
- if (memcached_failed(rc))
+ if (memcached_failed(rc= memcached_key_test(*self, (const char **)&args, &args_length, 1)))
{
*error= memcached_set_error(*self, rc, MEMCACHED_AT);
return NULL;
{
*error= memcached_set_error(*self, rc, MEMCACHED_AT);
return NULL;
@@
-684,7
+685,7
@@
memcached_stat_st *memcached_stat(memcached_st *shell, char *args, memcached_ret
stat_instance->pid= -1;
stat_instance->root= self;
stat_instance->pid= -1;
stat_instance->root= self;
-
org::libmemcached::Instance
* instance= memcached_instance_fetch(self, x);
+
memcached_instance_st
* instance= memcached_instance_fetch(self, x);
memcached_return_t temp_return;
if (memcached_is_binary(self))
memcached_return_t temp_return;
if (memcached_is_binary(self))
@@
-746,12
+747,12
@@
memcached_return_t memcached_stat_servername(memcached_stat_st *memc_stat, char
if (args)
{
args_length= strlen(args);
if (args)
{
args_length= strlen(args);
- rc= memcached_
validate_key_length(args_length, memc.flags.binary_protocol
);
+ rc= memcached_
key_test(*memc_ptr, (const char **)&args, &args_length, 1
);
}
if (memcached_success(rc))
{
}
if (memcached_success(rc))
{
-
org::libmemcached::Instance
* instance= memcached_instance_fetch(memc_ptr, 0);
+
memcached_instance_st
* instance= memcached_instance_fetch(memc_ptr, 0);
if (memc.flags.binary_protocol)
{
rc= binary_stats_fetch(memc_stat, args, args_length, instance, NULL);
if (memc.flags.binary_protocol)
{
rc= binary_stats_fetch(memc_stat, args, args_length, instance, NULL);
@@
-813,7
+814,7
@@
void memcached_stat_free(const memcached_st *, memcached_stat_st *memc_stat)
}
static memcached_return_t call_stat_fn(memcached_st *memc,
}
static memcached_return_t call_stat_fn(memcached_st *memc,
-
org::libmemcached::Instance
* instance,
+
memcached_instance_st
* instance,
void *context)
{
if (memc)
void *context)
{
if (memc)