diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2017-10-03 16:09:58 -0500 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2017-10-09 13:34:10 -0500 |
| commit | d1b63e232330023e42e92e3e1f3b947624fcd399 (patch) | |
| tree | 489afb1552fa3871ef78efb80122a51c2c2d9b9d | |
| parent | 5b4fc0699a52dc60efa9a635a2aa175d05bff634 (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
| -rw-r--r-- | main/cdr.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/main/cdr.c b/main/cdr.c index 4bcfc05b3..f313f0b63 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -1626,11 +1626,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 */ @@ -1826,10 +1824,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 */ |