[svn-commits] mjordan: trunk r369910 - in /trunk: channels/ main/

SVN commits to the Digium repositories svn-commits at lists.digium.com
Tue Jul 10 21:06:09 CDT 2012


Author: mjordan
Date: Tue Jul 10 21:06:05 2012
New Revision: 369910

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=369910
Log:
Fix validation errors when producing documentation using default build script

The awk script parses out the first instance of the DOCUMENTATION tag that it
finds within a file.  If a file did not previously have a DOCUMENTATION tag
but received one due to it having an AMI event, then the XML fragment
associated with the AMI event was erroneously placed in the resulting XML
file.  Without the python scripts, these XML fragments will not validate.

This patch adds DOCUMENTATION tags at the top of those files that did
not previously have them to prevent the awk script from pulling AMI event
documentation.


Modified:
    trunk/channels/sig_analog.c
    trunk/channels/sig_pri.c
    trunk/main/asterisk.c
    trunk/main/cdr.c
    trunk/main/channel.c
    trunk/main/loader.c
    trunk/main/logger.c

Modified: trunk/channels/sig_analog.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/sig_analog.c?view=diff&rev=369910&r1=369909&r2=369910
==============================================================================
--- trunk/channels/sig_analog.c (original)
+++ trunk/channels/sig_analog.c Tue Jul 10 21:06:05 2012
@@ -45,6 +45,9 @@
 #include "asterisk/causes.h"
 
 #include "sig_analog.h"
+
+/*** DOCUMENTATION
+ ***/
 
 /*! \note
  * Define if you want to check the hook state for an FXO (FXS signalled) interface

Modified: trunk/channels/sig_pri.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/sig_pri.c?view=diff&rev=369910&r1=369909&r2=369910
==============================================================================
--- trunk/channels/sig_pri.c (original)
+++ trunk/channels/sig_pri.c Tue Jul 10 21:06:05 2012
@@ -55,6 +55,10 @@
 #ifndef PRI_EVENT_FACILITY
 #error please update libpri
 #endif
+
+/*** DOCUMENTATION
+ ***/
+
 
 /* define this to send PRI user-user information elements */
 #undef SUPPORT_USERUSER

Modified: trunk/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/asterisk.c?view=diff&rev=369910&r1=369909&r2=369910
==============================================================================
--- trunk/main/asterisk.c (original)
+++ trunk/main/asterisk.c Tue Jul 10 21:06:05 2012
@@ -153,6 +153,9 @@
 #include "asterisk/aoc.h"
 
 #include "../defaults.h"
+
+/*** DOCUMENTATION
+ ***/
 
 #ifndef AF_LOCAL
 #define AF_LOCAL AF_UNIX

Modified: trunk/main/cdr.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/cdr.c?view=diff&rev=369910&r1=369909&r2=369910
==============================================================================
--- trunk/main/cdr.c (original)
+++ trunk/main/cdr.c Tue Jul 10 21:06:05 2012
@@ -54,6 +54,9 @@
 #include "asterisk/cli.h"
 #include "asterisk/stringfields.h"
 #include "asterisk/data.h"
+
+/*** DOCUMENTATION
+ ***/
 
 /*! Default AMA flag for billing records (CDR's) */
 int ast_default_amaflags = AST_CDR_DOCUMENTATION;

Modified: trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/channel.c?view=diff&rev=369910&r1=369909&r2=369910
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Tue Jul 10 21:06:05 2012
@@ -72,6 +72,9 @@
 #include "asterisk/global_datastores.h"
 #include "asterisk/data.h"
 #include "asterisk/channel_internal.h"
+
+/*** DOCUMENTATION
+ ***/
 
 #ifdef HAVE_EPOLL
 #include <sys/epoll.h>

Modified: trunk/main/loader.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/loader.c?view=diff&rev=369910&r1=369909&r2=369910
==============================================================================
--- trunk/main/loader.c (original)
+++ trunk/main/loader.c Tue Jul 10 21:06:05 2012
@@ -59,6 +59,9 @@
 
 #include "asterisk/md5.h"
 #include "asterisk/utils.h"
+
+/*** DOCUMENTATION
+ ***/
 
 #ifndef RTLD_NOW
 #define RTLD_NOW 0

Modified: trunk/main/logger.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/logger.c?view=diff&rev=369910&r1=369909&r2=369910
==============================================================================
--- trunk/main/logger.c (original)
+++ trunk/main/logger.c Tue Jul 10 21:06:05 2012
@@ -68,6 +68,9 @@
 #    include <bfd.h>
 #  endif
 #endif
+
+/*** DOCUMENTATION
+ ***/
 
 static char dateformat[256] = "%b %e %T";		/* Original Asterisk Format */
 




More information about the svn-commits mailing list