[easytag] Use g_return_val_if_fail() for more invariants

[David King <davidk src gnome org>]

commit bde0909d1a87c5110c107483b70ac38fe488b769
Author: David King <amigadave amigadave com>
Date:   Fri May 17 07:50:03 2013 +0100

    Use g_return_val_if_fail() for more invariants
    
    Convert tagging functions to use g_return_val_if_fail() to check
    invariants.

 src/ape_tag.c     |    5 ++---
 src/flac_header.c |    3 +--
 src/flac_tag.c    |    8 ++------
 src/id3_tag.c     |    4 +---
 src/id3v24_tag.c  |    4 +---
 src/mp4_header.c  |    3 +--
 src/mp4_tag.c     |    3 +--
 src/ogg_header.c  |    6 ++----
 src/ogg_tag.c     |    7 ++-----
 src/wavpack_tag.c |    6 ++----
 10 files changed, 15 insertions(+), 34 deletions(-)
---
diff --git a/src/ape_tag.c b/src/ape_tag.c
index 48afee7..d4faa65 100644
--- a/src/ape_tag.c
+++ b/src/ape_tag.c
@@ -53,8 +53,7 @@ gboolean Ape_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
     gchar *string1 = NULL;
     apetag *ape_cnt;
 
-    if (!filename || !FileTag)
-        return FALSE;
+    g_return_val_if_fail (filename != NULL && FileTag != NULL, FALSE);
 
     if ((file = fopen(filename, "rb")) == NULL)
     {
@@ -202,7 +201,7 @@ gboolean Ape_Tag_Write_File_Tag (ET_File *ETFile)
     apetag   *ape_mem;
 
     if (!ETFile || !ETFile->FileTag)
-        return FALSE;
+    g_return_val_if_fail (ETFile != NULL && ETFile->FileTag != NULL, FALSE);
 
     FileTag     = (File_Tag *)ETFile->FileTag->data;
     filename_in = ((File_Name *)ETFile->FileNameCur->data)->value;
diff --git a/src/flac_header.c b/src/flac_header.c
index 27c9518..03ca2c2 100644
--- a/src/flac_header.c
+++ b/src/flac_header.c
@@ -91,8 +91,7 @@ gboolean Flac_Header_Read_File_Info (gchar *filename, ET_File_Info *ETFileInfo)
 
     file_info_struct tmp_file_info;
 
-    if (!filename || !ETFileInfo)
-        return FALSE;
+    g_return_val_if_fail (filename != NULL && ETFileInfo != NULL, FALSE);
 
     if ( (file=fopen(filename,"r"))==NULL )
     {
diff --git a/src/flac_tag.c b/src/flac_tag.c
index f85b40b..0c067ff 100644
--- a/src/flac_tag.c
+++ b/src/flac_tag.c
@@ -107,9 +107,7 @@ gboolean Flac_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
     Picture *prev_pic = NULL;
     //gint j = 1;
 
-    
-    if (!filename || !FileTag)
-        return FALSE;
+    g_return_val_if_fail (filename != NULL && FileTag != NULL, FALSE);
 
     flac_error_msg = NULL;
 
@@ -821,9 +819,7 @@ gboolean Flac_Tag_Write_File_Tag (ET_File *ETFile)
     FLAC__StreamMetadata_VorbisComment_Entry vce_field_vendor_string; // To save vendor string
     gboolean vce_field_vendor_string_found = FALSE;
 
-    
-    if (!ETFile || !ETFile->FileTag)
-        return FALSE;
+    g_return_val_if_fail (ETFile != NULL && ETFile->FileTag != NULL, FALSE);
 
     FileTag       = (File_Tag *)ETFile->FileTag->data;
     filename      = ((File_Name *)ETFile->FileNameCur->data)->value;
diff --git a/src/id3_tag.c b/src/id3_tag.c
index dc0bb3c..349543a 100644
--- a/src/id3_tag.c
+++ b/src/id3_tag.c
@@ -128,6 +128,7 @@ Id3tag_Write_File_v23Tag (ET_File *ETFile)
     gchar *string1;
     Picture *pic;
 
+    g_return_val_if_fail (ETFile != NULL && ETFile->FileTag != NULL, FALSE);
 
     // When writing the first MP3 file, we check if the version of id3lib of the
     // system doesn't contain a bug when writting Unicode tags
@@ -138,9 +139,6 @@ Id3tag_Write_File_v23Tag (ET_File *ETFile)
         flag_id3lib_bugged = Id3tag_Check_If_Id3lib_Is_Bugged();
     }
 
-    if (!ETFile || !ETFile->FileTag)
-        return FALSE;
-
     FileTag  = (File_Tag *)ETFile->FileTag->data;
     filename      = ((File_Name *)ETFile->FileNameCur->data)->value;
     filename_utf8 = ((File_Name *)ETFile->FileNameCur->data)->value_utf8;
diff --git a/src/id3v24_tag.c b/src/id3v24_tag.c
index 7bceb4d..bef171d 100644
--- a/src/id3v24_tag.c
+++ b/src/id3v24_tag.c
@@ -777,9 +777,7 @@ gboolean Id3tag_Write_File_v24Tag (ET_File *ETFile)
     gboolean strip_tags = TRUE;
     guchar genre_value = ID3_INVALID_GENRE;
 
-
-    if (!ETFile && !ETFile->FileTag)
-        return FALSE;
+    g_return_val_if_fail (ETFile != NULL && ETFile->FileTag != NULL, FALSE);
 
     FileTag       = (File_Tag *)ETFile->FileTag->data;
     filename      = ((File_Name *)ETFile->FileNameCur->data)->value;
diff --git a/src/mp4_header.c b/src/mp4_header.c
index 8bb53d2..34a1d57 100644
--- a/src/mp4_header.c
+++ b/src/mp4_header.c
@@ -51,8 +51,7 @@ gboolean Mp4_Header_Read_File_Info (gchar *filename, ET_File_Info *ETFileInfo)
     TagLib_File *file;
     const TagLib_AudioProperties *properties;
 
-    if (!filename || !ETFileInfo)
-        return FALSE;
+    g_return_val_if_fail (filename != NULL && ETFileInfo != NULL, FALSE);
 
     /* Get size of file */
     ETFileInfo->size = Get_File_Size(filename);
diff --git a/src/mp4_tag.c b/src/mp4_tag.c
index a986c3a..9687df1 100644
--- a/src/mp4_tag.c
+++ b/src/mp4_tag.c
@@ -63,8 +63,7 @@ gboolean Mp4tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
     TagLib_Tag *tag;
     guint track;
 
-    if (!filename || !FileTag)
-        return FALSE;
+    g_return_val_if_fail (filename != NULL && FileTag != NULL, FALSE);
 
     if ( (file=fopen(filename,"r"))==NULL )
     {
diff --git a/src/ogg_header.c b/src/ogg_header.c
index 70669f2..9d86a46 100644
--- a/src/ogg_header.c
+++ b/src/ogg_header.c
@@ -60,8 +60,7 @@ gboolean Ogg_Header_Read_File_Info (gchar *filename, ET_File_Info *ETFileInfo)
     gint ret;
     gchar *filename_utf8;
 
-    if (!filename || !ETFileInfo)
-        return FALSE;
+    g_return_val_if_fail (filename != NULL && ETFileInfo != NULL, FALSE);
 
     filename_utf8 = filename_to_display(filename);
 
@@ -161,8 +160,7 @@ gboolean Speex_Header_Read_File_Info (gchar *filename, ET_File_Info *ETFileInfo)
     gulong filesize;
     gchar *filename_utf8;
 
-    if (!filename || !ETFileInfo)
-        return FALSE;
+    g_return_val_if_fail (filename != NULL && ETFileInfo != NULL, FALSE);
 
     filename_utf8 = filename_to_display(filename);
 
diff --git a/src/ogg_tag.c b/src/ogg_tag.c
index cfbfdcd..d06cc1e 100644
--- a/src/ogg_tag.c
+++ b/src/ogg_tag.c
@@ -132,9 +132,7 @@ gboolean Ogg_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
     guint           field_num, i;
     Picture        *prev_pic = NULL;
 
-
-    if (!filename || !FileTag)
-        return FALSE;
+    g_return_val_if_fail (filename != NULL && FileTag != NULL, FALSE);
 
     ogg_error_msg = NULL;
 
@@ -634,8 +632,7 @@ gboolean Ogg_Tag_Write_File_Tag (ET_File *ETFile)
     GList          *list;
     Picture        *pic;
 
-    if (!ETFile || !ETFile->FileTag)
-        return FALSE;
+    g_return_val_if_fail (ETFile != NULL && ETFile->FileTag != NULL, FALSE);
 
     FileTag       = (File_Tag *)ETFile->FileTag->data;
     filename      = ((File_Name *)ETFile->FileNameCur->data)->value;
diff --git a/src/wavpack_tag.c b/src/wavpack_tag.c
index 5f9f2c5..230e6cd 100644
--- a/src/wavpack_tag.c
+++ b/src/wavpack_tag.c
@@ -88,8 +88,7 @@ gboolean Wavpack_Tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
 
     int open_flags = OPEN_TAGS;
 
-    if (!filename || !FileTag)
-        return FALSE;
+    g_return_val_if_fail (filename != NULL && FileTag != NULL, FALSE);
 
     wpc = WavpackOpenFileInput(filename, NULL, open_flags, 0);
 
@@ -279,8 +278,7 @@ gboolean Wavpack_Tag_Write_File_Tag (ET_File *ETFile)
 
     int open_flags = OPEN_EDIT_TAGS;
 
-    if (!ETFile || !ETFile->FileTag)
-        return FALSE;
+    g_return_val_if_fail (ETFile != NULL && ETFile->FileTag != NULL, FALSE);
 
     wpc = WavpackOpenFileInput(filename, NULL, open_flags, 0);