[svn-commits] branch russell/config-macros - r7298 in /team/russell/config-macros: ./ chann...

[svn-commits at lists.digium.com]

Author: russell
Date: Fri Dec  2 18:31:33 2005
New Revision: 7298

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

........
r7294 | mattf | 2005-12-02 18:52:00 -0500 (Fri, 02 Dec 2005) | 2 lines

Fix all the warnings and errors for PRI to go to more logical places

........

Modified:
    team/russell/config-macros/   (props changed)
    team/russell/config-macros/channels/chan_iax2.c
    team/russell/config-macros/channels/chan_zap.c

Propchange: team/russell/config-macros/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Dec  2 18:31:33 2005
@@ -1,1 +1,1 @@
-/trunk:1-7276
+/trunk:1-7297

Modified: team/russell/config-macros/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/russell/config-macros/channels/chan_iax2.c?rev=7298&r1=7297&r2=7298&view=diff
==============================================================================
--- team/russell/config-macros/channels/chan_iax2.c (original)
+++ team/russell/config-macros/channels/chan_iax2.c Fri Dec  2 18:31:33 2005
@@ -8746,7 +8746,7 @@
 			if (!ast_context_find(regcontext))
 				ast_context_create(NULL, regcontext, channeltype);
 		} else if (!strcasecmp(v->name, "tos")) {
-			ast_str2tos(v->value, &tos, v->lineno, __FILE__);
+			ast_str2tos(v->value, &tos);
 		} else if (!strcasecmp(v->name, "accountcode")) {
 			ast_copy_string(accountcode, v->value, sizeof(accountcode));
 		} else if (!strcasecmp(v->name, "amaflags")) {

Modified: team/russell/config-macros/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/russell/config-macros/channels/chan_zap.c?rev=7298&r1=7297&r2=7298&view=diff
==============================================================================
--- team/russell/config-macros/channels/chan_zap.c (original)
+++ team/russell/config-macros/channels/chan_zap.c Fri Dec  2 18:31:33 2005
@@ -7890,13 +7890,13 @@
 		}
 		if ((dchan >= 0) && (span >= 0)) {
 			if (dchancount > 1)
-				ast_verbose("[Span %d D-Channel %d]%s", span, dchan, s);
+				ast_log(LOG_DEBUG, "[Span %d D-Channel %d]%s", span, dchan, s);
 			else
-				ast_verbose("%s", s);
+				ast_log(LOG_DEBUG, "%s", s);
 		} else
-			ast_verbose("PRI debug error: could not find pri associated it with debug message output\n");
+			ast_log(LOG_ERROR, "PRI debug error: could not find pri associated it with debug message output\n");
 	} else
-		ast_verbose("%s", s);
+		ast_log(LOG_DEBUG, "%s", s);
 
 	ast_mutex_lock(&pridebugfdlock);
 
@@ -7929,13 +7929,13 @@
 		}
 		if ((dchan >= 0) && (span >= 0)) {
 			if (dchancount > 1)
-				ast_log(LOG_WARNING, "[Span %d D-Channel %d] PRI: %s", span, dchan, s);
+				ast_log(LOG_ERROR, "[Span %d D-Channel %d] PRI: %s", span, dchan, s);
 			else
-				ast_verbose("%s", s);
+				ast_log(LOG_ERROR, "%s", s);
 		} else
-			ast_verbose("PRI debug error: could not find pri associated it with debug message output\n");
+			ast_log(LOG_ERROR, "PRI debug error: could not find pri associated it with debug message output\n");
 	} else
-		ast_log(LOG_WARNING, "%s", s);
+		ast_log(LOG_ERROR, "%s", s);
 
 	ast_mutex_lock(&pridebugfdlock);