Do not assert memory allocations

[vlc] / modules / demux / playlist / xspf.h

diff --git a/modules/demux/playlist/xspf.h b/modules/demux/playlist/xspf.h
index cd28c5c01324382e85dc20cc9a3282532f14db45..041bef0a9b2ffeda6f7891b3eb86c4d21d138e08 100644 (file)
--- a/modules/demux/playlist/xspf.h
+++ b/modules/demux/playlist/xspf.h
@@ -21,8 +21,8 @@
  */
 
 /* defines */
-#define FREE_NAME()  if (psz_name) {free(psz_name);psz_name=NULL;}
-#define FREE_VALUE() if (psz_value) {free(psz_value);psz_value=NULL;}
+#define FREE_NAME()  free(psz_name);psz_name=NULL;
+#define FREE_VALUE() free(psz_value);psz_value=NULL;
 #define FREE_ATT()   FREE_NAME();FREE_VALUE()
 
 enum {
@@ -35,19 +35,19 @@ enum {
                            const char      *psz_name,\
                            char            *psz_value)
 #define COMPLEX_INTERFACE (demux_t         *p_demux,\
-                           playlist_t      *p_playlist,\
                            input_item_t    *p_input_item,\
                            xml_reader_t    *p_xml_reader,\
                            const char      *psz_element)
 
 /* prototypes */
-static vlc_bool_t parse_playlist_node COMPLEX_INTERFACE;
-static vlc_bool_t parse_tracklist_node COMPLEX_INTERFACE;
-static vlc_bool_t parse_track_node COMPLEX_INTERFACE;
-static vlc_bool_t parse_extension_node COMPLEX_INTERFACE;
-static vlc_bool_t parse_extitem_node COMPLEX_INTERFACE;
-static vlc_bool_t set_item_info SIMPLE_INTERFACE;
-static vlc_bool_t skip_element COMPLEX_INTERFACE;
+static bool parse_playlist_node COMPLEX_INTERFACE;
+static bool parse_tracklist_node COMPLEX_INTERFACE;
+static bool parse_track_node COMPLEX_INTERFACE;
+static bool parse_extension_node COMPLEX_INTERFACE;
+static bool parse_extitem_node COMPLEX_INTERFACE;
+static bool set_item_info SIMPLE_INTERFACE;
+static bool set_option SIMPLE_INTERFACE;
+static bool skip_element COMPLEX_INTERFACE;
 
 /* datatypes */
 typedef struct
@@ -56,7 +56,7 @@ typedef struct
     int type;
     union
     {
-        vlc_bool_t (*smpl) SIMPLE_INTERFACE;
-        vlc_bool_t (*cmplx) COMPLEX_INTERFACE;
+        bool (*smpl) SIMPLE_INTERFACE;
+        bool (*cmplx) COMPLEX_INTERFACE;
     } pf_handler;
 } xml_elem_hnd_t;