[asterisk-commits] file: branch 1.4 r74815 - in /branches/1.4: ./ res/res_musiconhold.c

[SVN commits to the Asterisk project]

Author: file
Date: Thu Jul 12 10:53:55 2007
New Revision: 74815

URL: http://svn.digium.com/view/asterisk?view=rev&rev=74815
Log:
Merged revisions 74814 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r74814 | file | 2007-07-12 12:51:24 -0300 (Thu, 12 Jul 2007) | 2 lines

Only print out a warning for situations where it is actually helpful. (issue #10187 reported by denke)

........

Modified:
    branches/1.4/   (props changed)
    branches/1.4/res/res_musiconhold.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/res/res_musiconhold.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/res/res_musiconhold.c?view=diff&rev=74815&r1=74814&r2=74815
==============================================================================
--- branches/1.4/res/res_musiconhold.c (original)
+++ branches/1.4/res/res_musiconhold.c Thu Jul 12 10:53:55 2007
@@ -625,7 +625,7 @@
 }
 
 /*! \note This function should be called with the mohclasses list locked */
-static struct mohclass *get_mohbyname(const char *name)
+static struct mohclass *get_mohbyname(const char *name, int warn)
 {
 	struct mohclass *moh = NULL;
 
@@ -634,7 +634,7 @@
 			break;
 	}
 
-	if (!moh)
+	if (!moh && warn)
 		ast_log(LOG_WARNING, "Music on Hold class '%s' not found\n", name);
 
 	return moh;
@@ -842,7 +842,7 @@
 	int x;
 #endif
 	AST_LIST_LOCK(&mohclasses);
-	if (get_mohbyname(moh->name)) {
+	if (get_mohbyname(moh->name, 0)) {
 		if (reload) {
 			ast_log(LOG_DEBUG, "Music on Hold class '%s' left alone from initial load.\n", moh->name);
 		} else {
@@ -934,13 +934,13 @@
 	 */
 	AST_LIST_LOCK(&mohclasses);
 	if (!ast_strlen_zero(chan->musicclass))
-		mohclass = get_mohbyname(chan->musicclass);
+		mohclass = get_mohbyname(chan->musicclass, 1);
 	if (!mohclass && !ast_strlen_zero(mclass))
-		mohclass = get_mohbyname(mclass);
+		mohclass = get_mohbyname(mclass, 1);
 	if (!mohclass && !ast_strlen_zero(interpclass))
-		mohclass = get_mohbyname(interpclass);
+		mohclass = get_mohbyname(interpclass, 1);
 	if (!mohclass)	
-		mohclass = get_mohbyname("default");
+		mohclass = get_mohbyname("default", 1);
 	AST_LIST_UNLOCK(&mohclasses);
 
 	if (!mohclass)
@@ -1060,7 +1060,7 @@
 			args = strchr(data, ',');
 			if (args)
 				*args++ = '\0';
-			if (!(get_mohbyname(var->name))) {			
+			if (!(get_mohbyname(var->name, 0))) {			
 				if (!(class = moh_class_malloc())) {
 					return numclasses;
 				}
@@ -1083,7 +1083,7 @@
 			ast_log(LOG_WARNING, "The old musiconhold.conf syntax has been deprecated!  Please refer to the sample configuration for information on the new syntax.\n");
 			dep_warning = 1;
 		}
-		if (!(get_mohbyname(var->name))) {
+		if (!(get_mohbyname(var->name, 0))) {
 			args = strchr(var->value, ',');
 			if (args)
 				*args++ = '\0';