[svn-commits] kmoore: trunk r406153 - in /trunk: ./ res/res_stasis_playback.c

[SVN commits to the Digium repositories]

Author: kmoore
Date: Wed Jan 22 08:01:07 2014
New Revision: 406153

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=406153
Log:
res_stasis_playback: Correct error argument order

Several of the playback error messages for invalid media input in
res_stasis_playback.c had the media name and channel name reversed.
They now correctly identify the channel name and media name.

Reported by: skrusty
........

Merged revisions 406152 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/res/res_stasis_playback.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/res/res_stasis_playback.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_stasis_playback.c?view=diff&rev=406153&r1=406152&r2=406153
==============================================================================
--- trunk/res/res_stasis_playback.c (original)
+++ trunk/res/res_stasis_playback.c Wed Jan 22 08:01:07 2014
@@ -320,7 +320,7 @@
 
 		if (!recording) {
 			ast_log(LOG_ERROR, "Attempted to play recording '%s' on channel '%s' but recording does not exist",
-				ast_channel_name(chan), relname);
+				relname, ast_channel_name(chan));
 			return;
 		}
 
@@ -334,7 +334,7 @@
 
 		if (sscanf(playback->media + strlen(NUMBER_URI_SCHEME), "%30d", &number) != 1) {
 			ast_log(LOG_ERROR, "Attempted to play number '%s' on channel '%s' but number is invalid",
-				ast_channel_name(chan), playback->media + strlen(NUMBER_URI_SCHEME));
+				playback->media + strlen(NUMBER_URI_SCHEME), ast_channel_name(chan));
 			return;
 		}
 
@@ -348,7 +348,7 @@
 	} else {
 		/* Play URL */
 		ast_log(LOG_ERROR, "Attempted to play URI '%s' on channel '%s' but scheme is unsupported",
-			ast_channel_name(chan), playback->media);
+			playback->media, ast_channel_name(chan));
 		return;
 	}