[vlc-commits] demux/playlist: itml: manual inline of FREE_ATT_KEY

[Filip Roséen]

vlc | branch: master | Filip Roséen <filip at atch.se> | Sun May 21 20:49:06 2017 +0200| [72efe667e375879bf0e4a9b8b4b73ba69fd1c272] | committer: Marvin Scholz

demux/playlist: itml: manual inline of FREE_ATT_KEY

As the macro is used once, there is no need for it to exist at all.

Signed-off-by: Marvin Scholz <epirat07 at gmail.com>

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

 modules/demux/playlist/itml.c | 3 ++-
 modules/demux/playlist/itml.h | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/demux/playlist/itml.c b/modules/demux/playlist/itml.c
index fda2e102bc..ba837eb343 100644
--- a/modules/demux/playlist/itml.c
+++ b/modules/demux/playlist/itml.c
@@ -199,7 +199,8 @@ static bool parse_dict( demux_t *p_demux, input_item_node_t *p_input_node,
                                                  NULL ) )
                 {
                     p_handler = NULL;
-                    FREE_ATT_KEY();
+                    FREENULL( psz_key );
+                    FREENULL( psz_value );
                 }
                 else
                     goto end;
diff --git a/modules/demux/playlist/itml.h b/modules/demux/playlist/itml.h
index 213e2a598a..489784f0c1 100644
--- a/modules/demux/playlist/itml.h
+++ b/modules/demux/playlist/itml.h
@@ -29,7 +29,6 @@
 #define FREE_VALUE()    FREENULL( psz_value )
 #define FREE_KEY()      FREENULL( psz_key )
 #define FREE_ATT()      FREE_VALUE()
-#define FREE_ATT_KEY()  do{ FREE_VALUE();FREE_KEY();} while(0)
 
 #define UNKNOWN_CONTENT 0
 #define SIMPLE_CONTENT 1