From: Kinsey Moore <kmoore@digium.com>
Date: Wed, 22 Jan 2014 14:01:07 +0000 (+0000)
Subject: res_stasis_playback: Correct error argument order
X-Git-Tag: 13.0.0-beta1~623
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=761d7271d4c1c4eeb97dfbbfd9bae7992023967f;p=thirdparty%2Fasterisk.git

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@406153 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_stasis_playback.c b/res/res_stasis_playback.c
index f6cd5404e2..c08c2fa400 100644
--- a/res/res_stasis_playback.c
+++ b/res/res_stasis_playback.c
@@ -320,7 +320,7 @@ static void play_on_channel(struct stasis_app_playback *playback,
 
 		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 @@ static void play_on_channel(struct stasis_app_playback *playback,
 
 		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 @@ static void play_on_channel(struct stasis_app_playback *playback,
 	} 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;
 	}