From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 8 Nov 2005 03:41:10 +0000 (+0000)
Subject: fix application options that take arguments
X-Git-Tag: 1.2.0-rc1~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=869ae80f1648842eabd891caf8d4cd522f096827;p=thirdparty%2Fasterisk.git

fix application options that take arguments


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7020 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/ChangeLog b/ChangeLog
index 9696353074..8e5337b7d0 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-07  Russell Bryant  <russell@digium.com>
+
+	* include/asterisk/app.h: Increment the arg_index in the options structure to fix applicaiton options that have arguments to them
+
 2005-11-07  Kevin P. Fleming  <kpfleming@digium.com>
 
 	* manager.c (action_setvar): add support for setting global variables (issue #5571)
@@ -53,13 +57,21 @@
 2005-11-06  Russell Bryant <russell@digium.com>
 
 	* many files: alphabetize options in applicaiton descriptions
+
 	* channels/chan_iax2.c: Use an enum to define iax peer/user flags as well as the pvt structure state.  Use the ast_flags macros for checking or setting the state.
+
 	* sounds.txt: Add missing words from the description of the vm-opts prompt
+
 	* apps/app_externalivr.c: Add a space that fixes building on older versions of gcc
+
 	* many files: Add doxygen updates to categorize modules into groups. Convert a lot of comments over to doxygen style. Add some text giving a basic overview of channels.
+
 	* many files: Update applications to add an exit status variable, make priority jumping optional, and use new args parsing macros
+
 	* pbx.c cdr.c res/res_features.c apps/app_dial.c include/asterisk/cdr.h: Convert some built-in applications to use new args parsing macros.  Change ast_cdr_reset to take a pointer to an ast_flags structure instead of an integer for flags.
+
 	* channels/chan_agent.c: Don't loop forever on an invalid options string
+
 	* apps/app_disa.c apps/app_forkcdr.c: Fix to use correct arguments to ast_cdr_reset
 
 2005-11-05  Kevin P. Fleming  <kpfleming@digium.com>
diff --git a/include/asterisk/app.h b/include/asterisk/app.h
index 3c9c49e486..ef74f6543f 100755
--- a/include/asterisk/app.h
+++ b/include/asterisk/app.h
@@ -323,7 +323,7 @@ struct ast_app_option {
   \sa AST_APP_OPTIONS, ast_app_parse_options
  */
 #define AST_APP_OPTION_ARG(option, flagno, argno) \
-	[option] = { .flag = flagno, .arg_index = argno }
+	[option] = { .flag = flagno, .arg_index = argno + 1 }
 
 /*!
   \brief Parses a string containing application options and sets flags/arguments.