From 56bcb97a3cae238a2ff06db2ff2a46e3dd04599f Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Mon, 7 Mar 2016 18:56:05 -0600 Subject: chan_sip.c: Simplify sip_pvt destructor call levels. Remove destructor calling destroy_it calling really_destroy_it for no benefit. Just make the destructor the really_destroy_it function. Change-Id: Idea0d47b27dd74f2488db75bcc7f353d8fdc614a --- channels/sip/include/dialog.h | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'channels/sip/include/dialog.h') diff --git a/channels/sip/include/dialog.h b/channels/sip/include/dialog.h index 582841d54..c0dfd605a 100644 --- a/channels/sip/include/dialog.h +++ b/channels/sip/include/dialog.h @@ -43,19 +43,6 @@ void sip_scheddestroy_final(struct sip_pvt *p, int ms); void sip_scheddestroy(struct sip_pvt *p, int ms); int sip_cancel_destroy(struct sip_pvt *p); -/*! \brief Destroy SIP call structure. - * Make it return NULL so the caller can do things like - * foo = sip_destroy(foo); - * and reduce the chance of bugs due to dangling pointers. - */ -struct sip_pvt *sip_destroy(struct sip_pvt *p); - -/*! \brief Destroy SIP call structure. - * Make it return NULL so the caller can do things like - * foo = sip_destroy(foo); - * and reduce the chance of bugs due to dangling pointers. - */ -void __sip_destroy(struct sip_pvt *p, int lockowner, int lockdialoglist); /*! * \brief Unlink a dialog from the dialogs container, as well as any other places * that it may be currently stored. -- cgit v1.2.3