diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-10-09 17:21:04 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-10-09 17:21:04 -0500 |
| commit | 521c73955b9da5a0b8f459b856a1d4eb3b063701 (patch) | |
| tree | edbfbc2866089aaa018ce23e2f93217ee7b8b4e1 | |
| parent | 596cf586e0e3bf26a87cf1f817feaaf8894ae145 (diff) | |
| parent | e43959cda7c9a5313bb8d599affa467bb0365462 (diff) | |
Merge "cdr.c: Replace inlined code with ao2_t_replace()" into 14
| -rw-r--r-- | main/cdr.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/main/cdr.c b/main/cdr.c index 4bcfc05b3..6a5b33cbd 100644 --- a/main/cdr.c +++ b/main/cdr.c @@ -754,11 +754,7 @@ static void free_variables(struct varshead *headp) */ static void cdr_object_snapshot_copy(struct cdr_object_snapshot *dst, struct cdr_object_snapshot *src) { - if (dst->snapshot) { - ao2_t_ref(dst->snapshot, -1, "release old snapshot during copy"); - } - dst->snapshot = src->snapshot; - ao2_t_ref(dst->snapshot, +1, "bump new snapshot during copy"); + ao2_t_replace(dst->snapshot, src->snapshot, "CDR snapshot copy"); strcpy(dst->userfield, src->userfield); dst->flags = src->flags; copy_variables(&dst->variables, &src->variables); @@ -1361,11 +1357,7 @@ static void cdr_object_swap_snapshot(struct cdr_object_snapshot *old_snapshot, struct ast_channel_snapshot *new_snapshot) { cdr_object_update_cid(old_snapshot, new_snapshot); - if (old_snapshot->snapshot) { - ao2_t_ref(old_snapshot->snapshot, -1, "Drop ref for swap"); - } - ao2_t_ref(new_snapshot, +1, "Bump ref for swap"); - old_snapshot->snapshot = new_snapshot; + ao2_t_replace(old_snapshot->snapshot, new_snapshot, "Swap CDR shapshot"); } /* BASE METHOD IMPLEMENTATIONS */ |