[easytag/wip/clang-analyzer: 3/14] Fix several instances of g_return_if_fail()

[David King <davidk src gnome org>]

commit 2af5eced21fd5a74d46e34a4db2a34e7b30f5655
Author: David King <amigadave amigadave com>
Date:   Sat Aug 10 22:55:48 2013 +0100

    Fix several instances of g_return_if_fail()
    
    When checking multiple conditions, ensure that all are checked. Found
    with the Clang static analyzer.

 src/easytag.c    |    6 +++---
 src/et_core.c    |    6 +++---
 src/id3v24_tag.c |    2 +-
 src/mp4_tag.c    |    2 +-
 src/picture.c    |    2 +-
 src/scan.c       |    8 ++++----
 6 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/src/easytag.c b/src/easytag.c
index ed0db3d..0b3bc54 100644
--- a/src/easytag.c
+++ b/src/easytag.c
@@ -2282,7 +2282,7 @@ gint Save_All_Files_With_Answer (gboolean force_saving_files)
 {
     GList *etfilelist;
 
-    g_return_val_if_fail (ETCore != NULL || ETCore->ETFileList != NULL, FALSE);
+    g_return_val_if_fail (ETCore != NULL && ETCore->ETFileList != NULL, FALSE);
 
     etfilelist = g_list_first (ETCore->ETFileList);
 
@@ -3939,8 +3939,8 @@ File_Area_Set_Sensitive (gboolean activate)
  */
 void Tag_Area_Display_Controls (ET_File *ETFile)
 {
-    g_return_if_fail (ETFile != NULL || ETFile->ETFileDescription != NULL ||
-                      TitleLabel != NULL);
+    g_return_if_fail (ETFile != NULL && ETFile->ETFileDescription != NULL);
+    g_return_if_fail (TitleLabel != NULL);
 
     /* Common controls for all tags. */
     gtk_widget_show(GTK_WIDGET(TitleLabel));
diff --git a/src/et_core.c b/src/et_core.c
index 89e5db3..6e7cbeb 100644
--- a/src/et_core.c
+++ b/src/et_core.c
@@ -2335,9 +2335,9 @@ gboolean ET_Copy_File_Tag_Item (ET_File *ETFile, File_Tag *FileTag)
 {
     File_Tag *FileTagCur;
 
-    g_return_val_if_fail (ETFile != NULL || ETFile->FileTag != NULL ||
-                          (File_Tag *)(ETFile->FileTag)->data != NULL ||
-                          FileTag != NULL, FALSE);
+    g_return_val_if_fail (ETFile != NULL && ETFile->FileTag != NULL &&
+                          (File_Tag *)(ETFile->FileTag)->data != NULL, FALSE);
+    g_return_val_if_fail (FileTag != NULL, FALSE);
 
     /* The data to duplicate to FileTag */
     FileTagCur = (File_Tag *)(ETFile->FileTag)->data;
diff --git a/src/id3v24_tag.c b/src/id3v24_tag.c
index 008cd4a..c2cf761 100644
--- a/src/id3v24_tag.c
+++ b/src/id3v24_tag.c
@@ -104,7 +104,7 @@ gboolean Id3tag_Read_File_Tag (gchar *filename, File_Tag *FileTag)
     long tagsize;
 
 
-    g_return_val_if_fail (filename != NULL || FileTag != NULL, FALSE);
+    g_return_val_if_fail (filename != NULL && FileTag != NULL, FALSE);
 
     if ( (tmpfile=open(filename,O_RDONLY)) < 0 )
     {
diff --git a/src/mp4_tag.c b/src/mp4_tag.c
index 843a6ea..c0e3590 100644
--- a/src/mp4_tag.c
+++ b/src/mp4_tag.c
@@ -173,7 +173,7 @@ gboolean Mp4tag_Write_File_Tag (ET_File *ETFile)
     TagLib_Tag *tag;
     gboolean success;
 
-    g_return_val_if_fail (ETFile != NULL || ETFile->FileTag != NULL, 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/picture.c b/src/picture.c
index 170aa25..0e37a9b 100644
--- a/src/picture.c
+++ b/src/picture.c
@@ -945,7 +945,7 @@ void PictureEntry_Update (Picture *pic, gboolean select_it)
     GdkPixbufLoader *loader = 0;
     GError *error = NULL;
     
-    g_return_if_fail (pic != NULL || PictureEntryView != NULL);
+    g_return_if_fail (pic != NULL && PictureEntryView != NULL);
 
     if (!pic->data)
     {
diff --git a/src/scan.c b/src/scan.c
index 039101d..24982a9 100644
--- a/src/scan.c
+++ b/src/scan.c
@@ -301,8 +301,8 @@ Scan_Tag_With_Mask (ET_File *ETFile)
     gchar *filename_utf8;
     File_Tag *FileTag;
 
-    g_return_if_fail (ScannerWindow != NULL || ScanTagMaskCombo != NULL ||
-                      ETFile != NULL);
+    g_return_if_fail (ScannerWindow != NULL && ScanTagMaskCombo != NULL);
+    g_return_if_fail (ETFile != NULL);
 
     mask = g_strdup(gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(ScanTagMaskCombo)))));
     if (!mask) return;
@@ -395,7 +395,7 @@ Scan_Generate_New_Tag_From_Mask (ET_File *ETFile, gchar *mask)
     guint file_splitted_index;
     Scan_Mask_Item *mask_item;
 
-    g_return_val_if_fail (ETFile != NULL || mask != NULL, NULL);
+    g_return_val_if_fail (ETFile != NULL && mask != NULL, NULL);
 
     filename_utf8 = g_strdup(((File_Name *)((GList *)ETFile->FileNameNew)->data)->value_utf8);
     if (!filename_utf8) return NULL;
@@ -746,7 +746,7 @@ gchar *Scan_Generate_New_Filename_From_Mask (ET_File *ETFile, gchar *mask, gbool
     File_Mask_Item *mask_item_next;
     gint counter = 0;
 
-    g_return_val_if_fail (ETFile != NULL || mask != NULL, NULL);
+    g_return_val_if_fail (ETFile != NULL && mask != NULL, NULL);
 
     /*
      * Check for a directory in the mask