diff options
author | Brian Aker <brian@tangent.org> | 2011-08-15 15:14:05 -0700 |
---|---|---|
committer | Brian Aker <brian@tangent.org> | 2011-08-15 15:14:05 -0700 |
commit | 03b30575c8531cf049bdfbeb993b0e973575aada (patch) | |
tree | af75e06f5a6274648ac461c0e5bbe64f0be6e6fc /libmemcached/stats.cc | |
parent | b77f874c7d7ff386d01eeedb44c14d3003354bae (diff) | |
download | libmemcached-03b30575c8531cf049bdfbeb993b0e973575aada.tar.gz |
Add a method for checking error/returning error.
Diffstat (limited to 'libmemcached/stats.cc')
-rw-r--r-- | libmemcached/stats.cc | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/libmemcached/stats.cc b/libmemcached/stats.cc index 05ceb0f2..d4d8b33b 100644 --- a/libmemcached/stats.cc +++ b/libmemcached/stats.cc @@ -462,21 +462,25 @@ static memcached_return_t ascii_stats_fetch(memcached_stat_st *memc_stat, memcached_stat_st *memcached_stat(memcached_st *self, char *args, memcached_return_t *error) { + memcached_return_t unused; + if (error == NULL) + { + error= &unused; + } + memcached_return_t rc; if (memcached_failed(rc= initialize_query(self))) { - if (error) - *error= rc; + *error= rc; return NULL; } WATCHPOINT_ASSERT(error); - unlikely (self->flags.use_udp) + if (self->flags.use_udp) { - if (error) - *error= MEMCACHED_NOT_SUPPORTED; + *error= memcached_set_error(*self, MEMCACHED_NOT_SUPPORTED, MEMCACHED_AT); return NULL; } @@ -485,8 +489,7 @@ memcached_stat_st *memcached_stat(memcached_st *self, char *args, memcached_retu if (not stats) { - if (error) - *error= MEMCACHED_MEMORY_ALLOCATION_FAILURE; + *error= MEMCACHED_MEMORY_ALLOCATION_FAILURE; return NULL; } @@ -521,8 +524,7 @@ memcached_stat_st *memcached_stat(memcached_st *self, char *args, memcached_retu } } - if (error) - *error= rc; + *error= rc; return stats; } |