From 6208cfee0ddc0b4365bd6514c5f1c337bc833723 Mon Sep 17 00:00:00 2001 From: Corey Farrell Date: Tue, 1 Apr 2014 20:43:57 +0000 Subject: [PATCH] app_voicemail: fix missing symbol ASTERISK-23391 caused a regression where the symbol 'defaultlanguage' was used by app_voicemail but not exported by main/asterisk. This change renames the variable to ast_defaultlanguage. The variable was already renamed in Asterisk 12+. (closes issue ASTERISK-23559) Reported by: Corey Farrell Review: https://reviewboard.asterisk.org/r/3408/ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@411633 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_voicemail.c | 2 +- include/asterisk/options.h | 2 +- main/asterisk.c | 6 +++--- main/channel.c | 2 +- utils/extconf.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 1fb5160ea0..79173f07b3 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -12046,7 +12046,7 @@ static int acf_vm_info(struct ast_channel *chan, const char *cmd, char *args, ch ast_copy_string(buf, vmu->pager, len); } else if (!strncasecmp(arg.attribute, "language", 8)) { const char *lang = S_OR(vmu->language, chan ? - ast_channel_language(chan) : defaultlanguage); + ast_channel_language(chan) : ast_defaultlanguage); ast_copy_string(buf, lang, len); } else if (!strncasecmp(arg.attribute, "locale", 6)) { ast_copy_string(buf, vmu->locale, len); diff --git a/include/asterisk/options.h b/include/asterisk/options.h index 73fa42bcec..749035ada7 100644 --- a/include/asterisk/options.h +++ b/include/asterisk/options.h @@ -162,7 +162,7 @@ extern double option_maxload; #if defined(HAVE_SYSINFO) extern long option_minmemfree; /*!< Minimum amount of free system memory - stop accepting calls if free memory falls below this watermark */ #endif -extern char defaultlanguage[]; +extern char ast_defaultlanguage[]; extern struct timeval ast_startuptime; extern struct timeval ast_lastreloadtime; diff --git a/main/asterisk.c b/main/asterisk.c index c2a08a62a4..c6c741f220 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -243,7 +243,7 @@ static char *remotehostname; struct console consoles[AST_MAX_CONNECTS]; -char defaultlanguage[MAX_LANGUAGE] = DEFAULT_LANGUAGE; +char ast_defaultlanguage[MAX_LANGUAGE] = DEFAULT_LANGUAGE; static int ast_el_add_history(char *); static int ast_el_read_history(char *); @@ -504,7 +504,7 @@ static char *handle_show_settings(struct ast_cli_entry *e, int cmd, struct ast_c ast_cli(a->fd, " System: %s/%s built by %s on %s %s\n", ast_build_os, ast_build_kernel, ast_build_user, ast_build_machine, ast_build_date); ast_cli(a->fd, " System name: %s\n", ast_config_AST_SYSTEM_NAME); ast_cli(a->fd, " Entity ID: %s\n", eid_str); - ast_cli(a->fd, " Default language: %s\n", defaultlanguage); + ast_cli(a->fd, " Default language: %s\n", ast_defaultlanguage); ast_cli(a->fd, " Language prefix: %s\n", ast_language_is_prefix ? "Enabled" : "Disabled"); ast_cli(a->fd, " User name and group: %s/%s\n", ast_config_AST_RUN_USER, ast_config_AST_RUN_GROUP); ast_cli(a->fd, " Executable includes: %s\n", ast_test_flag(&ast_options, AST_OPT_FLAG_EXEC_INCLUDES) ? "Enabled" : "Disabled"); @@ -3448,7 +3448,7 @@ static void ast_readconfig(void) } else if (!strcasecmp(v->name, "languageprefix")) { ast_language_is_prefix = ast_true(v->value); } else if (!strcasecmp(v->name, "defaultlanguage")) { - ast_copy_string(defaultlanguage, v->value, MAX_LANGUAGE); + ast_copy_string(ast_defaultlanguage, v->value, MAX_LANGUAGE); } else if (!strcasecmp(v->name, "lockmode")) { if (!strcasecmp(v->value, "lockfile")) { ast_set_lock_type(AST_LOCK_TYPE_LOCKFILE); diff --git a/main/channel.c b/main/channel.c index a100aea534..fb5ace9342 100644 --- a/main/channel.c +++ b/main/channel.c @@ -1129,7 +1129,7 @@ __ast_channel_alloc_ap(int needqueue, int state, const char *cid_num, const char AST_LIST_HEAD_INIT_NOLOCK(ast_channel_autochans(tmp)); - ast_channel_language_set(tmp, defaultlanguage); + ast_channel_language_set(tmp, ast_defaultlanguage); ast_channel_tech_set(tmp, &null_tech); diff --git a/utils/extconf.c b/utils/extconf.c index 643d70eea1..b1cca16688 100644 --- a/utils/extconf.c +++ b/utils/extconf.c @@ -1882,7 +1882,7 @@ extern int option_verbose; extern int option_debug; /*!< Debugging */ extern int option_maxcalls; /*!< Maximum number of simultaneous channels */ extern double option_maxload; -extern char defaultlanguage[]; +extern char ast_defaultlanguage[]; extern pid_t ast_mainpid;