videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

Xml: added empty element detection 

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
This commit is contained in:
Christopher Mueller 2011-08-30 11:35:12 -07:00 committed by Rémi Denis-Courmont
parent 882e79a8c5
commit dda048cf91
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/vlc_xml.h
View File

@ -74,6 +74,7 @@ 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_API xml_reader_t * xml_ReaderCreate(vlc_object_t *, stream_t *) VLC_USED;
@ -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,

7
modules/misc/xml/libxml.c
View File

@ -62,6 +62,7 @@ vlc_module_end ()
static int ReaderNextNode( xml_reader_t *, const char ** );
static const char *ReaderNextAttr( xml_reader_t *, const char ** );
static int ReaderIsEmptyElement( xml_reader_t *);
static int ReaderUseDTD ( xml_reader_t * );
@ -175,6 +176,7 @@ static int ReaderOpen( vlc_object_t *p_this )
p_reader->p_sys = p_sys;
p_reader->pf_next_node = ReaderNextNode;
p_reader->pf_next_attr = ReaderNextAttr;
p_reader->pf_is_empty = ReaderIsEmptyElement;
p_reader->pf_use_dtd = ReaderUseDTD;
return VLC_SUCCESS;
@ -287,3 +289,8 @@ static int StreamRead( void *p_context, char *p_buffer, int i_buffer )
stream_t *s = (stream_t*)p_context;
return stream_Read( s, p_buffer, i_buffer );
}
static int ReaderIsEmptyElement( xml_reader_t *p_reader )
{
return xmlTextReaderIsEmptyElement( p_reader->p_sys->xml );
}