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_cdr.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_cdr.c')
| -rw-r--r-- | tests/test_cdr.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/tests/test_cdr.c b/tests/test_cdr.c index a60f78e2c..670334c13 100644 --- a/tests/test_cdr.c +++ b/tests/test_cdr.c @@ -278,11 +278,12 @@ static void clear_mock_cdr_backend(void) } while (0) /*! \brief Hang up a test channel safely */ -#define HANGUP_CHANNEL(channel, cause) do { \ - ast_channel_hangupcause_set((channel), (cause)); \ - if (!ast_hangup((channel))) { \ +#define HANGUP_CHANNEL(channel, cause) \ + do { \ + ast_channel_hangupcause_set((channel), (cause)); \ + ast_hangup(channel); \ channel = NULL; \ - } } while (0) + } while (0) static enum ast_test_result_state verify_mock_cdr_record(struct ast_test *test, struct ast_cdr *expected, int record) { @@ -2201,9 +2202,8 @@ AST_TEST_DEFINE(test_cdr_fields) /* Hang up and verify */ ast_channel_hangupcause_set(chan, AST_CAUSE_NORMAL); - if (!ast_hangup(chan)) { - chan = NULL; - } + ast_hangup(chan); + chan = NULL; result = verify_mock_cdr_record(test, expected, 3); return result; @@ -2272,9 +2272,8 @@ AST_TEST_DEFINE(test_cdr_no_reset_cdr) ast_test_validate(test, ast_cdr_fork(ast_channel_name(chan), &fork_options) == 0); ast_channel_hangupcause_set(chan, AST_CAUSE_NORMAL); - if (!ast_hangup(chan)) { - chan = NULL; - } + ast_hangup(chan); + chan = NULL; result = verify_mock_cdr_record(test, &expected, 1); return result; @@ -2395,9 +2394,8 @@ AST_TEST_DEFINE(test_cdr_fork_cdr) ast_test_validate(test, strcmp(fork_answer_time, answer_time) != 0); ast_channel_hangupcause_set(chan, AST_CAUSE_NORMAL); - if (!ast_hangup(chan)) { - chan = NULL; - } + ast_hangup(chan); + chan = NULL; result = verify_mock_cdr_record(test, expected, 3); return result; |