projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Just move the version forward.
[awesomized/libmemcached]
/
tests
/
libmemcached-1.0
/
pool.cc
diff --git
a/tests/libmemcached-1.0/pool.cc
b/tests/libmemcached-1.0/pool.cc
index 30cc9660a06e7ad1c244d50c01c1ee7464170d1a..ed290ab9281374488bc93c25964a62639e342f1f 100644
(file)
--- a/
tests/libmemcached-1.0/pool.cc
+++ b/
tests/libmemcached-1.0/pool.cc
@@
-243,10
+243,7
@@
struct test_pool_context_st {
static __attribute__((noreturn)) void* connection_release(void *arg)
{
test_pool_context_st *resource= static_cast<test_pool_context_st *>(arg);
static __attribute__((noreturn)) void* connection_release(void *arg)
{
test_pool_context_st *resource= static_cast<test_pool_context_st *>(arg);
- if (resource == NULL)
- {
- fatal_message("resource == NULL");
- }
+ FATAL_IF(resource == NULL);
// Release all of the memc we are holding
resource->rc= memcached_pool_release(resource->pool, resource->mmc);
// Release all of the memc we are holding
resource->rc= memcached_pool_release(resource->pool, resource->mmc);
@@
-396,17
+393,11
@@
static bool _running= false;
static void set_running(const bool arg)
{
int error;
static void set_running(const bool arg)
{
int error;
- if ((error= pthread_mutex_lock(&mutex)) != 0)
- {
- fatal_message(strerror(error));
- }
+ FATAL_IF_((error= pthread_mutex_lock(&mutex)) != 0, strerror(error));
_running= arg;
_running= arg;
- if ((error= pthread_mutex_unlock(&mutex)) != 0)
- {
- fatal_message(strerror(error));
- }
+ FATAL_IF_((error= pthread_mutex_unlock(&mutex)) != 0, strerror(error));
}
static bool running()
}
static bool running()
@@
-414,17
+405,11
@@
static bool running()
int error;
bool ret;
int error;
bool ret;
- if ((error= pthread_mutex_lock(&mutex)) != 0)
- {
- fatal_message(strerror(error));
- }
+ FATAL_IF_((error= pthread_mutex_lock(&mutex)) != 0, strerror(error));
ret= _running;
ret= _running;
- if ((error= pthread_mutex_unlock(&mutex)) != 0)
- {
- fatal_message(strerror(error));
- }
+ FATAL_IF_((error= pthread_mutex_unlock(&mutex)) != 0, strerror(error));
return ret;
}
return ret;
}
@@
-504,15
+489,9
@@
test_return_t regression_bug_962815(memcached_st *memc)
test_compare(0, pthread_join(pid[x], NULL));
}
test_compare(0, pthread_join(pid[x], NULL));
}
- if (pool)
- {
- memcached_pool_destroy(pool);
- }
+ memcached_pool_destroy(pool);
- if (master)
- {
- memcached_free(master);
- }
+ memcached_free(master);
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}