diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-10-09 20:04:33 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-10-09 20:04:33 -0500 |
| commit | 7d9fa0bea474edd9a98a329ac44508d8bcf75aa0 (patch) | |
| tree | b479e42dcf43c07cb9c14f005b9f0f83a7a7ac31 | |
| parent | 70027059409cb042e40b68ee83d87cc5386160df (diff) | |
| parent | fdf9aacca3bc4fc2c04fab3f5bd6eb3c81cdb3c6 (diff) | |
Merge "cdr.c: Replace redundant check with an ast_assert()"
| -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 fe32d8e90..b94bbcfea 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -1616,11 +1616,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 */ @@ -1816,10 +1814,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 */ |