diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-07-17 22:30:28 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-07-17 22:30:28 +0000 |
| commit | 40ce5e0d18520cd7a440cd8849e3e920be68f471 (patch) | |
| tree | 5499af489ac45954318119e4294811be3da06dff /tests/test_stasis_endpoints.c | |
| parent | da1902cdc060763a712bb1586cfca5ec1e9a2c49 (diff) | |
Change ast_hangup() to return void and be NULL safe.
Since ast_hangup() is effectively a channel destructor, it should be a
void function.
* Make the few silly callers checking the return value no longer do so.
Only the CDR and CEL unit tests checked the return value.
* Make all callers take advantage of the NULL safe change and remove the
NULL check before the call.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@394623 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'tests/test_stasis_endpoints.c')
| -rw-r--r-- | tests/test_stasis_endpoints.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/tests/test_stasis_endpoints.c b/tests/test_stasis_endpoints.c index c6cafd6ad..9fe3ecfad 100644 --- a/tests/test_stasis_endpoints.c +++ b/tests/test_stasis_endpoints.c @@ -45,14 +45,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") static const char *test_category = "/stasis/endpoints/"; -static void safe_channel_hangup(struct ast_channel *chan) -{ - if (!chan) { - return; - } - ast_hangup(chan); -} - /*! \brief Message matcher looking for cache update messages */ static int cache_update(struct stasis_message *msg, const void *data) { struct stasis_cache_update *update; @@ -79,7 +71,7 @@ static int cache_update(struct stasis_message *msg, const void *data) { AST_TEST_DEFINE(state_changes) { RAII_VAR(struct ast_endpoint *, uut, NULL, ast_endpoint_shutdown); - RAII_VAR(struct ast_channel *, chan, NULL, safe_channel_hangup); + RAII_VAR(struct ast_channel *, chan, NULL, ast_hangup); RAII_VAR(struct stasis_message_sink *, sink, NULL, ao2_cleanup); RAII_VAR(struct stasis_subscription *, sub, NULL, stasis_unsubscribe); struct stasis_message *msg; @@ -135,7 +127,7 @@ AST_TEST_DEFINE(state_changes) AST_TEST_DEFINE(cache_clear) { RAII_VAR(struct ast_endpoint *, uut, NULL, ast_endpoint_shutdown); - RAII_VAR(struct ast_channel *, chan, NULL, safe_channel_hangup); + RAII_VAR(struct ast_channel *, chan, NULL, ast_hangup); RAII_VAR(struct stasis_message_sink *, sink, NULL, ao2_cleanup); RAII_VAR(struct stasis_subscription *, sub, NULL, stasis_unsubscribe); struct stasis_message *msg; @@ -211,7 +203,7 @@ AST_TEST_DEFINE(cache_clear) AST_TEST_DEFINE(channel_messages) { RAII_VAR(struct ast_endpoint *, uut, NULL, ast_endpoint_shutdown); - RAII_VAR(struct ast_channel *, chan, NULL, safe_channel_hangup); + RAII_VAR(struct ast_channel *, chan, NULL, ast_hangup); RAII_VAR(struct stasis_message_sink *, sink, NULL, ao2_cleanup); RAII_VAR(struct stasis_subscription *, sub, NULL, stasis_unsubscribe); struct stasis_message *msg; @@ -261,7 +253,7 @@ AST_TEST_DEFINE(channel_messages) actual_snapshot = stasis_message_data(msg); ast_test_validate(test, 1 == actual_snapshot->num_channels); - safe_channel_hangup(chan); + ast_hangup(chan); chan = NULL; actual_count = stasis_message_sink_wait_for_count(sink, 5, |