From: Rémi Duraffort <ivoire@videolan.org>
Date: Mon, 19 Apr 2010 10:35:06 +0000 (+0200)
Subject: "strlen( psz ) == 0" => "*psz == '\0'"
X-Git-Tag: 1.2.0-pre1~6962
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=4b4d2494895fdd9d0ac16849c9a679539ad19033;p=vlc

"strlen( psz ) == 0" => "*psz == '\0'"
---

diff --git a/modules/access/bda/bdagraph.cpp b/modules/access/bda/bdagraph.cpp
index 1a19c7c50a..1a41bb0d78 100644
--- a/modules/access/bda/bdagraph.cpp
+++ b/modules/access/bda/bdagraph.cpp
@@ -911,7 +911,7 @@ HRESULT BDAGraph::CreateTuneRequest()
 
             /* Test for a specific Tuning space name supplied on the command
              * line as dvb-networkname=xxx */
-            if( strlen( l.psz_network_name ) == 0 ||
+            if( *l.psz_network_name == '\0' ||
                 strcmp( l.psz_network_name, l.psz_bstr_name ) == 0 )
             {
                 msg_Dbg( p_access, "CreateTuneRequest: Using Tuning Space: %s",
@@ -1001,7 +1001,7 @@ HRESULT BDAGraph::CreateTuneRequest()
             l.psz_bstr_name = new char[ l.i_name_len ];
             l.i_name_len = WideCharToMultiByte( CP_ACP, 0, l.bstr_name, -1,
                 l.psz_bstr_name, l.i_name_len, NULL, NULL );
-            if( strlen( l.psz_network_name ) == 0 ||
+            if( *l.psz_network_name == '\0' ||
                 strcmp( l.psz_network_name, l.psz_bstr_name ) == 0 )
             {
                 msg_Dbg( p_access, "CreateTuneRequest: Using Tuning Space: %s",
diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index c84b74efd9..411c2dd02d 100644
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -3084,7 +3084,7 @@ static void __MP4_BoxGet( MP4_Box_t **pp_result,
             }
         }
         else
-        if( strlen( psz_token ) == 0 )
+        if( *psz_token == '\0' )
         {
             p_box = p_box->p_first;
             for( ; ; )
diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c
index c319946793..394a80bbf8 100644
--- a/modules/demux/subtitle.c
+++ b/modules/demux/subtitle.c
@@ -1855,7 +1855,7 @@ static int ParsePSB( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx )
 
 static int64_t ParseRealTime( char *psz, int *h, int *m, int *s, int *f )
 {
-    if( strlen( psz ) == 0 ) return 0;
+    if( *psz == '\0' ) return 0;
     if( sscanf( psz, "%d:%d:%d.%d", h, m, s, f ) == 4 ||
             sscanf( psz, "%d:%d.%d", m, s, f ) == 3 ||
             sscanf( psz, "%d.%d", s, f ) == 2 ||
diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c
index f3641edc11..2c58fab7c0 100644
--- a/modules/gui/ncurses.c
+++ b/modules/gui/ncurses.c
@@ -2166,7 +2166,7 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh )
         DrawEmptyLine( p_sys->w, 7, 1, COLS-2 );
         if( p_sys->psz_search_chain )
         {
-            if( strlen( p_sys->psz_search_chain ) == 0 &&
+            if( *p_sys->psz_search_chain == '\0' &&
                 p_sys->psz_old_search != NULL )
             {
                 /* Searching next entry */
diff --git a/modules/stream_out/raop.c b/modules/stream_out/raop.c
index 498b1c487d..c7e5a041f1 100644
--- a/modules/stream_out/raop.c
+++ b/modules/stream_out/raop.c
@@ -577,7 +577,7 @@ static char *ReadPasswordFile( vlc_object_t *p_this, const char *psz_path )
             *psz_newline = '\0';
     }
 
-    if ( strlen( ps_buffer ) == 0 ) {
+    if ( *ps_buffer == '\0' ) {
         msg_Err( p_this, "No password could be read from '%s'", psz_path );
         goto error;
     }