aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-04-15 21:34:11 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-04-15 21:34:11 +0000
commit425ee4849782a5b04664913c99c14c318d352504 (patch)
treec140a9417031f402518b9ee3b3ad494d50f82ec6 /include
parent5a7b314365c95154657df3d632e97f08343dd3e0 (diff)
Merged revisions 257560 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r257560 | tilghman | 2010-04-15 16:26:19 -0500 (Thu, 15 Apr 2010) | 13 lines Merged revisions 257544 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r257544 | tilghman | 2010-04-15 16:23:24 -0500 (Thu, 15 Apr 2010) | 6 lines Allow application options with arguments to contain parentheses, through a variety of escaping techniques. Fixes SWP-1194 (ABE-2143). Review: https://reviewboard.asterisk.org/r/604/ ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@257597 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rw-r--r--include/asterisk/app.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asterisk/app.h b/include/asterisk/app.h
index ffec5c427..cd29b11a5 100644
--- a/include/asterisk/app.h
+++ b/include/asterisk/app.h
@@ -486,8 +486,7 @@ struct ast_app_option {
... do any argument parsing here ...
- if (ast_parseoptions(my_app_options, &opts, opt_args, options)) {
- ast_module_user_remove(u);
+ if (ast_app_parse_options(my_app_options, &opts, opt_args, options)) {
return -1;
}
}