[svn-commits] kmoore: branch kmoore/channel-state-caching r380844 - in /team/kmoore/channel...

[SVN commits to the Digium repositories]

Author: kmoore
Date: Mon Feb  4 22:23:45 2013
New Revision: 380844

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=380844
Log:
Do some clean up and documentation

Modified:
    team/kmoore/channel-state-caching/include/asterisk/channel.h
    team/kmoore/channel-state-caching/main/event.c

Modified: team/kmoore/channel-state-caching/include/asterisk/channel.h
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/channel-state-caching/include/asterisk/channel.h?view=diff&rev=380844&r1=380843&r2=380844
==============================================================================
--- team/kmoore/channel-state-caching/include/asterisk/channel.h (original)
+++ team/kmoore/channel-state-caching/include/asterisk/channel.h Mon Feb  4 22:23:45 2013
@@ -151,7 +151,6 @@
 #include "asterisk/channelstate.h"
 #include "asterisk/ccss.h"
 #include "asterisk/framehook.h"
-#include "asterisk/indications.h"
 
 #define DATASTORE_INHERIT_FOREVER	INT_MAX
 
@@ -4104,26 +4103,20 @@
 
 struct ast_flags *ast_channel_flags(struct ast_channel *chan);
 
-#define AST_MAX_ID	32
-#define AST_MAX_GENERIC	256
-#define AST_MAX_PARTY	64
-#ifndef AST_MAX_APP
-#define AST_MAX_APP	32
-#endif
 /*!
  * \since 12
  * \brief Structure representing a snapshot of channel state.
  */
 struct ast_channel_snapshot {
 	AST_DECLARE_STRING_FIELDS(
-		AST_STRING_FIELD(name);         	/*!< ASCII unique channel name */
+		AST_STRING_FIELD(name);			/*!< ASCII unique channel name */
 		AST_STRING_FIELD(accountcode);		/*!< Account code for billing */
 		AST_STRING_FIELD(peeraccount);		/*!< Peer account code for billing */
 		AST_STRING_FIELD(userfield);		/*!< Userfield for CEL billing */
 		AST_STRING_FIELD(uniqueid);		/*!< Unique Channel Identifier */
 		AST_STRING_FIELD(linkedid);		/*!< Linked Channel Identifier -- gets propagated by linkage */
-		AST_STRING_FIELD(parkinglot);		/*! Default parking lot, if empty, default parking lot  */
-		AST_STRING_FIELD(hangupsource);		/*! Who is responsible for hanging up this channel */
+		AST_STRING_FIELD(parkinglot);		/*!< Default parking lot, if empty, default parking lot */
+		AST_STRING_FIELD(hangupsource);		/*!< Who is responsible for hanging up this channel */
 		AST_STRING_FIELD(appl);			/*!< Current application */
 		AST_STRING_FIELD(data);			/*!< Data passed to current application */
 		AST_STRING_FIELD(context);		/*!< Dialplan: Current extension context */
@@ -4155,7 +4148,7 @@
 
 /*!
  * \since 12
- * \brief Copy a snapshot of the channel state
+ * \brief Copy a snapshot of the channel state for use with the event system
  *
  * \param copy The snapshot to be copied into
  * \param orig The snapshot to copy
@@ -4175,7 +4168,8 @@
  * \param two The second snapshot to compare
  * \param two_len The length of the second snapshot to compare
  *
- * \retval result of the comparison
+ * \retval zero if equal
+ * \retval non-zero if not equal
  */
 int ast_channel_snapshot_cmp(const void *one, size_t one_len, const void *two, size_t two_len);
 

Modified: team/kmoore/channel-state-caching/main/event.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/channel-state-caching/main/event.c?view=diff&rev=380844&r1=380843&r2=380844
==============================================================================
--- team/kmoore/channel-state-caching/main/event.c (original)
+++ team/kmoore/channel-state-caching/main/event.c Mon Feb  4 22:23:45 2013
@@ -1941,11 +1941,7 @@
 	ie_type = ast_event_iterator_get_ie_type(i);
 	ie_type_name = ast_event_get_ie_type_name(ie_type);
 
-	switch (ie_type) {
-	default:
-		ast_cli(a->fd, "%s\n", ie_type_name);
-		break;
-	}
+	ast_cli(a->fd, "%s\n", ie_type_name);
 }
 
 static int event_dump_cli(void *obj, void *arg, int flags)