[asterisk-commits] rmudgett: trunk r400662 - in /trunk: ./ apps/ include/asterisk/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Mon Oct  7 10:43:22 2013
New Revision: 400662

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=400662
Log:
Miscellaneous stand alone comment cleanups.
........

Merged revisions 400661 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/apps/app_queue.c
    trunk/include/asterisk/manager.h
    trunk/include/asterisk/stasis.h

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

Modified: trunk/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_queue.c?view=diff&rev=400662&r1=400661&r2=400662
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Mon Oct  7 10:43:22 2013
@@ -1268,8 +1268,12 @@
 #define DEFAULT_TIMEOUT		15
 #define RECHECK			1		/*!< Recheck every second to see we we're at the top yet */
 #define MAX_PERIODIC_ANNOUNCEMENTS 10           /*!< The maximum periodic announcements we can have */
-#define DEFAULT_MIN_ANNOUNCE_FREQUENCY 15       /*!< The minimum number of seconds between position announcements \
-                                                     The default value of 15 provides backwards compatibility */
+/*!
+ * \brief The minimum number of seconds between position announcements.
+ * \note The default value of 15 provides backwards compatibility.
+ */
+#define DEFAULT_MIN_ANNOUNCE_FREQUENCY 15
+
 #define MAX_QUEUE_BUCKETS 53
 
 #define	RES_OKAY	0		/*!< Action completed */

Modified: trunk/include/asterisk/manager.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/manager.h?view=diff&rev=400662&r1=400661&r2=400662
==============================================================================
--- trunk/include/asterisk/manager.h (original)
+++ trunk/include/asterisk/manager.h Mon Oct  7 10:43:22 2013
@@ -518,8 +518,6 @@
  */
 struct stasis_topic *ast_manager_get_topic(void);
 
-struct ast_json;
-
 /*!
  * \since 12
  * \brief Publish an event to AMI

Modified: trunk/include/asterisk/stasis.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/stasis.h?view=diff&rev=400662&r1=400661&r2=400662
==============================================================================
--- trunk/include/asterisk/stasis.h (original)
+++ trunk/include/asterisk/stasis.h Mon Oct  7 10:43:22 2013
@@ -731,7 +731,7 @@
 void stasis_log_bad_type_access(const char *name);
 
 /*!
- * \brief Boiler-plate removing macro for defining message types.
+ * \brief Boiler-plate messaging macro for defining public message types.
  *
  * \code
  *	STASIS_MESSAGE_TYPE_DEFN(ast_foo_type,
@@ -757,7 +757,7 @@
 	}
 
 /*!
- * \brief Boiler-plate removing macro for defining local message types.
+ * \brief Boiler-plate messaging macro for defining local message types.
  *
  * \code
  *	STASIS_MESSAGE_TYPE_DEFN_LOCAL(ast_foo_type,
@@ -783,7 +783,7 @@
 	}
 
 /*!
-* \brief Boiler-plate removing macro for initializing message types.
+* \brief Boiler-plate messaging macro for initializing message types.
  *
  * \code
  *	if (STASIS_MESSAGE_TYPE_INIT(ast_foo_type) != 0) {
@@ -805,7 +805,7 @@
 	})
 
 /*!
- * \brief Boiler-plate removing macro for cleaning up message types.
+ * \brief Boiler-plate messaging macro for cleaning up message types.
  *
  * Note that if your type is defined in core instead of a loadable module, you
  * should call message type cleanup from an ast_register_cleanup() handler