diff options
| author | cboesch <cboesch@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-11-14 09:12:34 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-14 13:11:20 +0200 |
| commit | fe3c4810e1c8b535caf07df8e4434e322d3e6fc0 (patch) | |
| tree | cbcd859f358c479223eb7b0aa2a2d3dfe1c81b69 /libao2 | |
| parent | b492561241f2a3263a8ab558fafc957130dbdfc1 (diff) | |
| download | mpv-fe3c4810e1c8b535caf07df8e4434e322d3e6fc0.tar.bz2 mpv-fe3c4810e1c8b535caf07df8e4434e322d3e6fc0.tar.xz | |
cleanup: remove NULL checks before free() all over the code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32624 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2')
| -rw-r--r-- | libao2/ao_coreaudio.c | 6 | ||||
| -rw-r--r-- | libao2/ao_pcm.c | 3 | ||||
| -rw-r--r-- | libao2/ao_sun.c | 2 | ||||
| -rw-r--r-- | libao2/audio_out.c | 12 |
4 files changed, 9 insertions, 14 deletions
diff --git a/libao2/ao_coreaudio.c b/libao2/ao_coreaudio.c index d4835e87ad..010d869445 100644 --- a/libao2/ao_coreaudio.c +++ b/libao2/ao_coreaudio.c @@ -728,7 +728,7 @@ static int OpenSPDIF(void) ao_msg(MSGT_AO, MSGL_WARN, "Could not retrieve the original stream format: [%4.4s]\n", (char *)&err); - if (p_format_list) free(p_format_list); + free(p_format_list); continue; } ao->b_revert = 1; @@ -755,9 +755,9 @@ static int OpenSPDIF(void) ao->stream_format = p_format_list[i_current_rate_format]; else ao->stream_format = p_format_list[i_backup_rate_format]; /* And if we have to, any digital format will be just fine (highest rate possible). */ } - if (p_format_list) free(p_format_list); + free(p_format_list); } - if (p_streams) free(p_streams); + free(p_streams); if (ao->i_stream_index < 0) { diff --git a/libao2/ao_pcm.c b/libao2/ao_pcm.c index 85d93015c4..e10125fb90 100644 --- a/libao2/ao_pcm.c +++ b/libao2/ao_pcm.c @@ -218,8 +218,7 @@ static void uninit(int immed){ } } fclose(fp); - if (ao_outputfilename) - free(ao_outputfilename); + free(ao_outputfilename); ao_outputfilename = NULL; } diff --git a/libao2/ao_sun.c b/libao2/ao_sun.c index 10cc87e1b0..ef8417c5f9 100644 --- a/libao2/ao_sun.c +++ b/libao2/ao_sun.c @@ -227,7 +227,7 @@ static int realtime_samplecounter_available(char *dev) error: - if (silence != NULL) free(silence); + free(silence); if (fd >= 0) { // remove the 0 bytes from the above measurement from the // audio driver's STREAMS queue diff --git a/libao2/audio_out.c b/libao2/audio_out.c index d6cb01fb3f..60671a799f 100644 --- a/libao2/audio_out.c +++ b/libao2/audio_out.c @@ -143,10 +143,8 @@ const ao_functions_t* init_best_audio_out(char** ao_list,int use_plugin,int rate while(ao_list[0][0]){ char* ao=ao_list[0]; int ao_len; - if (ao_subdevice) { - free(ao_subdevice); - ao_subdevice = NULL; - } + free(ao_subdevice); + ao_subdevice = NULL; ao_subdevice=strchr(ao,':'); if(ao_subdevice){ ao_len = ao_subdevice - ao; @@ -175,10 +173,8 @@ const ao_functions_t* init_best_audio_out(char** ao_list,int use_plugin,int rate ++ao_list; if(!(ao_list[0])) return NULL; // do NOT fallback to others } - if (ao_subdevice) { - free(ao_subdevice); - ao_subdevice = NULL; - } + free(ao_subdevice); + ao_subdevice = NULL; mp_tmsg(MSGT_AO, MSGL_V, "Trying every known audio driver...\n"); |