From: Richard Mudgett <rmudgett@digium.com>
Date: Tue, 5 Feb 2013 18:13:09 +0000 (+0000)
Subject: Separate option_types[] from the struct definition.
X-Git-Tag: 13.0.0-beta1~2125
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=657aa491f00b7a3693ab8ddfb4623f516fda33b0;p=thirdparty%2Fasterisk.git

Separate option_types[] from the struct definition.

Updated the option_types[] doxygen comment.
........

Merged revisions 380853 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 380854 from http://svn.asterisk.org/svn/asterisk/branches/11


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

diff --git a/main/dial.c b/main/dial.c
index bbaee7ca60..52a2709708 100644
--- a/main/dial.c
+++ b/main/dial.c
@@ -167,12 +167,19 @@ static void answer_exec_run(struct ast_dial *dial, struct ast_dial_channel *dial
 	return;
 }
 
-/*! \brief Options structure - maps options to respective handlers (enable/disable). This list MUST be perfectly kept in order, or else madness will happen. */
-static const struct ast_option_types {
+struct ast_option_types {
 	enum ast_dial_option option;
 	ast_dial_option_cb_enable enable;
 	ast_dial_option_cb_disable disable;
-} option_types[] = {
+};
+
+/*!
+ * \brief Map options to respective handlers (enable/disable).
+ *
+ * \note This list MUST be perfectly kept in order with enum
+ * ast_dial_option, or else madness will happen.
+ */
+static const struct ast_option_types option_types[] = {
 	{ AST_DIAL_OPTION_RINGING, NULL, NULL },                                  /*!< Always indicate ringing to caller */
 	{ AST_DIAL_OPTION_ANSWER_EXEC, answer_exec_enable, answer_exec_disable }, /*!< Execute application upon answer in async mode */
 	{ AST_DIAL_OPTION_MUSIC, music_enable, music_disable },                   /*!< Play music to the caller instead of ringing */