diff options
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_dahdi.c | 6 | ||||
| -rw-r--r-- | channels/chan_motif.c | 1 | ||||
| -rw-r--r-- | channels/sig_analog.c | 4 |
3 files changed, 3 insertions, 8 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index c22833da5..7673a6436 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -120,7 +120,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/stringfields.h" #include "asterisk/abstract_jb.h" #include "asterisk/smdi.h" -#include "asterisk/astobj.h" #include "asterisk/devicestate.h" #include "asterisk/paths.h" #include "asterisk/ccss.h" @@ -5525,7 +5524,7 @@ static void destroy_dahdi_pvt(struct dahdi_pvt *pvt) } ast_free(p->cidspill); if (p->use_smdi) { - ast_smdi_interface_unref(p->smdi_iface); + ao2_cleanup(p->smdi_iface); } if (p->mwi_event_sub) { p->mwi_event_sub = stasis_unsubscribe(p->mwi_event_sub); @@ -10525,8 +10524,7 @@ static void *analog_ss_thread(void *data) ast_shrink_phone_number(number); ast_set_callerid(chan, number, name, number); - if (smdi_msg) - ASTOBJ_UNREF(smdi_msg, ast_smdi_md_message_destroy); + ao2_cleanup(smdi_msg); if (cs) callerid_free(cs); diff --git a/channels/chan_motif.c b/channels/chan_motif.c index 4b1d7d26b..1bdc8aa6b 100644 --- a/channels/chan_motif.c +++ b/channels/chan_motif.c @@ -73,7 +73,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/stringfields.h" #include "asterisk/utils.h" #include "asterisk/causes.h" -#include "asterisk/astobj.h" #include "asterisk/abstract_jb.h" #include "asterisk/xmpp.h" #include "asterisk/stasis_channels.h" diff --git a/channels/sig_analog.c b/channels/sig_analog.c index 9957074d1..140f5093b 100644 --- a/channels/sig_analog.c +++ b/channels/sig_analog.c @@ -2638,9 +2638,7 @@ static void *__analog_ss_thread(void *data) } ast_hangup(chan); quit: - if (smdi_msg) { - ASTOBJ_UNREF(smdi_msg, ast_smdi_md_message_destroy); - } + ao2_cleanup(smdi_msg); analog_decrease_ss_count(); return NULL; } |