Forgiven in the previous commit (useless test)

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

diff --git a/modules/demux/playlist/xspf.h b/modules/demux/playlist/xspf.h
index 374153f4c0a912482a10a5f1be15cd384038dcf2..d0a5aacb7880eb141f215037ff5e5f412dc0ac18 100644 (file)
--- a/modules/demux/playlist/xspf.h
+++ b/modules/demux/playlist/xspf.h
@@ -21,22 +21,22 @@
  */
 
 /* 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()
 
-#define UNKNOWN_CONTENT 0
-#define SIMPLE_CONTENT 1
-#define COMPLEX_CONTENT 2
+enum {
+    UNKNOWN_CONTENT,
+    SIMPLE_CONTENT,
+    COMPLEX_CONTENT
+};
 
-#define SIMPLE_INTERFACE  (playlist_item_t *p_item,\
-                           input_item_t    *p_input,\
+#define SIMPLE_INTERFACE  (input_item_t    *p_input,\
                            const char      *psz_name,\
                            char            *psz_value)
 #define COMPLEX_INTERFACE (demux_t         *p_demux,\
                            playlist_t      *p_playlist,\
-                           playlist_item_t *p_item,\
-                           input_item_t    *p_input, \
+                           input_item_t    *p_input_item,\
                            xml_reader_t    *p_xml_reader,\
                            const char      *psz_element)