doxygen: Fix doxygen errors

This patch fixes a number of errors and warning messages in the doxygen
log. Specifically, it addresses:
* A number of files incorrectly places a '\brief' tag immediately after
  a '\file' tag. Doing so emits a warning, as '\file' takes an optional
  argument specifying which file the doxygen comment is for. As '\brief'
  is not a file, doxygen was unamused.
* A grouping of Stasis Topics and Messages in rtp_engine.h was
  incorrectly terminated. We now correctly terminate the grouping, which
  prevents members of rtp_engine.h from showing up in the wrong group.
* Group indicators which are not part of the Stasis Topics and Messages
  group were removed. Group indicators without an \addtogroup or
  \ingroup have no meaning.

Change-Id: Ia1415ffec6767e27233ae1cae5ed5970de5656d4
This commit is contained in:
Matt Jordan
2015-05-17 07:15:15 -05:00
parent 908c6a51d6
commit d8698b7f3f
16 changed files with 32 additions and 44 deletions

View File

@@ -35,7 +35,7 @@
* modules in Asterisk. * modules in Asterisk.
* - CEL uses the \ref ast_event representation to pass information to registered * - CEL uses the \ref ast_event representation to pass information to registered
* backends. * backends.
* - The \file res_corosync module publishes \ref ast_event representations of * - The \file res_corosync.c module publishes \ref ast_event representations of
* information to other Asterisk instances in a cluster. * information to other Asterisk instances in a cluster.
* - Security event represent their event types and data using this system. * - Security event represent their event types and data using this system.
* - Theoretically, any \ref stasis message can use this system to pass * - Theoretically, any \ref stasis message can use this system to pass

View File

@@ -2316,7 +2316,7 @@ struct stasis_message_type *ast_rtp_rtcp_received_type(void);
*/ */
struct stasis_topic *ast_rtp_topic(void); struct stasis_topic *ast_rtp_topic(void);
/* }@ */ /* @} */
#if defined(__cplusplus) || defined(c_plusplus) #if defined(__cplusplus) || defined(c_plusplus)
} }

View File

@@ -20,7 +20,9 @@
#define ASTERISK_SEMAPHORE_H #define ASTERISK_SEMAPHORE_H
/*! /*!
* \file Asterisk semaphore API * \file
*
* \brief Asterisk semaphore API
* *
* This API is a thin wrapper around the POSIX semaphore API (when available), * This API is a thin wrapper around the POSIX semaphore API (when available),
* so see the POSIX documentation for further details. * so see the POSIX documentation for further details.

View File

@@ -173,8 +173,6 @@
#include "asterisk/utils.h" #include "asterisk/utils.h"
#include "asterisk/event.h" #include "asterisk/event.h"
/*! @{ */
/*! /*!
* \brief Metadata about a \ref stasis_message. * \brief Metadata about a \ref stasis_message.
* \since 12 * \since 12
@@ -451,10 +449,6 @@ struct ast_manager_event_blob *stasis_message_to_ami(
struct ast_event *stasis_message_to_event( struct ast_event *stasis_message_to_event(
struct stasis_message *message); struct stasis_message *message);
/*! @} */
/*! @{ */
/*! /*!
* \brief A topic to which messages may be posted, and subscribers, well, subscribe * \brief A topic to which messages may be posted, and subscribers, well, subscribe
* \since 12 * \since 12
@@ -508,10 +502,6 @@ void stasis_publish(struct stasis_topic *topic, struct stasis_message *message);
*/ */
void stasis_publish_sync(struct stasis_subscription *sub, struct stasis_message *message); void stasis_publish_sync(struct stasis_subscription *sub, struct stasis_message *message);
/*! @} */
/*! @{ */
/*! /*!
* \brief Callback function type for Stasis subscriptions. * \brief Callback function type for Stasis subscriptions.
* \param data Data field provided with subscription. * \param data Data field provided with subscription.
@@ -699,8 +689,6 @@ struct stasis_message_type *stasis_subscription_change_type(void);
/*! @} */ /*! @} */
/*! @{ */
/*! /*!
* \brief Pool for topic aggregation * \brief Pool for topic aggregation
*/ */
@@ -723,8 +711,6 @@ struct stasis_topic_pool *stasis_topic_pool_create(struct stasis_topic *pooled_t
*/ */
struct stasis_topic *stasis_topic_pool_get_topic(struct stasis_topic_pool *pool, const char *topic_name); struct stasis_topic *stasis_topic_pool_get_topic(struct stasis_topic_pool *pool, const char *topic_name);
/*! @} */
/*! \addtogroup StasisTopicsAndMessages /*! \addtogroup StasisTopicsAndMessages
* @{ * @{
*/ */
@@ -757,8 +743,6 @@ struct stasis_message_type *stasis_cache_clear_type(void);
/*! @} */ /*! @} */
/*! @{ */
/*! /*!
* \brief A message cache, for use with \ref stasis_caching_topic. * \brief A message cache, for use with \ref stasis_caching_topic.
* \since 12 * \since 12
@@ -1090,6 +1074,10 @@ struct ao2_container *stasis_cache_dump_by_eid(struct stasis_cache *cache, struc
*/ */
struct ao2_container *stasis_cache_dump_all(struct stasis_cache *cache, struct stasis_message_type *type); struct ao2_container *stasis_cache_dump_all(struct stasis_cache *cache, struct stasis_message_type *type);
/*! \addtogroup StasisTopicsAndMessages
* @{
*/
/*! /*!
* \brief Object type code for multi user object snapshots * \brief Object type code for multi user object snapshots
*/ */
@@ -1163,8 +1151,6 @@ void ast_multi_object_blob_single_channel_publish(struct ast_channel *chan, stru
/*! @} */ /*! @} */
/*! @{ */
/*! /*!
* \internal * \internal
* \brief Log a message about invalid attempt to access a type. * \brief Log a message about invalid attempt to access a type.
@@ -1267,10 +1253,6 @@ void stasis_log_bad_type_access(const char *name);
_priv_ ## name = NULL; \ _priv_ ## name = NULL; \
}) })
/*! @} */
/*! @{ */
/*! /*!
* \brief Initialize the Stasis subsystem. * \brief Initialize the Stasis subsystem.
* \return 0 on success. * \return 0 on success.
@@ -1279,10 +1261,6 @@ void stasis_log_bad_type_access(const char *name);
*/ */
int stasis_init(void); int stasis_init(void);
/*! @} */
/*! @{ */
/*! /*!
* \internal * \internal
* \brief called by stasis_init() for cache initialization. * \brief called by stasis_init() for cache initialization.
@@ -1301,12 +1279,10 @@ int stasis_cache_init(void);
*/ */
int stasis_config_init(void); int stasis_config_init(void);
/*! @} */
/*! /*!
* \defgroup StasisTopicsAndMessages Stasis topics, and their messages. * \defgroup StasisTopicsAndMessages Stasis topics, and their messages.
* *
* This group contains the topics, messages and corresponding message types * \brief This group contains the topics, messages and corresponding message types
* found within Asterisk. * found within Asterisk.
*/ */

View File

@@ -20,7 +20,8 @@
#define _ASTERISK_STASIS_TEST_H #define _ASTERISK_STASIS_TEST_H
/*! /*!
* \file \brief Test infrastructure for dealing with Stasis. * \file
* \brief Test infrastructure for dealing with Stasis.
* *
* \author David M. Lee, II <dlee@digium.com> * \author David M. Lee, II <dlee@digium.com>
* *

View File

@@ -16,7 +16,7 @@
* at the top of the source tree. * at the top of the source tree.
*/ */
/*! \file ast_sdp_crypto.c /*! \file
* *
* \brief SRTP and SDP Security descriptions * \brief SRTP and SDP Security descriptions
* *

View File

@@ -17,7 +17,8 @@
*/ */
/*! /*!
* \file \brief Test infrastructure for dealing with Stasis. * \file
* \brief Test infrastructure for dealing with Stasis.
* *
* \author David M. Lee, II <dlee@digium.com> * \author David M. Lee, II <dlee@digium.com>
*/ */

View File

@@ -17,7 +17,8 @@
*/ */
/*! /*!
* \file \brief Test ARI API. * \file
* \brief Test ARI API.
* \author\verbatim David M. Lee, II <dlee@digium.com> \endverbatim * \author\verbatim David M. Lee, II <dlee@digium.com> \endverbatim
* *
* \ingroup tests * \ingroup tests

View File

@@ -17,7 +17,8 @@
*/ */
/*! /*!
* \file \brief Test endpoints. * \file
* \brief Test endpoints.
* *
* \author\verbatim David M. Lee, II <dlee@digium.com> \endverbatim * \author\verbatim David M. Lee, II <dlee@digium.com> \endverbatim
* *

View File

@@ -17,7 +17,8 @@
*/ */
/*! /*!
* \file \brief Test JSON API. * \file
* \brief Test JSON API.
* *
* While some of these tests are actually testing our JSON library wrapper, the bulk of * While some of these tests are actually testing our JSON library wrapper, the bulk of
* them are exploratory tests to determine what the behavior of the underlying JSON * them are exploratory tests to determine what the behavior of the underlying JSON

View File

@@ -17,7 +17,8 @@
*/ */
/*! /*!
* \file \brief Test optional API. * \file
* \brief Test optional API.
* *
* This tests exercise the underlying implementation functions. Acutal usage * This tests exercise the underlying implementation functions. Acutal usage
* won't look anything like this; it would use the wrapper macros. * won't look anything like this; it would use the wrapper macros.

View File

@@ -17,7 +17,8 @@
*/ */
/*! /*!
* \file \brief Test Stasis Application API. * \file
* \brief Test Stasis Application API.
* \author\verbatim David M. Lee, II <dlee@digium.com> \endverbatim * \author\verbatim David M. Lee, II <dlee@digium.com> \endverbatim
* *
* \ingroup tests * \ingroup tests

View File

@@ -17,7 +17,8 @@
*/ */
/*! /*!
* \file \brief Test Stasis message bus. * \file
* \brief Test Stasis message bus.
* *
* \author\verbatim David M. Lee, II <dlee@digium.com> \endverbatim * \author\verbatim David M. Lee, II <dlee@digium.com> \endverbatim
* *

View File

@@ -17,7 +17,8 @@
*/ */
/*! /*!
* \file \brief Test Stasis Channel messages and objects * \file
* \brief Test Stasis Channel messages and objects
* *
* \author\verbatim Matt Jordan <mjordan@digium.com> \endverbatim * \author\verbatim Matt Jordan <mjordan@digium.com> \endverbatim
* *

View File

@@ -17,7 +17,8 @@
*/ */
/*! /*!
* \file \brief Test endpoints. * \file
* \brief Test endpoints.
* *
* \author\verbatim David M. Lee, II <dlee@digium.com> \endverbatim * \author\verbatim David M. Lee, II <dlee@digium.com> \endverbatim
* *

View File

@@ -18,7 +18,7 @@
/*! /*!
* \file extconf * \file
* A condensation of the pbx_config stuff, to read into exensions.conf, and provide an interface to the data there, * A condensation of the pbx_config stuff, to read into exensions.conf, and provide an interface to the data there,
* for operations outside of asterisk. A huge, awful hack. * for operations outside of asterisk. A huge, awful hack.
* *