[easytag] Match g_malloc() usage with g_free()
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [easytag] Match g_malloc() usage with g_free()
- Date: Tue, 5 Feb 2013 21:40:08 +0000 (UTC)
commit de7778d1fd6b5a329e08adb285cbd41a8e021722
Author: David King <amigadave amigadave com>
Date: Tue Feb 5 17:14:19 2013 +0000
Match g_malloc() usage with g_free()
src/id3v24_tag.c | 8 ++++----
src/wavpack_tag.c | 26 +++++++++++++-------------
2 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/src/id3v24_tag.c b/src/id3v24_tag.c
index 3540f5d..ed93153 100644
--- a/src/id3v24_tag.c
+++ b/src/id3v24_tag.c
@@ -148,7 +148,7 @@ gboolean Id3tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
{
/* Determine version if user want to upgrade old tags */
if (CONVERT_OLD_ID3V2_TAG_VERSION
- && (string1 = realloc(string1, tagsize))
+ && (string1 = g_realloc (string1, tagsize))
&& (read(tmpfile, &string1[ID3_TAG_QUERYSIZE], tagsize - ID3_TAG_QUERYSIZE) == tagsize - ID3_TAG_QUERYSIZE)
&& (tag = id3_tag_parse((id3_byte_t const *)string1, tagsize))
)
@@ -700,7 +700,7 @@ libid3tag_Get_Frame_Str(const struct id3_frame *frame, unsigned etag_field_type,
if (USE_NON_STANDARD_ID3_READING_CHARACTER_SET)
{
tmpstr = convert_string(latinstr, FILE_READING_ID3V1V2_CHARACTER_SET, "UTF-8", FALSE);
- free(latinstr);
+ g_free (latinstr);
}
else
tmpstr = latinstr;
@@ -756,7 +756,7 @@ libid3tag_Get_Frame_Str(const struct id3_frame *frame, unsigned etag_field_type,
if (retstr)
*retstr = ret;
else
- free(ret);
+ g_free (ret);
return retval;
}
@@ -1167,7 +1167,7 @@ id3taglib_set_field(struct id3_frame *frame,
}
latinstr = convert_string(str, "UTF-8", encname ? encname : "ISO-8859-1//IGNORE", TRUE);
- free(encname);
+ g_free (encname);
buf = id3_latin1_ucs4duplicate((id3_latin1_t const *)latinstr);
} else
{
diff --git a/src/wavpack_tag.c b/src/wavpack_tag.c
index e33f78e..1437996 100644
--- a/src/wavpack_tag.c
+++ b/src/wavpack_tag.c
@@ -107,7 +107,7 @@ gboolean Wavpack_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
FileTag->title = Try_To_Validate_Utf8_String(field);
}
- free(field);
+ g_free (field);
/*
* Artist
@@ -119,7 +119,7 @@ gboolean Wavpack_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
FileTag->artist = Try_To_Validate_Utf8_String(field);
}
- free(field);
+ g_free (field);
/*
* Album
@@ -131,7 +131,7 @@ gboolean Wavpack_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
FileTag->album = Try_To_Validate_Utf8_String(field);
}
- free(field);
+ g_free (field);
/*
* Discnumber
@@ -143,7 +143,7 @@ gboolean Wavpack_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
FileTag->disc_number = Try_To_Validate_Utf8_String(field);
}
- free(field);
+ g_free (field);
/*
* Year
@@ -155,7 +155,7 @@ gboolean Wavpack_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
FileTag->year = Try_To_Validate_Utf8_String(field);
}
- free(field);
+ g_free (field);
/*
* Tracknumber + tracktotal
@@ -177,7 +177,7 @@ gboolean Wavpack_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
FileTag->track = Try_To_Validate_Utf8_String(field);
}
- free(field);
+ g_free (field);
/*
* Genre
@@ -189,7 +189,7 @@ gboolean Wavpack_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
FileTag->genre = Try_To_Validate_Utf8_String(field);
}
- free(field);
+ g_free (field);
/*
* Comment
@@ -201,7 +201,7 @@ gboolean Wavpack_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
FileTag->comment = Try_To_Validate_Utf8_String(field);
}
- free(field);
+ g_free (field);
/*
* Composer
@@ -213,7 +213,7 @@ gboolean Wavpack_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
FileTag->composer = Try_To_Validate_Utf8_String(field);
}
- free(field);
+ g_free (field);
/*
* Original artist
@@ -225,7 +225,7 @@ gboolean Wavpack_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
FileTag->orig_artist = Try_To_Validate_Utf8_String(field);
}
- free(field);
+ g_free (field);
/*
* Copyright
@@ -237,7 +237,7 @@ gboolean Wavpack_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
FileTag->copyright = Try_To_Validate_Utf8_String(field);
}
- free(field);
+ g_free (field);
/*
* URL
@@ -249,7 +249,7 @@ gboolean Wavpack_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
FileTag->url = Try_To_Validate_Utf8_String(field);
}
- free(field);
+ g_free (field);
/*
* Encoded by
@@ -261,7 +261,7 @@ gboolean Wavpack_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
FileTag->encoded_by = Try_To_Validate_Utf8_String(field);
}
- free(field);
+ g_free (field);
WavpackCloseFile(wpc);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]