Removed useless includes (svg).

[vlc] / include / vlc_xml.h

diff --git a/include/vlc_xml.h b/include/vlc_xml.h
index b75691819fcddfcdda0c8901caf1572e82d0209c..83d2e67f00c49fb05b42c2a3fad0b5e508f4bc14 100644 (file)
--- a/include/vlc_xml.h
+++ b/include/vlc_xml.h
@@ -70,10 +70,8 @@ struct xml_reader_t
     stream_t *p_stream;
     module_t *p_module;
 
-    int (*pf_next_node) ( xml_reader_t * );
-    char * (*pf_name) ( xml_reader_t * );
-    char * (*pf_value) ( xml_reader_t * );
-    int (*pf_next_attr) ( xml_reader_t * );
+    int (*pf_next_node) ( xml_reader_t *, const char ** );
+    const char *(*pf_next_attr) ( xml_reader_t *, const char ** );
 
     int (*pf_use_dtd) ( xml_reader_t * );
 };
@@ -83,24 +81,15 @@ VLC_EXPORT( xml_reader_t *, xml_ReaderCreate, (vlc_object_t *, stream_t *) LIBVL
 VLC_EXPORT( void, xml_ReaderDelete, (xml_reader_t *) );
 VLC_EXPORT( xml_reader_t *, xml_ReaderReset, (xml_reader_t *, stream_t *) LIBVLC_USED );
 
-static inline int xml_ReaderNextNode( xml_reader_t *reader )
+static inline int xml_ReaderNextNode( xml_reader_t *reader, const char **pval )
 {
-  return reader->pf_next_node( reader );
+    return reader->pf_next_node( reader, pval );
 }
 
-static inline char *xml_ReaderName( xml_reader_t *reader )
+static inline const char *xml_ReaderNextAttr( xml_reader_t *reader,
+                                              const char **pval )
 {
-  return reader->pf_name( reader );
-}
-
-static inline char *xml_ReaderValue( xml_reader_t *reader )
-{
-  return reader->pf_value( reader );
-}
-
-static inline int xml_ReaderNextAttr( xml_reader_t *reader )
-{
-  return reader->pf_next_attr( reader );
+  return reader->pf_next_attr( reader, pval );
 }
 
 static inline int xml_ReaderUseDTD( xml_reader_t *reader )