Win32: always use mingw's snprintf

[vlc] / include / vlc_xml.h

diff --git a/include/vlc_xml.h b/include/vlc_xml.h
index 90d3523206b220d658849d593c9c54d28a18b850..e8b846de2b150dc049c6d7c2a4a621d9ec510f10 100644 (file)
--- a/include/vlc_xml.h
+++ b/include/vlc_xml.h
@@ -46,9 +46,9 @@ struct xml_t
                             const char * );
 };
 
-VLC_EXPORT( xml_t *, xml_Create, ( vlc_object_t * ) LIBVLC_USED );
+VLC_API xml_t * xml_Create( vlc_object_t * ) VLC_USED;
 #define xml_Create( a ) xml_Create( VLC_OBJECT(a) )
-VLC_EXPORT( void, xml_Delete, ( xml_t * ) );
+VLC_API void xml_Delete( xml_t * );
 
 static inline void xml_CatalogLoad( xml_t *xml, const char *catalog )
 {
@@ -71,35 +71,39 @@ struct xml_reader_t
     module_t *p_module;
 
     int (*pf_next_node) ( xml_reader_t *, const char ** );
-    char * (*pf_value) ( xml_reader_t * );
-    const char *(*pf_next_attr) ( xml_reader_t * );
+    const char *(*pf_next_attr) ( xml_reader_t *, const char ** );
 
     int (*pf_use_dtd) ( xml_reader_t * );
+    int (*pf_is_empty) ( xml_reader_t * );
 };
 
-VLC_EXPORT( xml_reader_t *, xml_ReaderCreate, (vlc_object_t *, stream_t *) LIBVLC_USED );
+VLC_API xml_reader_t * xml_ReaderCreate(vlc_object_t *, stream_t *) VLC_USED;
 #define xml_ReaderCreate( a, s ) xml_ReaderCreate(VLC_OBJECT(a), s)
-VLC_EXPORT( void, xml_ReaderDelete, (xml_reader_t *) );
-VLC_EXPORT( xml_reader_t *, xml_ReaderReset, (xml_reader_t *, stream_t *) LIBVLC_USED );
+VLC_API void xml_ReaderDelete(xml_reader_t *);
+VLC_API xml_reader_t * xml_ReaderReset(xml_reader_t *, stream_t *) VLC_USED;
 
 static inline int xml_ReaderNextNode( xml_reader_t *reader, const char **pval )
 {
     return reader->pf_next_node( reader, pval );
 }
 
-static inline char *xml_ReaderValue( xml_reader_t *reader )
+static inline const char *xml_ReaderNextAttr( xml_reader_t *reader,
+                                              const char **pval )
 {
-  return reader->pf_value( reader );
+  return reader->pf_next_attr( reader, pval );
 }
 
-static inline const char *xml_ReaderNextAttr( xml_reader_t *reader )
+static inline int xml_ReaderUseDTD( xml_reader_t *reader )
 {
-  return reader->pf_next_attr( reader );
+  return reader->pf_use_dtd( reader );
 }
 
-static inline int xml_ReaderUseDTD( xml_reader_t *reader )
+static inline int xml_ReaderIsEmptyElement( xml_reader_t *reader )
 {
-  return reader->pf_use_dtd( reader );
+    if(reader->pf_is_empty == NULL)
+        return -2;
+
+    return reader->pf_is_empty( reader );
 }
 
 enum {