[asterisk-commits] rmudgett: trunk r368675 - /trunk/apps/app_queue.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Jun  7 15:39:25 2012
New Revision: 368675

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=368675
Log:
Fix app_queue debug message use of args.options after the string has been parsed.

Modified:
    trunk/apps/app_queue.c

Modified: trunk/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_queue.c?view=diff&rev=368675&r1=368674&r2=368675
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Thu Jun  7 15:39:25 2012
@@ -6380,6 +6380,18 @@
 	parse = ast_strdupa(data);
 	AST_STANDARD_APP_ARGS(args, parse);
 
+	ast_debug(1, "queue: %s, options: %s, url: %s, announce: %s, timeout: %s, agi: %s, macro: %s, gosub: %s, rule: %s, position: %s\n",
+		args.queuename,
+		S_OR(args.options, ""),
+		S_OR(args.url, ""),
+		S_OR(args.announceoverride, ""),
+		S_OR(args.queuetimeoutstr, ""),
+		S_OR(args.agi, ""),
+		S_OR(args.macro, ""),
+		S_OR(args.gosub, ""),
+		S_OR(args.rule, ""),
+		S_OR(args.position, ""));
+
 	if (!ast_strlen_zero(args.options)) {
 		ast_app_parse_options(queue_exec_options, &opts, opt_args, args.options);
 	}
@@ -6457,8 +6469,8 @@
 		}
 	}
 
-	ast_debug(1, "queue: %s, options: %s, url: %s, announce: %s, expires: %ld, priority: %d\n",
-		args.queuename, args.options, args.url, args.announceoverride, (long)qe.expire, prio);
+	ast_debug(1, "queue: %s, expires: %ld, priority: %d\n",
+		args.queuename, (long)qe.expire, prio);
 
 	qe.chan = chan;
 	qe.prio = prio;