Skip to content

V
vlc-2-2
Commit 570cece5 authored by Rémi Duraffort's avatar Rémi Duraffort
Browse files
Options

Remove uneeded test before freeing. 

In the same time add spaces in order to follow code convention.
parent e6ab052c
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 14 deletions
include/vlc_es.h
View file @ 570cece5
...@@ -276,11 +276,11 @@ static inline void es_format_Copy( es_format_t *dst, es_format_t *src ) ...@@ -276,11 +276,11 @@ static inline void es_format_Copy( es_format_t *dst, es_format_t *src )
malloc(dst->i_extra_languages * sizeof(*dst->p_extra_languages )); malloc(dst->i_extra_languages * sizeof(*dst->p_extra_languages ));
for( i = 0; i < dst->i_extra_languages; i++ ) { for( i = 0; i < dst->i_extra_languages; i++ ) {
if( src->p_extra_languages[i].psz_language ) if( src->p_extra_languages[i].psz_language )
dst->p_extra_languages[i].psz_language = strdup(src->p_extra_languages[i].psz_language); dst->p_extra_languages[i].psz_language = strdup( src->p_extra_languages[i].psz_language );
else else
dst->p_extra_languages[i].psz_language = NULL; dst->p_extra_languages[i].psz_language = NULL;
if( src->p_extra_languages[i].psz_description ) if( src->p_extra_languages[i].psz_description )
dst->p_extra_languages[i].psz_description = strdup(src->p_extra_languages[i].psz_description); dst->p_extra_languages[i].psz_description = strdup( src->p_extra_languages[i].psz_description );
else else
dst->p_extra_languages[i].psz_description = NULL; dst->p_extra_languages[i].psz_description = NULL;
} }
...@@ -288,28 +288,23 @@ static inline void es_format_Copy( es_format_t *dst, es_format_t *src ) ...@@ -288,28 +288,23 @@ static inline void es_format_Copy( es_format_t *dst, es_format_t *src )
static inline void es_format_Clean( es_format_t *fmt ) static inline void es_format_Clean( es_format_t *fmt )
{ {
if( fmt->psz_language ) free( fmt->psz_language ); free( fmt->psz_language );
free( fmt->psz_description );
if( fmt->psz_description ) free( fmt->psz_description );
if( fmt->i_extra > 0 ) free( fmt->p_extra ); if( fmt->i_extra > 0 ) free( fmt->p_extra );
if( fmt->video.p_palette )
free( fmt->video.p_palette ); free( fmt->video.p_palette );
free( fmt->subs.psz_encoding );
if( fmt->subs.psz_encoding ) free( fmt->subs.psz_encoding );
if( fmt->i_extra_languages > 0 && fmt->p_extra_languages ) if( fmt->i_extra_languages > 0 && fmt->p_extra_languages )
{ {
int i; int i;
for( i = 0; i < fmt->i_extra_languages; i++ ) for( i = 0; i < fmt->i_extra_languages; i++ )
{ {
if( fmt->p_extra_languages[i].psz_language )
free( fmt->p_extra_languages[i].psz_language ); free( fmt->p_extra_languages[i].psz_language );
if( fmt->p_extra_languages[i].psz_description )
free( fmt->p_extra_languages[i].psz_description ); free( fmt->p_extra_languages[i].psz_description );
} }
free(fmt->p_extra_languages); free( fmt->p_extra_languages );
} }
/* es_format_Clean can be called multiple times */ /* es_format_Clean can be called multiple times */
......
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