XML: return attribute value as const

[vlc] / modules / demux / playlist / b4s.c

diff --git a/modules/demux/playlist/b4s.c b/modules/demux/playlist/b4s.c
index 39620196901209a76bfe39b25ac56a262a98cdf9..ed1c765bb09107ff541ad4abacd7962889b5fe5b 100644 (file)
--- a/modules/demux/playlist/b4s.c
+++ b/modules/demux/playlist/b4s.c
@@ -119,24 +119,16 @@ static int Demux( demux_t *p_demux )
     }
 
     // Read the attributes
-    const char *attr;
-    while( (attr = xml_ReaderNextAttr( p_xml_reader )) != NULL )
+    const char *attr, *value;
+    while( (attr = xml_ReaderNextAttr( p_xml_reader, &value )) != NULL )
     {
-        char *psz_value = xml_ReaderValue( p_xml_reader );
-        if( !psz_value )
-        {
-            free( psz_value );
-            goto end;
-        }
-
         if( !strcmp( attr, "num_entries" ) )
-            msg_Dbg( p_demux, "playlist has %d entries", atoi(psz_value) );
+            msg_Dbg( p_demux, "playlist has %d entries", atoi(value) );
         else if( !strcmp( attr, "label" ) )
-            input_item_SetName( p_current_input, psz_value );
+            input_item_SetName( p_current_input, value );
         else
             msg_Warn( p_demux, "stray attribute %s with value %s in element"
-                      " 'playlist'", attr, psz_value );
-        free( psz_value );
+                      " <playlist>", attr, value );
     }
 
     p_subitems = input_item_node_Create( p_current_input );
@@ -155,24 +147,18 @@ static int Demux( demux_t *p_demux )
                     goto end;
 
                 // Read the attributes
-                while( (attr = xml_ReaderNextAttr( p_xml_reader )) )
+                while( (attr = xml_ReaderNextAttr( p_xml_reader, &value )) )
                 {
-                    char *psz_value = xml_ReaderValue( p_xml_reader );
-                    if( !psz_value )
-                    {
-                        free( psz_value );
-                        goto end;
-                    }
                     if( !strcmp( psz_elname, "entry" ) &&
                         !strcmp( attr, "Playstring" ) )
                     {
-                        psz_mrl = psz_value;
+                        free( psz_mrl );
+                        psz_mrl = strdup( value );
                     }
                     else
                     {
-                        msg_Warn( p_demux, "unexpected attribute %s in element %s",
+                        msg_Warn( p_demux, "unexpected attribute %s in <%s>",
                                   attr, psz_elname );
-                        free( psz_value );
                     }
                 }
                 break;