[svn-commits] russell: trunk r283232 - in /trunk: ./ include/asterisk/cel.h main/cel.c

[SVN commits to the Digium repositories]

Author: russell
Date: Mon Aug 23 08:23:37 2010
New Revision: 283232

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=283232
Log:
Merged revisions 283230 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r283230 | russell | 2010-08-23 08:23:12 -0500 (Mon, 23 Aug 2010) | 7 lines
  
  Make the AST_CEL_AMA enum match up with the AST_CDR_ ama flag values.
  
  Really, having 2 enums for this is silly and error prone, demonstrated by
  the crash that I hit because there was an assumption in the code that the
  values in each matched up.  However, this is a quick fix to get them to
  match up so it will work.
........

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/cel.h
    trunk/main/cel.c

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

Modified: trunk/include/asterisk/cel.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/cel.h?view=diff&rev=283232&r1=283231&r2=283232
==============================================================================
--- trunk/include/asterisk/cel.h (original)
+++ trunk/include/asterisk/cel.h Mon Aug 23 08:23:37 2010
@@ -35,8 +35,13 @@
 
 #include "asterisk/event.h"
 
-/*! \brief AMA Flags */
+/*!
+ * \brief AMA Flags
+ *
+ * \note This must much up with the AST_CDR_* defines for AMA flags.
+ */
 enum ast_cel_ama_flag {
+	AST_CEL_AMA_FLAG_NONE,
 	AST_CEL_AMA_FLAG_OMIT,
 	AST_CEL_AMA_FLAG_BILLING,
 	AST_CEL_AMA_FLAG_DOCUMENTATION,

Modified: trunk/main/cel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/cel.c?view=diff&rev=283232&r1=283231&r2=283232
==============================================================================
--- trunk/main/cel.c (original)
+++ trunk/main/cel.c Mon Aug 23 08:23:37 2010
@@ -122,6 +122,7 @@
  * \brief Map of ast_cel_ama_flags to strings
  */
 static const char * const cel_ama_flags[AST_CEL_AMA_FLAG_TOTAL] = {
+	[AST_CEL_AMA_FLAG_NONE]          = "NONE",
 	[AST_CEL_AMA_FLAG_OMIT]          = "OMIT",
 	[AST_CEL_AMA_FLAG_BILLING]       = "BILLING",
 	[AST_CEL_AMA_FLAG_DOCUMENTATION] = "DOCUMENTATION",