Move last.fm password from PasswordShowOnEdit to Password.

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

diff --git a/modules/misc/xml/xtag.c b/modules/misc/xml/xtag.c
index f97eeaf7c418c1ea0b1455fa9d90d4478cd51d7a..b5eb64bcc7c404bb4ff4dedf02894d04e35d9224 100644 (file)
--- a/modules/misc/xml/xtag.c
+++ b/modules/misc/xml/xtag.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 
 #include "vlc_xml.h"
@@ -40,6 +40,8 @@
 #include <ctype.h>
 #include <stdarg.h>
 
+#include <assert.h>
+
 #undef XTAG_DEBUG
 
 typedef struct _XList
@@ -86,7 +88,7 @@ static int  Open ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 vlc_module_begin();
-    set_description( _("Simple XML Parser") );
+    set_description( N_("Simple XML Parser") );
     set_capability( "xml", 5 );
     set_callbacks( Open, Close );
 vlc_module_end();
@@ -176,10 +178,8 @@ 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, "out of memory" );
+    if( p_buffer == NULL )
         return NULL;
-    }
 
     while( ( i_size = stream_Read( s, &p_buffer[i_pos], 2048 ) ) == 2048 )
     {
@@ -188,7 +188,6 @@ static xml_reader_t *ReaderCreate( xml_t *p_xml, stream_t *s )
         p_new = realloc( p_buffer, i_buffer );
         if( !p_new )
         {
-            msg_Err( p_xml, "out of memory" );
             free( p_buffer );
             return NULL;
         }