[asterisk-commits] russell: branch russell/ast_verbose_threadstorage r39271 - in /team/russell/a...

[asterisk-commits at lists.digium.com]

Author: russell
Date: Mon Aug  7 23:51:50 2006
New Revision: 39271

URL: http://svn.digium.com/view/asterisk?rev=39271&view=rev
Log:
updates for new function and constant names ...

Modified:
    team/russell/ast_verbose_threadstorage/cli.c
    team/russell/ast_verbose_threadstorage/include/asterisk/threadstorage.h
    team/russell/ast_verbose_threadstorage/logger.c

Modified: team/russell/ast_verbose_threadstorage/cli.c
URL: http://svn.digium.com/view/asterisk/team/russell/ast_verbose_threadstorage/cli.c?rev=39271&r1=39270&r2=39271&view=diff
==============================================================================
--- team/russell/ast_verbose_threadstorage/cli.c (original)
+++ team/russell/ast_verbose_threadstorage/cli.c Mon Aug  7 23:51:50 2006
@@ -70,7 +70,7 @@
 	res = ast_dynamic_str_thread_set_va(&buf, 0, &ast_cli_buf, fmt, ap);
 	va_end(ap);
 
-	if (res != AST_DYNSTR_SET_FAILED)
+	if (res != AST_DYNSTR_BUILD_FAILED)
 		ast_carefulwrite(fd, buf->str, strlen(buf->str), 100);
 }
 

Modified: team/russell/ast_verbose_threadstorage/include/asterisk/threadstorage.h
URL: http://svn.digium.com/view/asterisk/team/russell/ast_verbose_threadstorage/include/asterisk/threadstorage.h?rev=39271&r1=39270&r2=39271&view=diff
==============================================================================
--- team/russell/ast_verbose_threadstorage/include/asterisk/threadstorage.h (original)
+++ team/russell/ast_verbose_threadstorage/include/asterisk/threadstorage.h Mon Aug  7 23:51:50 2006
@@ -201,14 +201,14 @@
 )
 
 /*!
- * \brief Error codes from __ast_dynamic_str_thread_set_va()
+ * \brief Error codes from ast_dynamic_str_thread_build_va()
  */
 enum {
 	/*! An error has occured and the contents of the dynamic string
 	 *  are undefined */
 	AST_DYNSTR_BUILD_FAILED = -1,
 	/*! The buffer size for the dynamic string had to be increased, and
-	 *  __ast_dynamic_str_thread_set_va() needs to be called again after
+	 *  ast_dynamic_str_thread_build_va() needs to be called again after
 	 *  a va_end() and va_start().
 	 */
 	AST_DYNSTR_BUILD_RETRY = -2
@@ -258,8 +258,8 @@
 #define ast_dynamic_str_thread_set_va(buf, max_len, ts, fmt, ap)                 \
 	({                                                                       \
 		int __res;                                                       \
-		while ((__res = __ast_dynamic_str_thread_set_va(buf, max_len,    \
-			ts, 0, fmt, ap)) == AST_DYNSTR_BUILD_RETRY) {              \
+		while ((__res = ast_dynamic_str_thread_build_va(buf, max_len,    \
+			ts, 0, fmt, ap)) == AST_DYNSTR_BUILD_RETRY) {            \
 			va_end(ap);                                              \
 			va_start(ap, fmt);                                       \
 		}                                                                \
@@ -276,8 +276,8 @@
 #define ast_dynamic_str_thread_append_va(buf, max_len, ts, fmt, ap)              \
 	({                                                                       \
 		int __res;                                                       \
-		while ((__res = __ast_dynamic_str_thread_set_va(buf, max_len,    \
-			ts, 1, fmt, ap)) == AST_DYNSTR_BUILD_RETRY) {              \
+		while ((__res = ast_dynamic_str_thread_build_va(buf, max_len,    \
+			ts, 1, fmt, ap)) == AST_DYNSTR_BUILD_RETRY) {            \
 			va_end(ap);                                              \
 			va_start(ap, fmt);                                       \
 		}                                                                \

Modified: team/russell/ast_verbose_threadstorage/logger.c
URL: http://svn.digium.com/view/asterisk/team/russell/ast_verbose_threadstorage/logger.c?rev=39271&r1=39270&r2=39271&view=diff
==============================================================================
--- team/russell/ast_verbose_threadstorage/logger.c (original)
+++ team/russell/ast_verbose_threadstorage/logger.c Mon Aug  7 23:51:50 2006
@@ -754,7 +754,7 @@
 					va_start(ap, fmt);
 					res = ast_dynamic_str_thread_set_va(&buf, BUFSIZ, &log_buf, fmt, ap);
 					va_end(ap);
-					if (res != AST_DYNSTR_SET_FAILED)
+					if (res != AST_DYNSTR_BUILD_FAILED)
 						ast_console_puts_mutable(buf->str);
 				}
 			/* File channels */
@@ -778,7 +778,7 @@
 					va_start(ap, fmt);
 					res = ast_dynamic_str_thread_set_va(&buf, BUFSIZ, &log_buf, fmt, ap);
 					va_end(ap);
-					if (res != AST_DYNSTR_SET_FAILED) {
+					if (res != AST_DYNSTR_BUILD_FAILED) {
 						term_strip(buf->str, buf->str, buf->len);
 						fputs(buf->str, chan->fileptr);
 						fflush(chan->fileptr);
@@ -796,7 +796,7 @@
 			va_start(ap, fmt);
 			res = ast_dynamic_str_thread_set_va(&buf, BUFSIZ, &log_buf, fmt, ap);
 			va_end(ap);
-			if (res != AST_DYNSTR_SET_FAILED)
+			if (res != AST_DYNSTR_BUILD_FAILED)
 				fputs(buf->str, stdout);
 		}
 	}
@@ -868,7 +868,7 @@
 	res = ast_dynamic_str_thread_set_va(&buf, 0, &verbose_buf, fmt, ap);
 	va_end(ap);
 
-	if (res == AST_DYNSTR_SET_FAILED)
+	if (res == AST_DYNSTR_BUILD_FAILED)
 		return;
 
 	AST_LIST_LOCK(&verbosers);