<p>Corey Farrell has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/8575">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">core: Remove additional symbols.<br><br>Remove symbols that are depreacated and replaced:<br>* ast_channel_datastore_alloc<br>* ast_channel_datastore_free<br>* ast_channel_cmpwhentohangup<br>* ast_channel_setwhentohangup<br>* config_text_file_save<br>* devstate2str<br>* ast_device_state_changed<br>* ast_device_state_changed_literal<br>* ast_verbose_get_by_module<br><br>Remove unused symbols:<br>* channelreloadreason2txt (last used in Asterisk 12).<br><br>Remove unused ast_options flags:<br>* AST_OPT_FLAG_END_CDR_BEFORE_H_EXTEN / ast_opt_end_cdr_before_h_exten<br>* AST_OPT_FLAG_VERBOSE_MODULE / ast_opt_verb_module<br>* AST_OPT_FLAG_INITIATED_SECONDS<br><br>Change-Id: I841255995d195f8efc1ed47af9c7a2f131c08645<br>---<br>M include/asterisk/channel.h<br>M include/asterisk/config.h<br>M include/asterisk/devicestate.h<br>M include/asterisk/logger.h<br>M include/asterisk/options.h<br>M main/asterisk.exports.in<br>M main/channel.c<br>M main/cli.c<br>M main/config.c<br>M main/devicestate.c<br>M utils/extconf.c<br>11 files changed, 0 insertions(+), 190 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/75/8575/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h<br>index 8cb0380..16f9aa8 100644<br>--- a/include/asterisk/channel.h<br>+++ b/include/asterisk/channel.h<br>@@ -1144,22 +1144,6 @@<br> * take a channel argument.<br> */<br> <br>-/*!<br>- * \brief Create a channel data store object<br>- * \deprecated You should use the ast_datastore_alloc() generic function instead.<br>- * \version 1.6.1 deprecated<br>- */<br>-struct ast_datastore *ast_channel_datastore_alloc(const struct ast_datastore_info *info, const char *uid)<br>- __attribute__((deprecated));<br>-<br>-/*!<br>- * \brief Free a channel data store object<br>- * \deprecated You should use the ast_datastore_free() generic function instead.<br>- * \version 1.6.1 deprecated<br>- */<br>-int ast_channel_datastore_free(struct ast_datastore *datastore)<br>- __attribute__((deprecated));<br>-<br> /*! \brief Inherit datastores from a parent to a child. */<br> int ast_channel_datastore_inherit(struct ast_channel *from, struct ast_channel *to);<br> <br>@@ -1710,21 +1694,6 @@<br> <br> /*!<br> * \brief Compare a offset with the settings of when to hang a channel up<br>- * \param chan channel on which to check for hang up<br>- * \param offset offset in seconds from current time<br>- * \return 1, 0, or -1<br>- * \details<br>- * This function compares a offset from current time with the absolute time<br>- * out on a channel (when to hang up). If the absolute time out on a channel<br>- * is earlier than current time plus the offset, it returns 1, if the two<br>- * time values are equal, it return 0, otherwise, it return -1.<br>- * \sa ast_channel_cmpwhentohangup_tv()<br>- * \version 1.6.1 deprecated function (only had seconds precision)<br>- */<br>-int ast_channel_cmpwhentohangup(struct ast_channel *chan, time_t offset) __attribute__((deprecated));<br>-<br>-/*!<br>- * \brief Compare a offset with the settings of when to hang a channel up<br> * \param chan channel on which to check for hangup<br> * \param offset offset in seconds and microseconds from current time<br> * \return 1, 0, or -1<br>@@ -1735,23 +1704,6 @@<br> * \since 1.6.1<br> */<br> int ast_channel_cmpwhentohangup_tv(struct ast_channel *chan, struct timeval offset);<br>-<br>-/*!<br>- * \brief Set when to hang a channel up<br>- *<br>- * \param chan channel on which to check for hang up<br>- * \param offset offset in seconds relative to the current time of when to hang up<br>- *<br>- * \details<br>- * This function sets the absolute time out on a channel (when to hang up).<br>- *<br>- * \pre chan is locked<br>- *<br>- * \return Nothing<br>- * \sa ast_channel_setwhentohangup_tv()<br>- * \version 1.6.1 deprecated function (only had seconds precision)<br>- */<br>-void ast_channel_setwhentohangup(struct ast_channel *chan, time_t offset) __attribute__((deprecated));<br> <br> /*!<br> * \brief Set when to hang a channel up<br>@@ -2735,12 +2687,6 @@<br> <br> /*! \brief Print named call groups and named pickup groups */<br> char *ast_print_namedgroups(struct ast_str **buf, struct ast_namedgroups *groups);<br>-<br>-/*!<br>- * \brief Convert enum channelreloadreason to text string for manager event<br>- * \param reason The reason for reload (manager, cli, start etc)<br>- */<br>-const char *channelreloadreason2txt(enum channelreloadreason reason);<br> <br> /*! \brief return an ast_variable list of channeltypes */<br> struct ast_variable *ast_channeltype_list(void);<br>diff --git a/include/asterisk/config.h b/include/asterisk/config.h<br>index 8912840..ba9c196 100644<br>--- a/include/asterisk/config.h<br>+++ b/include/asterisk/config.h<br>@@ -994,7 +994,6 @@<br> * \return 0 on success or -1 on failure.<br> */<br> int ast_config_text_file_save(const char *filename, const struct ast_config *cfg, const char *generator);<br>-int config_text_file_save(const char *filename, const struct ast_config *cfg, const char *generator) __attribute__((deprecated));<br> <br> struct ast_config *ast_config_internal_load(const char *configfile, struct ast_config *cfg, struct ast_flags flags, const char *suggested_incl_file, const char *who_asked);<br> /*!<br>diff --git a/include/asterisk/devicestate.h b/include/asterisk/devicestate.h<br>index 4f9aa73..5b2f04d 100644<br>--- a/include/asterisk/devicestate.h<br>+++ b/include/asterisk/devicestate.h<br>@@ -86,7 +86,6 @@<br> *<br> * \param devstate Current device state<br> */<br>-const char *devstate2str(enum ast_device_state devstate) attribute_pure __attribute__((deprecated));<br> const char *ast_devstate2str(enum ast_device_state devstate) attribute_pure;<br> <br> /*!<br>@@ -165,41 +164,6 @@<br> * \retval -1 on failure<br> */<br> int ast_devstate_changed_literal(enum ast_device_state state, enum ast_devstate_cache cachable, const char *device);<br>-<br>-/*!<br>- * \brief Tells Asterisk the State for Device is changed.<br>- * (Accept change notification, add it to change queue.)<br>- *<br>- * \param fmt device name like a dial string with format parameters<br>- *<br>- * Asterisk polls the new extension states and calls the registered<br>- * callbacks for the changed extensions<br>- *<br>- * \retval 0 on success<br>- * \retval -1 on failure<br>- *<br>- * \note This is deprecated in favor of ast_devstate_changed()<br>- * \version 1.6.1 deprecated<br>- */<br>-int ast_device_state_changed(const char *fmt, ...)<br>- __attribute__((deprecated,format(printf, 1, 2)));<br>-<br>-/*!<br>- * \brief Tells Asterisk the State for Device is changed<br>- *<br>- * \param device device name like a dial string<br>- *<br>- * Asterisk polls the new extension states and calls the registered<br>- * callbacks for the changed extensions<br>- *<br>- * \retval 0 on success<br>- * \retval -1 on failure<br>- *<br>- * \note This is deprecated in favor of ast_devstate_changed_literal()<br>- * \version 1.6.1 deprecated<br>- */<br>-int ast_device_state_changed_literal(const char *device)<br>- __attribute__((deprecated));<br> <br> /*!<br> * \brief Add device state provider<br>diff --git a/include/asterisk/logger.h b/include/asterisk/logger.h<br>index 8b1e5fe..19abf73 100644<br>--- a/include/asterisk/logger.h<br>+++ b/include/asterisk/logger.h<br>@@ -310,14 +310,6 @@<br> unsigned int ast_debug_get_by_module(const char *module);<br> <br> /*!<br>- * \brief Get the verbose level for a module<br>- * \param module the name of module<br>- * \return the verbose level<br>- * \version 11.0.0 deprecated<br>- */<br>-unsigned int ast_verbose_get_by_module(const char *module) __attribute__((deprecated));<br>-<br>-/*!<br> * \brief Register a new logger level<br> * \param name The name of the level to be registered<br> * \retval -1 if an error occurs<br>diff --git a/include/asterisk/options.h b/include/asterisk/options.h<br>index 730fd68..74103e7 100644<br>--- a/include/asterisk/options.h<br>+++ b/include/asterisk/options.h<br>@@ -74,8 +74,6 @@<br> AST_OPT_FLAG_TRANSMIT_SILENCE = (1 << 17),<br> /*! Suppress some warnings */<br> AST_OPT_FLAG_DONT_WARN = (1 << 18),<br>- /*! End CDRs before the 'h' extension */<br>- AST_OPT_FLAG_END_CDR_BEFORE_H_EXTEN = (1 << 19),<br> /*! Reference Debugging */<br> AST_OPT_FLAG_REF_DEBUG = (1 << 20),<br> /*! Always fork, even if verbose or debug settings are non-zero */<br>@@ -84,12 +82,8 @@<br> AST_OPT_FLAG_MUTE = (1 << 22),<br> /*! There is a per-module debug setting */<br> AST_OPT_FLAG_DEBUG_MODULE = (1 << 23),<br>- /*! There is a per-module verbose setting */<br>- AST_OPT_FLAG_VERBOSE_MODULE = (1 << 24),<br> /*! Terminal colors should be adjusted for a light-colored background */<br> AST_OPT_FLAG_LIGHT_BACKGROUND = (1 << 25),<br>- /*! Count Initiated seconds in CDR's */<br>- AST_OPT_FLAG_INITIATED_SECONDS = (1 << 26),<br> /*! Force black background */<br> AST_OPT_FLAG_FORCE_BLACK_BACKGROUND = (1 << 27),<br> /*! Hide remote console connect messages on console */<br>@@ -123,11 +117,9 @@<br> #define ast_opt_reconnect ast_test_flag(&ast_options, AST_OPT_FLAG_RECONNECT)<br> #define ast_opt_transmit_silence ast_test_flag(&ast_options, AST_OPT_FLAG_TRANSMIT_SILENCE)<br> #define ast_opt_dont_warn ast_test_flag(&ast_options, AST_OPT_FLAG_DONT_WARN)<br>-#define ast_opt_end_cdr_before_h_exten ast_test_flag(&ast_options, AST_OPT_FLAG_END_CDR_BEFORE_H_EXTEN)<br> #define ast_opt_always_fork ast_test_flag(&ast_options, AST_OPT_FLAG_ALWAYS_FORK)<br> #define ast_opt_mute ast_test_flag(&ast_options, AST_OPT_FLAG_MUTE)<br> #define ast_opt_dbg_module ast_test_flag(&ast_options, AST_OPT_FLAG_DEBUG_MODULE)<br>-#define ast_opt_verb_module ast_test_flag(&ast_options, AST_OPT_FLAG_VERBOSE_MODULE)<br> #define ast_opt_light_background ast_test_flag(&ast_options, AST_OPT_FLAG_LIGHT_BACKGROUND)<br> #define ast_opt_force_black_background ast_test_flag(&ast_options, AST_OPT_FLAG_FORCE_BLACK_BACKGROUND)<br> #define ast_opt_hide_connect ast_test_flag(&ast_options, AST_OPT_FLAG_HIDE_CONSOLE_CONNECT)<br>diff --git a/main/asterisk.exports.in b/main/asterisk.exports.in<br>index b434d38..f3549e6 100644<br>--- a/main/asterisk.exports.in<br>+++ b/main/asterisk.exports.in<br>@@ -22,11 +22,8 @@<br> LINKER_SYMBOL_PREFIXio_*;<br> LINKER_SYMBOL_PREFIXjb_*;<br> LINKER_SYMBOL_PREFIXaes_*;<br>- LINKER_SYMBOL_PREFIXconfig_*;<br> LINKER_SYMBOL_PREFIXtdd_*;<br> LINKER_SYMBOL_PREFIXterm_*;<br>- LINKER_SYMBOL_PREFIXchannelreloadreason2txt;<br>- LINKER_SYMBOL_PREFIXdevstate2str;<br> LINKER_SYMBOL_PREFIXstrsep;<br> LINKER_SYMBOL_PREFIXsetenv;<br> LINKER_SYMBOL_PREFIXstasis_*;<br>diff --git a/main/channel.c b/main/channel.c<br>index 304fae1..1f5b7bf 100644<br>--- a/main/channel.c<br>+++ b/main/channel.c<br>@@ -520,12 +520,6 @@<br> return;<br> }<br> <br>-void ast_channel_setwhentohangup(struct ast_channel *chan, time_t offset)<br>-{<br>- struct timeval when = { offset, };<br>- ast_channel_setwhentohangup_tv(chan, when);<br>-}<br>-<br> /*! \brief Compare a offset with when to hangup channel */<br> int ast_channel_cmpwhentohangup_tv(struct ast_channel *chan, struct timeval offset)<br> {<br>@@ -540,12 +534,6 @@<br> whentohangup = ast_tvadd(offset, ast_tvnow());<br> <br> return ast_tvdiff_ms(whentohangup, *ast_channel_whentohangup(chan));<br>-}<br>-<br>-int ast_channel_cmpwhentohangup(struct ast_channel *chan, time_t offset)<br>-{<br>- struct timeval when = { offset, };<br>- return ast_channel_cmpwhentohangup_tv(chan, when);<br> }<br> <br> /*! \brief Register a new telephony channel in Asterisk */<br>@@ -2387,16 +2375,6 @@<br> }<br> <br> ast_channel_internal_cleanup(chan);<br>-}<br>-<br>-struct ast_datastore *ast_channel_datastore_alloc(const struct ast_datastore_info *info, const char *uid)<br>-{<br>- return ast_datastore_alloc(info, uid);<br>-}<br>-<br>-int ast_channel_datastore_free(struct ast_datastore *datastore)<br>-{<br>- return ast_datastore_free(datastore);<br> }<br> <br> int ast_channel_datastore_inherit(struct ast_channel *from, struct ast_channel *to)<br>@@ -8026,24 +8004,6 @@<br> ast_free(state);<br> }<br> <br>-<br>-/*! \ brief Convert channel reloadreason (ENUM) to text string for manager event */<br>-const char *channelreloadreason2txt(enum channelreloadreason reason)<br>-{<br>- switch (reason) {<br>- case CHANNEL_MODULE_LOAD:<br>- return "LOAD (Channel module load)";<br>-<br>- case CHANNEL_MODULE_RELOAD:<br>- return "RELOAD (Channel module reload)";<br>-<br>- case CHANNEL_CLI_RELOAD:<br>- return "CLIRELOAD (Channel module reload by CLI command)";<br>-<br>- default:<br>- return "MANAGERRELOAD (Channel module reload by manager)";<br>- }<br>-};<br> <br> /*<br> * Wrappers for various ast_say_*() functions that call the full version<br>diff --git a/main/cli.c b/main/cli.c<br>index e46d342..5730be1 100644<br>--- a/main/cli.c<br>+++ b/main/cli.c<br>@@ -148,11 +148,6 @@<br> return res;<br> }<br> <br>-unsigned int ast_verbose_get_by_module(const char *module)<br>-{<br>- return 0;<br>-}<br>-<br> /*! \internal<br> * \brief Check if the user with 'uid' and 'gid' is allow to execute 'command',<br> * if command starts with '_' then not check permissions, just permit<br>diff --git a/main/config.c b/main/config.c<br>index dfa6f09..e6474f6 100644<br>--- a/main/config.c<br>+++ b/main/config.c<br>@@ -2496,11 +2496,6 @@<br> fi->lineno = lineno + 1; /* Advance the file lineno */<br> }<br> <br>-int config_text_file_save(const char *configfile, const struct ast_config *cfg, const char *generator)<br>-{<br>- return ast_config_text_file_save2(configfile, cfg, generator, CONFIG_SAVE_FLAG_PRESERVE_EFFECTIVE_CONTEXT);<br>-}<br>-<br> int ast_config_text_file_save(const char *configfile, const struct ast_config *cfg, const char *generator)<br> {<br> return ast_config_text_file_save2(configfile, cfg, generator, CONFIG_SAVE_FLAG_PRESERVE_EFFECTIVE_CONTEXT);<br>diff --git a/main/devicestate.c b/main/devicestate.c<br>index 5df3449..637c05b 100644<br>--- a/main/devicestate.c<br>+++ b/main/devicestate.c<br>@@ -239,12 +239,6 @@<br> return devstatestring[devstate][0];<br> }<br> <br>-/* Deprecated interface (not prefixed with ast_) */<br>-const char *devstate2str(enum ast_device_state devstate)<br>-{<br>- return devstatestring[devstate][0];<br>-}<br>-<br> enum ast_device_state ast_state_chan2dev(enum ast_channel_state chanstate)<br> {<br> int i;<br>@@ -513,11 +507,6 @@<br> return 0;<br> }<br> <br>-int ast_device_state_changed_literal(const char *dev)<br>-{<br>- return ast_devstate_changed_literal(AST_DEVICE_UNKNOWN, AST_DEVSTATE_CACHABLE, dev);<br>-}<br>-<br> int ast_devstate_changed(enum ast_device_state state, enum ast_devstate_cache cachable, const char *fmt, ...)<br> {<br> char buf[AST_MAX_EXTENSION];<br>@@ -528,18 +517,6 @@<br> va_end(ap);<br> <br> return ast_devstate_changed_literal(state, cachable, buf);<br>-}<br>-<br>-int ast_device_state_changed(const char *fmt, ...)<br>-{<br>- char buf[AST_MAX_EXTENSION];<br>- va_list ap;<br>-<br>- va_start(ap, fmt);<br>- vsnprintf(buf, sizeof(buf), fmt, ap);<br>- va_end(ap);<br>-<br>- return ast_devstate_changed_literal(AST_DEVICE_UNKNOWN, AST_DEVSTATE_CACHABLE, buf);<br> }<br> <br> /*! \brief Go through the dev state change queue and update changes in the dev state thread */<br>diff --git a/utils/extconf.c b/utils/extconf.c<br>index 5b3a95b..6826f4f 100644<br>--- a/utils/extconf.c<br>+++ b/utils/extconf.c<br>@@ -1570,20 +1570,14 @@<br> AST_OPT_FLAG_TRANSMIT_SILENCE = (1 << 17),<br> /*! Suppress some warnings */<br> AST_OPT_FLAG_DONT_WARN = (1 << 18),<br>- /*! End CDRs before the 'h' extension */<br>- AST_OPT_FLAG_END_CDR_BEFORE_H_EXTEN = (1 << 19),<br> /*! Always fork, even if verbose or debug settings are non-zero */<br> AST_OPT_FLAG_ALWAYS_FORK = (1 << 21),<br> /*! Disable log/verbose output to remote consoles */<br> AST_OPT_FLAG_MUTE = (1 << 22),<br> /*! There is a per-file debug setting */<br> AST_OPT_FLAG_DEBUG_FILE = (1 << 23),<br>- /*! There is a per-file verbose setting */<br>- AST_OPT_FLAG_VERBOSE_FILE = (1 << 24),<br> /*! Terminal colors should be adjusted for a light-colored background */<br> AST_OPT_FLAG_LIGHT_BACKGROUND = (1 << 25),<br>- /*! Count Initiated seconds in CDR's */<br>- AST_OPT_FLAG_INITIATED_SECONDS = (1 << 26),<br> /*! Force black background */<br> AST_OPT_FLAG_FORCE_BLACK_BACKGROUND = (1 << 27),<br> };<br>@@ -1616,7 +1610,6 @@<br> #define ast_opt_reconnect ast_test_flag(&ast_options, AST_OPT_FLAG_RECONNECT)<br> #define ast_opt_transmit_silence ast_test_flag(&ast_options, AST_OPT_FLAG_TRANSMIT_SILENCE)<br> #define ast_opt_dont_warn ast_test_flag(&ast_options, AST_OPT_FLAG_DONT_WARN)<br>-#define ast_opt_end_cdr_before_h_exten ast_test_flag(&ast_options, AST_OPT_FLAG_END_CDR_BEFORE_H_EXTEN)<br> #define ast_opt_always_fork ast_test_flag(&ast_options, AST_OPT_FLAG_ALWAYS_FORK)<br> #define ast_opt_mute ast_test_flag(&ast_options, AST_OPT_FLAG_MUTE)<br> <br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/8575">change 8575</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/8575"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I841255995d195f8efc1ed47af9c7a2f131c08645 </div>
<div style="display:none"> Gerrit-Change-Number: 8575 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.com> </div>