summaryrefslogtreecommitdiff
path: root/main/cdr.c
diff options
context:
space:
mode:
authorRichard Mudgett <rmudgett@digium.com>2017-10-03 16:09:58 -0500
committerRichard Mudgett <rmudgett@digium.com>2017-10-09 13:34:32 -0500
commitfdf9aacca3bc4fc2c04fab3f5bd6eb3c81cdb3c6 (patch)
treedcfce4bec687f69faea62f7f7f791f86f0bf0040 /main/cdr.c
parent13c1c72401b73465322540e73bf4022c3e5b927f (diff)
cdr.c: Replace redundant check with an ast_assert()
The only caller of cdr_object_fn_table.process_party_b() explicitly does the check before calling. Change-Id: Ib0c53cdf5048227842846e0df9d2c19117c45618
Diffstat (limited to 'main/cdr.c')
-rw-r--r--main/cdr.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/main/cdr.c b/main/cdr.c
index 1817e80a7..0703f9ecc 100644
--- a/main/cdr.c
+++ b/main/cdr.c
@@ -1623,11 +1623,9 @@ static int single_state_process_parking_bridge_enter(struct cdr_object *cdr, str
static void dial_state_process_party_b(struct cdr_object *cdr, struct ast_channel_snapshot *snapshot)
{
ast_assert(snapshot != NULL);
+ ast_assert(cdr->party_b.snapshot
+ && !strcasecmp(cdr->party_b.snapshot->name, snapshot->name));
- if (!cdr->party_b.snapshot
- || strcasecmp(cdr->party_b.snapshot->name, snapshot->name)) {
- return;
- }
cdr_object_swap_snapshot(&cdr->party_b, snapshot);
/* If party B hangs up, finalize this CDR */
@@ -1823,10 +1821,9 @@ static int dialed_pending_state_process_dial_begin(struct cdr_object *cdr, struc
static void bridge_state_process_party_b(struct cdr_object *cdr, struct ast_channel_snapshot *snapshot)
{
- if (!cdr->party_b.snapshot
- || strcasecmp(cdr->party_b.snapshot->name, snapshot->name)) {
- return;
- }
+ ast_assert(cdr->party_b.snapshot
+ && !strcasecmp(cdr->party_b.snapshot->name, snapshot->name));
+
cdr_object_swap_snapshot(&cdr->party_b, snapshot);
/* If party B hangs up, finalize this CDR */