Removes trailing spaces. Removes tabs.

[vlc] / modules / misc / xml / xtag.c

diff --git a/modules/misc/xml/xtag.c b/modules/misc/xml/xtag.c
index c7693dbe5bd79bfed4b7e2e38880f40bc9a3b736..d9b866d760f2a3b03a3220827dc2678391ec5c2b 100644 (file)
--- a/modules/misc/xml/xtag.c
+++ b/modules/misc/xml/xtag.c
@@ -26,7 +26,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <stdlib.h>
 #include <vlc/vlc.h>
 
 #include "vlc_xml.h"
@@ -34,10 +33,7 @@
 #include "vlc_stream.h"
 
 #include <ctype.h>
-#include <string.h>
 #include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 #undef XTAG_DEBUG
 
@@ -85,8 +81,6 @@ static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 vlc_module_begin();
-    set_category( CAT_ADVANCED );
-    set_subcategory( SUBCAT_ADVANCED_XML );
     set_description( _("Simple XML Parser") );
     set_capability( "xml", 5 );
     set_callbacks( Open, Close );
@@ -172,7 +166,7 @@ static xml_reader_t *ReaderCreate( xml_t *p_xml, stream_t *s )
     /* Open and read file */
     p_buffer = malloc( i_buffer );
     if( p_buffer == NULL ) {
-        msg_Err( p_xml, "ENOMEM: alloc buffer" );
+        msg_Err( p_xml, "out of memory" );
         return NULL;
     }
 
@@ -182,7 +176,7 @@ static xml_reader_t *ReaderCreate( xml_t *p_xml, stream_t *s )
         i_buffer += i_size;
         p_new = realloc( p_buffer, i_buffer );
         if (!p_new) {
-            msg_Err( p_xml, "ENOMEM: realloc buffer" );
+            msg_Err( p_xml, "out of memory" );
             free( p_buffer );
             return NULL;
         }
@@ -192,7 +186,7 @@ static xml_reader_t *ReaderCreate( xml_t *p_xml, stream_t *s )
 
     if( i_pos + i_size == 0 )
     {
-        msg_Dbg( p_xml, "empty xml" );
+        msg_Dbg( p_xml, "empty XML" );
         free( p_buffer );
         return 0;
     }
@@ -200,11 +194,12 @@ static xml_reader_t *ReaderCreate( xml_t *p_xml, stream_t *s )
     p_root = xtag_new_parse( p_buffer, i_buffer );
     if( !p_root )
     {
-        msg_Warn( p_xml, "couldn't parse xml" );
+        msg_Warn( p_xml, "couldn't parse XML" );
         free( p_buffer );
         return 0;
     }
 
+    free( p_buffer );
     p_reader = malloc( sizeof(xml_reader_t) );
     p_reader->p_sys = malloc( sizeof(xml_reader_sys_t) );
     p_reader->p_sys->p_root = p_root;
@@ -350,7 +345,7 @@ static XList *xlist_append( XList *list, void *data )
         if( last->next == NULL ) break;
 
     if( last ) last->next = l;
-    l->prev = last; 
+    l->prev = last;
     return list;
 }
 
@@ -559,7 +554,7 @@ static XTag *xtag_parse_tag( XTagParser *parser )
     char *name;
     char *pcdata;
     char *s;
-        int xi;
+     int xi;
 
     if( !parser->valid ) return NULL;
 
@@ -567,7 +562,7 @@ static XTag *xtag_parse_tag( XTagParser *parser )
 
     /* if this starts a comment tag, skip until end */
     if( (parser->end - parser->start) > 7 &&
-                 xtag_cin( s[0], X_OPENTAG ) && xtag_cin( s[1], X_EMARK ) &&
+          xtag_cin( s[0], X_OPENTAG ) && xtag_cin( s[1], X_EMARK ) &&
         xtag_cin( s[2], X_DASH ) && xtag_cin( s[3], X_DASH ) )
     {
         parser->start = s = &s[4];
@@ -586,7 +581,7 @@ static XTag *xtag_parse_tag( XTagParser *parser )
 
     /* ignore processing instructions '<?' ... '?>' */
     if( (parser->end - parser->start) > 4 &&
-                 xtag_cin( s[0], X_OPENTAG ) && xtag_cin( s[1], X_QMARK ) )
+          xtag_cin( s[0], X_OPENTAG ) && xtag_cin( s[1], X_QMARK ) )
     {
         parser->start = s = &s[2];
         while ((xi = xtag_index( parser, X_QMARK )) >= 0) {
@@ -601,7 +596,7 @@ static XTag *xtag_parse_tag( XTagParser *parser )
 
     /* ignore doctype  '<!DOCTYPE' ... '>' */
     if ( (parser->end - parser->start) > 8 &&
-                       !strncmp( s, "<!DOCTYPE", 9 ) ) {
+            !strncmp( s, "<!DOCTYPE", 9 ) ) {
         xi = xtag_index( parser, X_CLOSETAG );
         if ( xi > 0 ) {
             parser->start = s = &s[xi+1];
@@ -631,8 +626,8 @@ static XTag *xtag_parse_tag( XTagParser *parser )
         return NULL;
 
     /* parse CDATA content */
-    if ( (parser->end - parser->start) > 8 && 
-                       !strncmp( s, "<![CDATA[", 9 ) ) {
+    if ( (parser->end - parser->start) > 8 &&
+            !strncmp( s, "<![CDATA[", 9 ) ) {
         parser->start = s = &s[9];
         while (parser->end - s > 2) {
             if (strncmp( s, "]]>", 3 ) == 0) {
@@ -778,7 +773,7 @@ static XTag *xtag_new_parse( const char *s, int n )
     {
 #ifdef XTAG_DEBUG
         printf ("empty buffer");
-#endif        
+#endif
         return NULL;
     }
     else parser.end = (char *)&s[n];
@@ -951,7 +946,7 @@ static int xtag_snprints( char *buf, int n, ... )
     int len, to_copy, total = 0;
 
     va_start( ap, n );
-  
+ 
     for( s = va_arg( ap, char * ); s; s = va_arg( ap, char *) )
     {
         len = strlen (s);
@@ -1005,7 +1000,7 @@ static int xtag_snprint( char *buf, int n, XTag *xtag )
         for( l = xtag->attributes; l; l = l->next )
         {
             attr = (XAttribute *)l->data;
-      
+ 
             nn = xtag_snprints( buf, n, " ", attr->name, "=\"", attr->value,
                                 "\"", NULL);
             FORWARD( nn );