libFLAC: Remove un-needed test for NULL before free
Passing a NULL pointer to free() is a no-op.
diff --git a/src/libFLAC/metadata_object.c b/src/libFLAC/metadata_object.c
index df1cb5e..a799bf8 100644
--- a/src/libFLAC/metadata_object.c
+++ b/src/libFLAC/metadata_object.c
@@ -87,8 +87,7 @@
FLAC__byte *copy;
FLAC__ASSERT(0 != to);
if(copy_bytes_(©, from, bytes)) {
- if(*to)
- free(*to);
+ free(*to);
*to = copy;
return true;
}
@@ -120,8 +119,7 @@
char *copy = strdup(from);
FLAC__ASSERT(to);
if(copy) {
- if(*to)
- free(*to);
+ free(*to);
*to = copy;
return true;
}
@@ -222,11 +220,9 @@
FLAC__ASSERT(0 != object_array && num_comments > 0);
for(i = 0; i < num_comments; i++)
- if(0 != object_array[i].entry)
- free(object_array[i].entry);
+ free(object_array[i].entry);
- if(0 != object_array)
- free(object_array);
+ free(object_array);
}
static FLAC__StreamMetadata_VorbisComment_Entry *vorbiscomment_entry_array_copy_(const FLAC__StreamMetadata_VorbisComment_Entry *object_array, unsigned num_comments)
@@ -291,8 +287,7 @@
*dest = *src;
}
- if(0 != save)
- free(save);
+ free(save);
vorbiscomment_calculate_length_(object);
return true;
@@ -374,8 +369,7 @@
}
}
- if(0 != object_array)
- free(object_array);
+ free(object_array);
}
static FLAC__StreamMetadata_CueSheet_Track *cuesheet_track_array_copy_(const FLAC__StreamMetadata_CueSheet_Track *object_array, unsigned num_tracks)
@@ -422,8 +416,7 @@
*dest = *src;
}
- if(0 != save)
- free(save);
+ free(save);
cuesheet_calculate_length_(object);
return true;
@@ -509,8 +502,7 @@
return 0;
}
if(!copy_cstring_((char**)(&object->data.picture.description), "")) {
- if(object->data.picture.mime_type)
- free(object->data.picture.mime_type);
+ free(object->data.picture.mime_type);
free(object);
return 0;
}
@@ -925,8 +917,7 @@
object->data.application.data = data;
}
- if(0 != save)
- free(save);
+ free(save);
object->length = FLAC__STREAM_METADATA_APPLICATION_ID_LEN / 8 + length;
return true;
@@ -1315,8 +1306,7 @@
vc = &object->data.vorbis_comment;
/* free the comment at comment_num */
- if(0 != vc->comments[comment_num].entry)
- free(vc->comments[comment_num].entry);
+ free(vc->comments[comment_num].entry);
/* move all comments > comment_num backward one space */
memmove(&vc->comments[comment_num], &vc->comments[comment_num+1], sizeof(FLAC__StreamMetadata_VorbisComment_Entry)*(vc->num_comments-comment_num-1));
@@ -1595,8 +1585,7 @@
if(new_num_tracks < object->data.cue_sheet.num_tracks) {
unsigned i;
for(i = new_num_tracks; i < object->data.cue_sheet.num_tracks; i++)
- if(0 != object->data.cue_sheet.tracks[i].indices)
- free(object->data.cue_sheet.tracks[i].indices);
+ free(object->data.cue_sheet.tracks[i].indices);
}
if(new_size == 0) {
@@ -1664,8 +1653,7 @@
cs = &object->data.cue_sheet;
/* free the track at track_num */
- if(0 != cs->tracks[track_num].indices)
- free(cs->tracks[track_num].indices);
+ free(cs->tracks[track_num].indices);
/* move all tracks > track_num backward one space */
memmove(&cs->tracks[track_num], &cs->tracks[track_num+1], sizeof(FLAC__StreamMetadata_CueSheet_Track)*(cs->num_tracks-track_num-1));
@@ -1754,8 +1742,7 @@
object->data.picture.mime_type = mime_type;
}
- if(0 != old)
- free(old);
+ free(old);
object->length -= old_length;
object->length += new_length;
@@ -1786,8 +1773,7 @@
object->data.picture.description = description;
}
- if(0 != old)
- free(old);
+ free(old);
object->length -= old_length;
object->length += new_length;
@@ -1813,8 +1799,7 @@
object->data.picture.data = data;
}
- if(0 != old)
- free(old);
+ free(old);
object->length -= object->data.picture.data_length;
object->data.picture.data_length = length;