[svn-commits] coreyfarrell: branch 11 r411633 - in /branches/11: apps/ include/asterisk/ ma...

[SVN commits to the Digium repositories]

Author: coreyfarrell
Date: Tue Apr  1 15:43:57 2014
New Revision: 411633

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=411633
Log:
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/

Modified:
    branches/11/apps/app_voicemail.c
    branches/11/include/asterisk/options.h
    branches/11/main/asterisk.c
    branches/11/main/channel.c
    branches/11/utils/extconf.c

Modified: branches/11/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/apps/app_voicemail.c?view=diff&rev=411633&r1=411632&r2=411633
==============================================================================
--- branches/11/apps/app_voicemail.c (original)
+++ branches/11/apps/app_voicemail.c Tue Apr  1 15:43:57 2014
@@ -12046,7 +12046,7 @@
 			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);

Modified: branches/11/include/asterisk/options.h
URL: http://svnview.digium.com/svn/asterisk/branches/11/include/asterisk/options.h?view=diff&rev=411633&r1=411632&r2=411633
==============================================================================
--- branches/11/include/asterisk/options.h (original)
+++ branches/11/include/asterisk/options.h Tue Apr  1 15:43:57 2014
@@ -162,7 +162,7 @@
 #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;

Modified: branches/11/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/main/asterisk.c?view=diff&rev=411633&r1=411632&r2=411633
==============================================================================
--- branches/11/main/asterisk.c (original)
+++ branches/11/main/asterisk.c Tue Apr  1 15:43:57 2014
@@ -243,7 +243,7 @@
 
 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 @@
 	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 @@
 		} 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);

Modified: branches/11/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/main/channel.c?view=diff&rev=411633&r1=411632&r2=411633
==============================================================================
--- branches/11/main/channel.c (original)
+++ branches/11/main/channel.c Tue Apr  1 15:43:57 2014
@@ -1129,7 +1129,7 @@
 
 	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);
 

Modified: branches/11/utils/extconf.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/utils/extconf.c?view=diff&rev=411633&r1=411632&r2=411633
==============================================================================
--- branches/11/utils/extconf.c (original)
+++ branches/11/utils/extconf.c Tue Apr  1 15:43:57 2014
@@ -1882,7 +1882,7 @@
 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;