diff options
| author | Brian Aker <brian@tangent.org> | 2012-05-21 01:08:39 -0400 |
|---|---|---|
| committer | Brian Aker <brian@tangent.org> | 2012-05-21 01:08:39 -0400 |
| commit | a28d1ecc082d9d08c4f59f071de9a43fbd08aee3 (patch) | |
| tree | 317a0087ae525689bbc075b2e1709fa85a97c3b1 /libmemcached/purge.cc | |
| parent | c633911d2e1bb3638db6d280048169e9022f3455 (diff) | |
| download | libmemcached-a28d1ecc082d9d08c4f59f071de9a43fbd08aee3.tar.gz | |
Simplify purge return value.
Diffstat (limited to 'libmemcached/purge.cc')
| -rw-r--r-- | libmemcached/purge.cc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/libmemcached/purge.cc b/libmemcached/purge.cc index 6142e5fb..38e4552a 100644 --- a/libmemcached/purge.cc +++ b/libmemcached/purge.cc @@ -40,9 +40,8 @@ #include <libmemcached/common.h> -memcached_return_t memcached_purge(memcached_server_write_instance_st ptr) +bool memcached_purge(memcached_server_write_instance_st ptr) { - memcached_return_t ret= MEMCACHED_SUCCESS; memcached_st *root= (memcached_st *)ptr->root; if (memcached_is_purging(ptr->root) || /* already purging */ @@ -51,7 +50,7 @@ memcached_return_t memcached_purge(memcached_server_write_instance_st ptr) (ptr->io_bytes_sent >= ptr->root->io_bytes_watermark && memcached_server_response_count(ptr) < 2)) { - return MEMCACHED_SUCCESS; + return true; } /* @@ -69,10 +68,12 @@ memcached_return_t memcached_purge(memcached_server_write_instance_st ptr) { memcached_set_purging(root, true); - return memcached_set_error(*ptr, MEMCACHED_WRITE_FAILURE, MEMCACHED_AT); + memcached_set_error(*ptr, MEMCACHED_WRITE_FAILURE, MEMCACHED_AT); + return false; } WATCHPOINT_ASSERT(ptr->fd != INVALID_SOCKET); + bool is_successful= true; uint32_t no_msg= memcached_server_response_count(ptr) - 1; if (no_msg > 0) { @@ -103,10 +104,7 @@ memcached_return_t memcached_purge(memcached_server_write_instance_st ptr) { WATCHPOINT_ERROR(rc); memcached_io_reset(ptr); - ret= rc; -#if 0 - ret= memcached_set_error(*ptr, rc, MEMCACHED_AT); -#endif + is_successful= false; } if (ptr->root->callbacks != NULL) @@ -130,5 +128,5 @@ memcached_return_t memcached_purge(memcached_server_write_instance_st ptr) } memcached_set_purging(root, false); - return ret; + return is_successful; } |