[asterisk-commits] jrose: trunk r328208 - in /trunk: ./ res/res_monitor.c

[SVN commits to the Asterisk project]

Author: jrose
Date: Thu Jul 14 14:56:19 2011
New Revision: 328208

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=328208
Log:
Merged revisions 328207 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.10

................
  r328207 | jrose | 2011-07-14 14:45:18 -0500 (Thu, 14 Jul 2011) | 13 lines
  
  Merged revisions 328205 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r328205 | jrose | 2011-07-14 14:21:02 -0500 (Thu, 14 Jul 2011) | 6 lines
    
    Monitor application arguments requirements fixed.
    
    Monitor was requiring options in spite of no individual option on Monitor being required.
    
    Review: https://reviewboard.asterisk.org/r/1320/
  ........
................

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

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.10-merged (original)
+++ branch-1.10-merged Thu Jul 14 14:56:19 2011
@@ -1,1 +1,1 @@
-/branches/1.10:1-328075,328120,328162
+/branches/1.10:1-328075,328120,328162,328207

Modified: trunk/res/res_monitor.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_monitor.c?view=diff&rev=328208&r1=328207&r2=328208
==============================================================================
--- trunk/res/res_monitor.c (original)
+++ trunk/res/res_monitor.c Thu Jul 14 14:56:19 2011
@@ -650,12 +650,6 @@
 		AST_APP_ARG(fname_base);
 		AST_APP_ARG(options);
 	);
-	
-	/* Parse arguments. */
-	if (ast_strlen_zero(data)) {
-		ast_log(LOG_ERROR, "Monitor requires an argument\n");
-		return 0;
-	}
 
 	parse = ast_strdupa(data);
 	AST_STANDARD_APP_ARGS(args, parse);
@@ -671,7 +665,9 @@
 			stream_action &= ~X_REC_OUT;
 	}
 
-	arg = strchr(args.format, ':');
+	if (args.format) {
+		arg = strchr(args.format, ':');
+	}
 	if (arg) {
 		*arg++ = 0;
 		urlprefix = arg;