diff options
| author | Corey Farrell <git@cfware.com> | 2014-07-21 08:41:29 +0000 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2014-07-21 08:41:29 +0000 |
| commit | e04607f8a327363aed79e794bd5dc1cdbb9a54e8 (patch) | |
| tree | eedefb4f71f0e5d3e2963b111f12fecde99c4867 /channels/chan_dahdi.c | |
| parent | a2c912e9972c91973ea66902d217746133f96026 (diff) | |
res_smdi: convert to astobj2
Remove functions:
ast_smdi_interface_unref
ast_smdi_md_message_putback
ast_smdi_mwi_message_putback
ast_smdi_md_message destructor
ast_smdi_mwi_message destructor
Includes for astobj.h are removed everywhere it's possible.
ASTERISK-24066 #close
Review: https://reviewboard.asterisk.org/r/3758/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@419060 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_dahdi.c')
| -rw-r--r-- | channels/chan_dahdi.c | 6 |
1 files changed, 2 insertions, 4 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); |