[vlc-devel] commit: Remove useless NULLity checks ( Rémi Denis-Courmont )

git version control git at videolan.org
Tue Mar 4 21:21:37 CET 2008


vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Tue Mar  4 22:10:54 2008 +0200| [4dded813f179fa246a08c3eb8da070760c0a8ed5]

Remove useless NULLity checks

Signed-off-by: Rémi Denis-Courmont <rem at videolan.org>

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

 src/input/input.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/input/input.c b/src/input/input.c
index a8b701c..6490e6d 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -2201,7 +2201,7 @@ static int InputSourceInit( input_thread_t *p_input,
         {
             psz_demux = psz_forced_demux;
         }
-        else if( !psz_demux || *psz_demux == '\0' )
+        else if( *psz_demux == '\0' )
         {
             /* special hack for forcing a demuxer with --demux=module
              * (and do nothing with a list) */
@@ -2227,9 +2227,9 @@ static int InputSourceInit( input_thread_t *p_input,
     else
     {
         /* Preparsing is only for file:// */
-        if( psz_demux && *psz_demux )
+        if( *psz_demux )
             goto error;
-        if( !psz_access || !*psz_access ) /* path without scheme:// */
+        if( !*psz_access ) /* path without scheme:// */
             psz_access = "file";
         if( strcmp( psz_access, "file" ) )
             goto error;




More information about the vlc-devel mailing list