[svn-commits] rmudgett: trunk r380855 - in /trunk: ./ main/dial.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Tue Feb  5 12:13:09 2013
New Revision: 380855

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=380855
Log:
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

Modified:
    trunk/   (props changed)
    trunk/main/dial.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/main/dial.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/dial.c?view=diff&rev=380855&r1=380854&r2=380855
==============================================================================
--- trunk/main/dial.c (original)
+++ trunk/main/dial.c Tue Feb  5 12:13:09 2013
@@ -167,12 +167,19 @@
 	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 */