diff options
| author | Matthew Jordan <mjordan@digium.com> | 2013-08-02 02:32:44 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2013-08-02 02:32:44 +0000 |
| commit | 38236e54a84c61194c30c92b923752f0dc816d57 (patch) | |
| tree | b27d3b73accfe81703eb5f706d1447a661986f5e /channels | |
| parent | 63a229e3695514bbb15cd5ee4674b6b5bb580f0b (diff) | |
Remove dead code from features.c; refactor pickup code into pickup.c
This patch does the following:
* It moves the pickup code out of features.c and into pickup.c
* It removes the vast majority of dead code out of features.c. In particular,
this includes the parking code.
(issue ASTERISK-22134)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396060 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_gtalk.c | 6 | ||||
| -rw-r--r-- | channels/chan_sip.c | 3 | ||||
| -rw-r--r-- | channels/chan_skinny.c | 2 | ||||
| -rw-r--r-- | channels/chan_unistim.c | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index 639de4749..fc1b75a53 100644 --- a/channels/chan_gtalk.c +++ b/channels/chan_gtalk.c @@ -85,7 +85,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/abstract_jb.h" #include "asterisk/jabber.h" #include "asterisk/jingle.h" -#include "asterisk/features.h" +#include "asterisk/parking.h" #include "asterisk/stasis_channels.h" #define GOOGLE_CONFIG "gtalk.conf" @@ -2319,8 +2319,8 @@ static int gtalk_load_config(void) * Module loading including tests for configuration or dependencies. * This function can return AST_MODULE_LOAD_FAILURE, AST_MODULE_LOAD_DECLINE, * or AST_MODULE_LOAD_SUCCESS. If a dependency or environment variable fails - * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the - * configuration file or other non-critical problem return + * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the + * configuration file or other non-critical problem return * AST_MODULE_LOAD_DECLINE. On success return AST_MODULE_LOAD_SUCCESS. */ static int load_module(void) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 1aa18b9c5..1b5f104e0 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -259,7 +259,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/cli.h" #include "asterisk/musiconhold.h" #include "asterisk/dsp.h" -#include "asterisk/features.h" +#include "asterisk/pickup.h" +#include "asterisk/parking.h" #include "asterisk/srv.h" #include "asterisk/astdb.h" #include "asterisk/causes.h" diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index c97451577..1237c7869 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -68,7 +68,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/manager.h" #include "asterisk/say.h" #include "asterisk/astdb.h" -#include "asterisk/features.h" +#include "asterisk/pickup.h" #include "asterisk/app.h" #include "asterisk/musiconhold.h" #include "asterisk/utils.h" diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c index fd0b40717..9b61cfefb 100644 --- a/channels/chan_unistim.c +++ b/channels/chan_unistim.c @@ -73,7 +73,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/musiconhold.h" #include "asterisk/causes.h" #include "asterisk/indications.h" -#include "asterisk/features.h" +#include "asterisk/pickup.h" #include "asterisk/astobj2.h" #include "asterisk/astdb.h" #include "asterisk/features_config.h" |