Commit f678aa83 authored by Rémi Duraffort's avatar Rémi Duraffort

Simplify code.

parent 36fd3e1b
......@@ -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;
}
......
......@@ -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 )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment