[prev in list] [next in list] [prev in thread] [next in thread] 

List:       asterisk-commits
Subject:    [asterisk-commits] branch group/autoconf_and_menuselect r16806 -
From:       asterisk-commits () lists ! digium ! com (asterisk-commits () lists ! digium ! com)
Date:       2006-03-31 14:11:43
Message-ID: 20060331211201.71206A9F140 () abita ! digium ! internal
[Download RAW message or body]

Author: russell
Date: Fri Mar 31 15:11:59 2006
New Revision: 16806

URL: http://svn.digium.com/view/asterisk?rev=16806&view=rev
Log:
i dont know why automerge didn't fix this on its own :(

Modified:
    team/group/autoconf_and_menuselect/apps/app_exec.c

Modified: team/group/autoconf_and_menuselect/apps/app_exec.c
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/apps/app_exec.c?rev=16806&r1=16805&r2=16806&view=diff
 ==============================================================================
--- team/group/autoconf_and_menuselect/apps/app_exec.c (original)
+++ team/group/autoconf_and_menuselect/apps/app_exec.c Fri Mar 31 15:11:59 2006
@@ -72,18 +72,12 @@
 	/* Check and parse arguments */
 	if (data) {
 		if ((s = ast_strdupa(data))) {
-			endargs = strrchr(s, ')');
-			if (endargs)
-				*endargs = '\0';
-			pbx_substitute_variables_helper(chan, s, args, MAXRESULT - 1);
-		}
-		if (appname) {
-			app = pbx_findapp(appname);
-			if (app) {
-				res = pbx_exec(chan, app, args, 1);
-			} else {
-				ast_log(LOG_WARNING, "Could not find application (%s)\n", appname);
-				res = -1;
+			appname = strsep(&s, "(");
+			if (s) {
+				endargs = strrchr(s, ')');
+				if (endargs)
+					*endargs = '\0';
+				pbx_substitute_variables_helper(chan, s, args, MAXRESULT - 1);
 			}
 			if (appname) {
 				app = pbx_findapp(appname);


[prev in list] [next in list] [prev in thread] [next in thread]