Index: apps/app_chanisavail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_chanisavail.c,v
retrieving revision 1.30
diff -u -r1.30 app_chanisavail.c
--- apps/app_chanisavail.c	8 Nov 2005 04:48:00 -0000	1.30
+++ apps/app_chanisavail.c	9 Nov 2005 15:20:34 -0000
@@ -74,8 +74,12 @@
 	int res=-1, inuse=-1, option_state=0, priority_jump=0;
 	int status;
 	struct localuser *u;
-	char *info, tmp[512], trychan[512], *peers, *tech, *number, *rest, *cur, *options, *stringp;
+	char *info, tmp[512], trychan[512], *peers, *tech, *number, *rest, *cur;
 	struct ast_channel *tempchan;
+	AST_DECLARE_APP_ARGS(args,
+		AST_APP_ARG(reqchans);
+		AST_APP_ARG(options);
+	);
 
 	if (ast_strlen_zero(data)) {
 		ast_log(LOG_WARNING, "ChanIsAvail requires an argument (Zap/1&Zap/2)\n");
@@ -85,16 +89,16 @@
 	LOCAL_USER_ADD(u);
 
 	info = ast_strdupa(data); 
-	stringp = info;
-	strsep(&stringp, "|");
-	options = strsep(&stringp, "|");
-	if (options) {
-		if (strchr(options, 's'))
+
+	AST_STANDARD_APP_ARGS(args, info);
+
+	if (args.options) {
+		if (strchr(args.options, 's'))
 			option_state = 1;
-		if (strchr(options, 'j'))
+		if (strchr(args.options, 'j'))
 			priority_jump = 1;
 	}
-	peers = info;
+	peers = args.reqchans;
 	if (peers) {
 		cur = peers;
 		do {