[vlc-commits] playlist: xspf: use xml defines

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Sep  5 16:48:35 2017 +0200| [710e8cc1fe51e861bf7d51e44362beafae6a0b42] | committer: Francois Cartegnie

playlist: xspf: use xml defines

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=710e8cc1fe51e861bf7d51e44362beafae6a0b42
---

 modules/demux/playlist/xspf.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/modules/demux/playlist/xspf.c b/modules/demux/playlist/xspf.c
index 0904937573..bf4b4592f5 100644
--- a/modules/demux/playlist/xspf.c
+++ b/modules/demux/playlist/xspf.c
@@ -234,7 +234,7 @@ static bool parse_playlist_node COMPLEX_INTERFACE
         msg_Warn(p_demux, "<playlist> requires \"version\" attribute");
 
     psz_value = NULL;
-    while ((i_node = xml_ReaderNextNode(p_xml_reader, &name)) > 0)
+    while ((i_node = xml_ReaderNextNode(p_xml_reader, &name)) > XML_READER_NONE)
         switch (i_node)
     {
     case XML_READER_STARTELEM:
@@ -305,7 +305,7 @@ static bool parse_tracklist_node COMPLEX_INTERFACE
     int i_node;
 
     /* now parse the <track>s */
-    while ((i_node = xml_ReaderNextNode(p_xml_reader, &name)) > 0)
+    while ((i_node = xml_ReaderNextNode(p_xml_reader, &name)) > XML_READER_NONE)
     {
         if (i_node == XML_READER_STARTELEM)
         {
@@ -377,7 +377,7 @@ static bool parse_track_node COMPLEX_INTERFACE
     /* reset i_track_id */
     p_sys->i_track_id = -1;
 
-    while ((i_node = xml_ReaderNextNode(p_xml_reader, &name)) > 0)
+    while ((i_node = xml_ReaderNextNode(p_xml_reader, &name)) > XML_READER_NONE)
         switch (i_node)
     {
     case XML_READER_STARTELEM:
@@ -636,7 +636,7 @@ static bool parse_extension_node COMPLEX_INTERFACE
     }
 
     /* parse the child elements */
-    while ((i_node = xml_ReaderNextNode(p_xml_reader, &name)) > 0)
+    while ((i_node = xml_ReaderNextNode(p_xml_reader, &name)) > XML_READER_NONE)
     {
         switch (i_node)
         {
@@ -783,8 +783,12 @@ static bool skip_element COMPLEX_INTERFACE
                     ++lvl;
                 break;
             }
-            case XML_READER_ENDELEM: lvl--; break;
-            case 0: case -1: return false;
+            case XML_READER_ENDELEM:
+                lvl--;
+                break;
+            case XML_READER_NONE:
+            case XML_READER_ERROR:
+                return false;
         }
 
     return true;