Fix coding errors detected by clang

diff --git a/src/dupe.c b/src/dupe.c
index 359bb24..94d3263 100644 (file)
--- 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 9b5ee7c..c905f4b 100644 (file)
--- 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"))
                        {