From: Rémi Duraffort <ivoire@videolan.org>
Date: Sat, 4 Apr 2009 06:50:45 +0000 (+0200)
Subject: if( A == NULL || EMPTY_STR( A ) ) => if( EMPTY_STR( A ) )
X-Git-Tag: 1.0.0-pre2~240
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=5eb12a5c380c3374cccef4cff5e566c25ea291b3;p=vlc

if( A == NULL || EMPTY_STR( A ) ) => if( EMPTY_STR( A ) )
---

diff --git a/modules/misc/notify/growl.m b/modules/misc/notify/growl.m
index 21b9ad5bfb..c1b07eb270 100644
--- a/modules/misc/notify/growl.m
+++ b/modules/misc/notify/growl.m
@@ -181,11 +181,11 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
     input_item_t *p_item = input_GetItem( p_input );
 
     psz_title = input_item_GetTitle( p_item );
-    if( psz_title == NULL || EMPTY_STR( psz_title ) )
+    if( EMPTY_STR( psz_title ) )
     {
         free( psz_title );
         psz_title = input_item_GetName( input_GetItem( p_input ) );
-        if( psz_title == NULL || EMPTY_STR( psz_title ) )
+        if( EMPTY_STR( psz_title ) )
         {
             free( psz_title );
             vlc_object_release( p_input );
diff --git a/modules/misc/notify/growl_udp.c b/modules/misc/notify/growl_udp.c
index 4e980c1137..4f0387b694 100644
--- a/modules/misc/notify/growl_udp.c
+++ b/modules/misc/notify/growl_udp.c
@@ -143,11 +143,11 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
     input_item_t *p_item = input_GetItem( p_input );
 
     psz_title = input_item_GetTitle( p_item );
-    if( psz_title == NULL || EMPTY_STR( psz_title ) )
+    if( EMPTY_STR( psz_title ) )
     {
         free( psz_title );
         psz_title = input_item_GetName( input_GetItem( p_input ) );
-        if( psz_title == NULL || EMPTY_STR( psz_title ) )
+        if( EMPTY_STR( psz_title ) )
         {
             free( psz_title );
             vlc_object_release( p_input );
diff --git a/modules/misc/notify/notify.c b/modules/misc/notify/notify.c
index 65ce65eaf7..1c1246acf1 100644
--- a/modules/misc/notify/notify.c
+++ b/modules/misc/notify/notify.c
@@ -183,12 +183,12 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
     psz_artist = input_item_GetArtist( p_input_item );
     psz_album = input_item_GetAlbum( p_input_item );
     psz_title = input_item_GetTitle( p_input_item );
-    if( ( psz_title == NULL ) || EMPTY_STR( psz_title ) )
+    if( EMPTY_STR( psz_title ) )
     {
         free( psz_title );
         psz_title = input_item_GetName( p_input_item );
     }
-    if( ( psz_title == NULL ) || EMPTY_STR( psz_title ) )
+    if( EMPTY_STR( psz_title ) )
     {  /* Not enough metadata ... */
         free( psz_title );
         free( psz_artist );