diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-10-09 19:51:35 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-10-09 19:51:35 -0500 |
| commit | d5b2f4c3463c459934e7f73ec7a0a79b7502d5b5 (patch) | |
| tree | 1d7b543f6672534416c00f2b1256dbd37c5202ca | |
| parent | 3f4cca8f468cb5cfdb0a6973cc0ffff4c3fab216 (diff) | |
| parent | d1b63e232330023e42e92e3e1f3b947624fcd399 (diff) | |
Merge "cdr.c: Replace redundant check with an ast_assert()" into 14
| -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 9cb57c2fd..ff0e4760e 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -1618,11 +1618,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 */ @@ -1818,10 +1816,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 */ |