diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-15 21:33:23 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-15 21:33:23 +0000 |
commit | 543dfaba451186cf91277ba5a23f81015da28f6f (patch) | |
tree | 3494c31fcfc1323b4a9c624975443eaccd0bfc23 /include | |
parent | 2534bedef6e089f5137b782e8c163ebc77602e39 (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.1@257594 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rw-r--r-- | include/asterisk/app.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asterisk/app.h b/include/asterisk/app.h index 497c99ee4..b311258cd 100644 --- a/include/asterisk/app.h +++ b/include/asterisk/app.h @@ -481,8 +481,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; } } |