[asterisk-commits] dlee: branch dlee/detyped r388001 - in /team/dlee/detyped: include/asterisk/ ...

[SVN commits to the Asterisk project]

Author: dlee
Date: Wed May  8 13:16:56 2013
New Revision: 388001

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=388001
Log:
Threw a _MESSAGE_ in the macro names, for clarity

Modified:
    team/dlee/detyped/include/asterisk/stasis.h
    team/dlee/detyped/main/stasis_channels.c

Modified: team/dlee/detyped/include/asterisk/stasis.h
URL: http://svnview.digium.com/svn/asterisk/team/dlee/detyped/include/asterisk/stasis.h?view=diff&rev=388001&r1=388000&r2=388001
==============================================================================
--- team/dlee/detyped/include/asterisk/stasis.h (original)
+++ team/dlee/detyped/include/asterisk/stasis.h Wed May  8 13:16:56 2013
@@ -532,7 +532,7 @@
  * \param name Name of message type.
  * \since 12
  */
-#define STASIS_TYPE_DEFN(name)				\
+#define STASIS_MESSAGE_TYPE_DEFN(name)				\
 	static struct stasis_message_type *__ ## name;	\
 	struct stasis_message_type *name(void) {	\
 		ast_assert(__ ## name != NULL);		\
@@ -547,13 +547,13 @@
  * \return Non-zero on failure.
  * \since 12
  */
-#define STASIS_TYPE_INIT(name)				\
+#define STASIS_MESSAGE_TYPE_INIT(name)				\
 	({						\
 	__ ## name = stasis_message_type_create(#name);	\
 	__ ## name ? 0 : -1;				\
 	})
 
-#define STASIS_TYPE_CLEANUP(name)		\
+#define STASIS_MESSAGE_TYPE_CLEANUP(name)		\
 	({					\
 		ao2_cleanup(__ ## name);	\
 		__ ## name = NULL;		\

Modified: team/dlee/detyped/main/stasis_channels.c
URL: http://svnview.digium.com/svn/asterisk/team/dlee/detyped/main/stasis_channels.c?view=diff&rev=388001&r1=388000&r2=388001
==============================================================================
--- team/dlee/detyped/main/stasis_channels.c (original)
+++ team/dlee/detyped/main/stasis_channels.c Wed May  8 13:16:56 2013
@@ -41,13 +41,13 @@
 /*!
  * @{ \brief Define channel message types.
  */
-STASIS_TYPE_DEFN(ast_channel_snapshot_type);
-STASIS_TYPE_DEFN(ast_channel_dial_type);
-STASIS_TYPE_DEFN(ast_channel_varset_type);
-STASIS_TYPE_DEFN(ast_channel_user_event_type);
-STASIS_TYPE_DEFN(ast_channel_hangup_request_type);
-STASIS_TYPE_DEFN(ast_channel_dtmf_begin_type);
-STASIS_TYPE_DEFN(ast_channel_dtmf_end_type);
+STASIS_MESSAGE_TYPE_DEFN(ast_channel_snapshot_type);
+STASIS_MESSAGE_TYPE_DEFN(ast_channel_dial_type);
+STASIS_MESSAGE_TYPE_DEFN(ast_channel_varset_type);
+STASIS_MESSAGE_TYPE_DEFN(ast_channel_user_event_type);
+STASIS_MESSAGE_TYPE_DEFN(ast_channel_hangup_request_type);
+STASIS_MESSAGE_TYPE_DEFN(ast_channel_dtmf_begin_type);
+STASIS_MESSAGE_TYPE_DEFN(ast_channel_dtmf_end_type);
 /*! @} */
 
 /*! \brief Topic for all channels */
@@ -450,13 +450,13 @@
 
 void ast_stasis_channels_shutdown(void)
 {
-	STASIS_TYPE_CLEANUP(ast_channel_snapshot_type);
-	STASIS_TYPE_CLEANUP(ast_channel_dial_type);
-	STASIS_TYPE_CLEANUP(ast_channel_varset_type);
-	STASIS_TYPE_CLEANUP(ast_channel_user_event_type);
-	STASIS_TYPE_CLEANUP(ast_channel_hangup_request_type);
-	STASIS_TYPE_CLEANUP(ast_channel_dtmf_begin_type);
-	STASIS_TYPE_CLEANUP(ast_channel_dtmf_end_type);
+	STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_snapshot_type);
+	STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_dial_type);
+	STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_varset_type);
+	STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_user_event_type);
+	STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_hangup_request_type);
+	STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_dtmf_begin_type);
+	STASIS_MESSAGE_TYPE_CLEANUP(ast_channel_dtmf_end_type);
 	ao2_cleanup(channel_topic_all);
 	channel_topic_all = NULL;
 	channel_topic_all_cached = stasis_caching_unsubscribe(channel_topic_all_cached);
@@ -464,13 +464,13 @@
 
 void ast_stasis_channels_init(void)
 {
-	STASIS_TYPE_INIT(ast_channel_snapshot_type);
-	STASIS_TYPE_INIT(ast_channel_dial_type);
-	STASIS_TYPE_INIT(ast_channel_varset_type);
-	STASIS_TYPE_INIT(ast_channel_user_event_type);
-	STASIS_TYPE_INIT(ast_channel_hangup_request_type);
-	STASIS_TYPE_INIT(ast_channel_dtmf_begin_type);
-	STASIS_TYPE_INIT(ast_channel_dtmf_end_type);
+	STASIS_MESSAGE_TYPE_INIT(ast_channel_snapshot_type);
+	STASIS_MESSAGE_TYPE_INIT(ast_channel_dial_type);
+	STASIS_MESSAGE_TYPE_INIT(ast_channel_varset_type);
+	STASIS_MESSAGE_TYPE_INIT(ast_channel_user_event_type);
+	STASIS_MESSAGE_TYPE_INIT(ast_channel_hangup_request_type);
+	STASIS_MESSAGE_TYPE_INIT(ast_channel_dtmf_begin_type);
+	STASIS_MESSAGE_TYPE_INIT(ast_channel_dtmf_end_type);
 
 	channel_topic_all = stasis_topic_create("ast_channel_topic_all");
 	channel_topic_all_cached = stasis_caching_topic_create(channel_topic_all, channel_snapshot_get_id);