diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-15 21:33:14 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-15 21:33:14 +0000 |
commit | fd44c1bbd794a9198aff91df368c88d8ea464e91 (patch) | |
tree | 9baa002b47ab1ab6b0b59fec9475762a6405912b /include/asterisk | |
parent | 9d39a834ea823f8fbea00fc5782e369bf74b454b (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.0@257592 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk')
-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 2fc2ebc04..7e21ca58c 100644 --- a/include/asterisk/app.h +++ b/include/asterisk/app.h @@ -425,8 +425,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; } } |