X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_xml.h;h=e8b846de2b150dc049c6d7c2a4a621d9ec510f10;hb=0ad141d394dd86e930d1f27be2ea6ea7e698fddf;hp=83d2e67f00c49fb05b42c2a3fad0b5e508f4bc14;hpb=0e17b717feed5b870b4fd1707399bf1e3688e7fe;p=vlc diff --git a/include/vlc_xml.h b/include/vlc_xml.h index 83d2e67f00..e8b846de2b 100644 --- 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 ) { @@ -74,12 +74,13 @@ struct 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 ) { @@ -97,6 +98,14 @@ static inline int xml_ReaderUseDTD( xml_reader_t *reader ) return reader->pf_use_dtd( reader ); } +static inline int xml_ReaderIsEmptyElement( xml_reader_t *reader ) +{ + if(reader->pf_is_empty == NULL) + return -2; + + return reader->pf_is_empty( reader ); +} + enum { XML_READER_NONE=0, XML_READER_STARTELEM,