[svn-commits] russell: branch 1.6.2 r184707 - in /branches/1.6.2: ./ apps/ include/asterisk...

[SVN commits to the Digium repositories]

Author: russell
Date: Fri Mar 27 11:25:13 2009
New Revision: 184707

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=184707
Log:
Merged revisions 184693 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r184693 | russell | 2009-03-27 11:21:10 -0500 (Fri, 27 Mar 2009) | 2 lines

Change global_app_buf to ast_str_thread_global_buf.

........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/apps/app_dumpchan.c
    branches/1.6.2/apps/app_queue.c
    branches/1.6.2/apps/app_voicemail.c
    branches/1.6.2/include/asterisk/app.h
    branches/1.6.2/main/app.c
    branches/1.6.2/main/cli.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/apps/app_dumpchan.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.2/apps/app_dumpchan.c?view=diff&rev=184707&r1=184706&r2=184707
==============================================================================
--- branches/1.6.2/apps/app_dumpchan.c (original)
+++ branches/1.6.2/apps/app_dumpchan.c Fri Mar 27 11:25:13 2009
@@ -149,7 +149,7 @@
 
 static int dumpchan_exec(struct ast_channel *chan, void *data)
 {
-	struct ast_str *vars = ast_str_thread_get(&global_app_buf, 16);
+	struct ast_str *vars = ast_str_thread_get(&ast_str_thread_global_buf, 16);
 	char info[1024];
 	int level = 0;
 	static char *line = "================================================================================";

Modified: branches/1.6.2/apps/app_queue.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.2/apps/app_queue.c?view=diff&rev=184707&r1=184706&r2=184707
==============================================================================
--- branches/1.6.2/apps/app_queue.c (original)
+++ branches/1.6.2/apps/app_queue.c Fri Mar 27 11:25:13 2009
@@ -2319,7 +2319,7 @@
 /*! \brief convert "\n" to "\nVariable: " ready for manager to use */
 static char *vars2manager(struct ast_channel *chan, char *vars, size_t len)
 {
-	struct ast_str *buf = ast_str_thread_get(&global_app_buf, len + 1);
+	struct ast_str *buf = ast_str_thread_get(&ast_str_thread_global_buf, len + 1);
 	char *tmp;
 
 	if (pbx_builtin_serialize_variables(chan, &buf)) {

Modified: branches/1.6.2/apps/app_voicemail.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.2/apps/app_voicemail.c?view=diff&rev=184707&r1=184706&r2=184707
==============================================================================
--- branches/1.6.2/apps/app_voicemail.c (original)
+++ branches/1.6.2/apps/app_voicemail.c Fri Mar 27 11:25:13 2009
@@ -10267,7 +10267,7 @@
 	char *current;
 
 	/* Add 16 for fudge factor */
-	struct ast_str *str = ast_str_thread_get(&global_app_buf, strlen(value) + 16);
+	struct ast_str *str = ast_str_thread_get(&ast_str_thread_global_buf, strlen(value) + 16);
 
 	ast_str_reset(str);
 	

Modified: branches/1.6.2/include/asterisk/app.h
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.2/include/asterisk/app.h?view=diff&rev=184707&r1=184706&r2=184707
==============================================================================
--- branches/1.6.2/include/asterisk/app.h (original)
+++ branches/1.6.2/include/asterisk/app.h Fri Mar 27 11:25:13 2009
@@ -32,7 +32,7 @@
 extern "C" {
 #endif
 
-AST_THREADSTORAGE_EXTERNAL(global_app_buf);
+AST_THREADSTORAGE_EXTERNAL(ast_str_thread_global_buf);
 
 /* IVR stuff */
 

Modified: branches/1.6.2/main/app.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.2/main/app.c?view=diff&rev=184707&r1=184706&r2=184707
==============================================================================
--- branches/1.6.2/main/app.c (original)
+++ branches/1.6.2/main/app.c Fri Mar 27 11:25:13 2009
@@ -52,7 +52,7 @@
 #include "asterisk/linkedlists.h"
 #include "asterisk/threadstorage.h"
 
-AST_THREADSTORAGE_PUBLIC(global_app_buf);
+AST_THREADSTORAGE_PUBLIC(ast_str_thread_global_buf);
 
 
 #define MAX_OTHER_FORMATS 10

Modified: branches/1.6.2/main/cli.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.2/main/cli.c?view=diff&rev=184707&r1=184706&r2=184707
==============================================================================
--- branches/1.6.2/main/cli.c (original)
+++ branches/1.6.2/main/cli.c Fri Mar 27 11:25:13 2009
@@ -1259,7 +1259,7 @@
 {
 	struct ast_channel *c=NULL;
 	struct timeval now;
-	struct ast_str *out = ast_str_thread_get(&global_app_buf, 16);
+	struct ast_str *out = ast_str_thread_get(&ast_str_thread_global_buf, 16);
 	char cdrtime[256];
 	char nf[256], wf[256], rf[256];
 	long elapsed_seconds=0;