[vlc-devel] commit: Simplify code. ( Rémi Duraffort )

[git version control]

vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Wed Aug 13 19:56:14 2008 +0200| [f678aa83bed94b1a68c3098828f0442437261fdc] | committer: Rémi Duraffort 

Simplify code.

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

 src/input/es_out.c    |    4 ++--
 src/input/subtitles.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 9cbd1f6..547f993 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -671,12 +671,12 @@ static char *EsOutProgramGetMetaName( es_out_pgrm_t *p_pgrm )
     if( p_pgrm->psz_name )
     {
         if( asprintf( &psz, _("%s [%s %d]"), p_pgrm->psz_name, _("Program"), p_pgrm->i_id ) == -1 )
-            psz = NULL;
+            return NULL;
     }
     else
     {
         if( asprintf( &psz, "%s %d", _("Program"), p_pgrm->i_id ) == -1 )
-            psz = NULL;
+            return NULL;
     }
     return psz;
 }
diff --git a/src/input/subtitles.c b/src/input/subtitles.c
index 0471c58..06b64b9 100644
--- a/src/input/subtitles.c
+++ b/src/input/subtitles.c
@@ -291,7 +291,7 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path,
 
         f_fname = strdup( psz_fname );
         if( asprintf( &f_dir, "%s%c", psz_cwd, DIR_SEP_CHAR ) == -1 )
-        f_dir = NULL; /* Assure that function will return in next test */
+            f_dir = NULL; /* Assure that function will return in next test */
         free( psz_cwd );
     }
     if( !f_fname || !f_dir )