[easytag/wip/dsf-support: 1/4] Set a GError in id3tag_write_file_v24tag()
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [easytag/wip/dsf-support: 1/4] Set a GError in id3tag_write_file_v24tag()
- Date: Sun, 9 Nov 2014 23:55:25 +0000 (UTC)
commit c11c8b5abf3e19f186db4f9290e24e008bb5e5a5
Author: David King <amigadave amigadave com>
Date: Sun Nov 9 14:05:43 2014 +0000
Set a GError in id3tag_write_file_v24tag()
When returning FALSE to indicate an error, always set the passed-in
GError.
src/tags/id3v24_tag.c | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/src/tags/id3v24_tag.c b/src/tags/id3v24_tag.c
index ee7739b..c142c4a 100644
--- a/src/tags/id3v24_tag.c
+++ b/src/tags/id3v24_tag.c
@@ -936,10 +936,16 @@ id3tag_write_file_v24tag (const ET_File *ETFile,
/* Read old v2 tag */
if ((file = id3_file_open(filename, ID3_FILE_MODE_READWRITE)) == NULL)
+ {
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "%s",
+ _("Error reading tags from file"));
return FALSE;
+ }
if ((tmptag = id3_file_tag(file)) == NULL)
{
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "%s",
+ _("Error reading tags from file"));
id3_file_close(file);
return FALSE;
}
@@ -964,6 +970,8 @@ id3tag_write_file_v24tag (const ET_File *ETFile,
{
if ((v2tag = id3_tag_new()) == NULL)
{
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "%s",
+ _("Error reading tags from file"));
id3_file_close(file);
return FALSE;
}
@@ -1001,7 +1009,11 @@ id3tag_write_file_v24tag (const ET_File *ETFile,
{
v1tag = id3_tag_new();
if (!v1tag)
+ {
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "%s",
+ _("Error reading tags from file"));
return FALSE;
+ }
id3_tag_options(v1tag, ID3_TAG_OPTION_ID3V1, ~0);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]