From: Colin Clark <colin.clark@cclark.uk>
Date: Sat, 20 Jun 2020 09:53:15 +0000 (+0100)
Subject: Fix coding errors detected by clang
X-Git-Tag: v1.6~39
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=f344d59a1e252de22a52c6395fe440ad3ba1adb6

Fix coding errors detected by clang
---

diff --git a/src/dupe.c b/src/dupe.c
index 359bb246..94d3263f 100644
--- a/src/dupe.c
+++ b/src/dupe.c
@@ -3484,20 +3484,12 @@ static gint column_sort_cb(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b,
 	return ret;
 }
 
-static gboolean dupe_window_recompare_cb(gpointer data)
-{
-	DupeWindow *dw = data;
-
-	dupe_window_recompare_cb(dw);
-}
-
 static void column_clicked_cb(GtkWidget *widget,  gpointer data)
 {
 	DupeWindow *dw = data;
 
 	options->duplicates_match = DUPE_SELECT_NONE;
 	dupe_listview_select_dupes(dw, DUPE_SELECT_NONE);
-	dupe_window_recompare_cb, dw;
 }
 
 /* collection and files can be NULL */
diff --git a/src/layout_util.c b/src/layout_util.c
index 9b5ee7cf..c905f4bf 100644
--- a/src/layout_util.c
+++ b/src/layout_util.c
@@ -2198,7 +2198,7 @@ static void window_rename_ok_cb(GenericDialog *gd, gpointer data)
 	window_rename_ok(gd, rw);
 }
 
-static gboolean window_rename_entry_activate_cb(GenericDialog *gd, gpointer data)
+static void window_rename_entry_activate_cb(GenericDialog *gd, gpointer data)
 {
 	RenameWindow *rw = data;
 
@@ -2288,7 +2288,7 @@ static void change_window_id(const gchar *infile, const gchar *outfile)
 	out_file_stream = g_file_append_to(out_file, G_FILE_CREATE_PRIVATE, NULL, NULL);
 	out_data_stream = g_data_output_stream_new(G_OUTPUT_STREAM(out_file_stream));
 
-	while (line = g_data_input_stream_read_line(in_data_stream, NULL, NULL, NULL))
+	while ((line = g_data_input_stream_read_line(in_data_stream, NULL, NULL, NULL)))
 		{
 		if (g_str_has_suffix(line, "<layout"))
 			{