From 95877d468a2b9a52d8104ec2698418d7e5e1309e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek=C2=A0?= <>
Date: Mon, 6 Apr 2020 15:08:27 +0100
Subject: [PATCH] Fix #753: Various cleanups based on gcc warnings

https://github.com/BestImageViewer/geeqie/pull/753
---
 src/bar_keywords.c        |  1 -
 src/color-man.c           |  1 -
 src/dupe.c                |  5 +++--
 src/exif-common.c         |  4 +---
 src/history_list.c        |  2 --
 src/image_load_tiff.c     |  1 -
 src/img-view.c            |  1 -
 src/layout.c              |  4 ----
 src/layout_image.c        |  1 -
 src/layout_util.c         | 16 ----------------
 src/main.c                |  1 -
 src/menu.c                |  1 -
 src/misc.c                |  6 +++---
 src/osd.c                 |  9 ---------
 src/preferences.c         |  9 +--------
 src/remote.c              |  6 ------
 src/search.c              | 15 ---------------
 src/trash.c               |  8 --------
 src/ui_bookmark.c         |  1 -
 src/ui_misc.c             |  1 -
 src/view_file/view_file.c | 21 ---------------------
 21 files changed, 8 insertions(+), 106 deletions(-)

diff --git a/src/bar_keywords.c b/src/bar_keywords.c
index f2c36e13..3c11593d 100644
--- a/src/bar_keywords.c
+++ b/src/bar_keywords.c
@@ -1944,7 +1944,6 @@ GList *keyword_list_get()
 
 void keyword_list_set(GList *keyword_list)
 {
-	GList *ret = NULL;
 	GtkTreeIter  iter;
 
 	if (!keyword_list) return;
diff --git a/src/color-man.c b/src/color-man.c
index a111e671..1c8c47a3 100644
--- a/src/color-man.c
+++ b/src/color-man.c
@@ -440,7 +440,6 @@ static gchar *color_man_get_profile_name(ColorManProfileType type, cmsHPROFILE p
 			if (profile)
 				{
 #ifdef HAVE_LCMS2
-				cmsUInt32Number r;
 				char buffer[20];
 				buffer[0] = '\0';
 				cmsGetProfileInfoASCII(profile, cmsInfoDescription, "en", "US", buffer, 20);
diff --git a/src/dupe.c b/src/dupe.c
index 532aea24..edca01f7 100644
--- a/src/dupe.c
+++ b/src/dupe.c
@@ -19,6 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <inttypes.h>
+
 #include "main.h"
 #include "dupe.h"
 
@@ -2348,7 +2350,6 @@ static GtkWidget *dupe_menu_popup_main(DupeWindow *dw, DupeItem *di)
 	GtkWidget *item;
 	gint on_row;
 	GList *editmenu_fd_list;
-	GtkWidget *submenu;
 
 	on_row = (di != NULL);
 
@@ -3918,7 +3919,7 @@ static void export_duplicates_data_save_cb(FileDialog *fdlg, gpointer data)
 		output_string = g_string_append(output_string, sep);
 		g_free(name);
 
-		output_string = g_string_append(output_string, g_strdup_printf("%ld", di->fd->size));
+		output_string = g_string_append(output_string, g_strdup_printf("%"PRIu64, di->fd->size));
 		output_string = g_string_append(output_string, sep);
 		output_string = g_string_append(output_string, text_from_time(di->fd->date));
 		output_string = g_string_append(output_string, sep);
diff --git a/src/exif-common.c b/src/exif-common.c
index ea561f4e..833a86cf 100644
--- a/src/exif-common.c
+++ b/src/exif-common.c
@@ -815,10 +815,9 @@ static gchar *exif_build_formatted_localtime(ExifData *exif)
 				else
 					{
 					g_free(exif_date_time);
-					exif_date_time = g_strdup(tmp);
+					exif_date_time = tmp;
 					}
 				}
-				g_free(tmp);
 			}
 		putenv(time_zone_org);
 
@@ -842,7 +841,6 @@ static gchar *exif_build_formatted_localtime(ExifData *exif)
  */
 static gchar *exif_build_formatted_timezone(ExifData *exif)
 {
-	gchar *time_zone = NULL;
 	gchar *exif_date_time = NULL;
 	gchar *timezone = NULL;
 	gchar *countryname = NULL;
diff --git a/src/history_list.c b/src/history_list.c
index ecf73cfd..41316262 100644
--- a/src/history_list.c
+++ b/src/history_list.c
@@ -151,8 +151,6 @@ void image_chain_append_end(const gchar *path)
 		else
 			{
 			work = g_list_last(image_chain);
-			gchar *tmp;
-			tmp = work->data;
 			if (g_strcmp0(work->data , path) != 0)
 				{
 				image_chain = g_list_append(image_chain, g_strdup(path));
diff --git a/src/image_load_tiff.c b/src/image_load_tiff.c
index 03315c06..afc18220 100644
--- a/src/image_load_tiff.c
+++ b/src/image_load_tiff.c
@@ -383,7 +383,6 @@ static void image_loader_tiff_free(gpointer loader)
 
 static void image_loader_tiff_set_page_num(gpointer loader, gint page_num)
 {
-	ImageLoader *il = (ImageLoader *) loader;
 	ImageLoaderTiff *lt = (ImageLoaderTiff *) loader;
 
 	lt->page_num = page_num;
diff --git a/src/img-view.c b/src/img-view.c
index f57ef39c..fdd70179 100644
--- a/src/img-view.c
+++ b/src/img-view.c
@@ -1317,7 +1317,6 @@ static void image_pop_menu_collections_cb(GtkWidget *widget, gpointer data)
 static GtkWidget *view_popup_menu(ViewWindow *vw)
 {
 	GtkWidget *menu;
-	GtkWidget *submenu;
 	GtkWidget *item;
 	GList *editmenu_fd_list;
 
diff --git a/src/layout.c b/src/layout.c
index bc971597..87b82cce 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -310,7 +310,6 @@ static void layout_path_entry_tab_append_cb(const gchar *path, gpointer data, gi
 
 static gboolean path_entry_tooltip_cb(GtkWidget *widget, gpointer data)
 {
-	LayoutWindow *lw = data;
 	GList *box_child_list;
 	GtkComboBox *path_entry;
 	gchar *current_path;
@@ -596,7 +595,6 @@ static GtkWidget *layout_zoom_button(LayoutWindow *lw, GtkWidget *box, gint size
 
 void layout_status_update_progress(LayoutWindow *lw, gdouble val, const gchar *text)
 {
-	static gdouble thumb = 0;
 	static gdouble meta = 0;
 
 	if (!layout_valid(&lw)) return;
@@ -606,7 +604,6 @@ void layout_status_update_progress(LayoutWindow *lw, gdouble val, const gchar *t
 	 */
 	if(!g_strcmp0(text, "Loading thumbs..."))
 		{
-		thumb = val;
 		if (meta)
 			{
 			return;
@@ -1854,7 +1851,6 @@ static void layout_grid_setup(LayoutWindow *lw)
 void layout_style_set(LayoutWindow *lw, gint style, const gchar *order)
 {
 	FileData *dir_fd;
-	gint i;
 
 	if (!layout_valid(&lw)) return;
 
diff --git a/src/layout_image.c b/src/layout_image.c
index 7db18039..1afa9107 100644
--- a/src/layout_image.c
+++ b/src/layout_image.c
@@ -1804,7 +1804,6 @@ static void layout_image_button_cb(ImageWindow *imd, GdkEventButton *event, gpoi
 {
 	LayoutWindow *lw = data;
 	GtkWidget *menu;
-	FileData *dir_fd;
 
 	switch (event->button)
 		{
diff --git a/src/layout_util.c b/src/layout_util.c
index cf425de8..38b065e0 100644
--- a/src/layout_util.c
+++ b/src/layout_util.c
@@ -383,16 +383,6 @@ static void layout_menu_move_to_trash_cb(GtkAction *action, gpointer data)
 	file_util_delete(NULL, layout_selection_list(lw), layout_window(lw));
 }
 
-static void layout_menu_delete_key_cb(GtkAction *action, gpointer data)
-{
-	LayoutWindow *lw = data;
-
-	if (options->file_ops.enable_delete_key)
-		{
-		options->file_ops.safe_delete_enable = FALSE;
-		file_util_delete(NULL, layout_selection_list(lw), layout_window(lw));
-		}
-}
 static void layout_menu_move_to_trash_key_cb(GtkAction *action, gpointer data)
 {
 	LayoutWindow *lw = data;
@@ -539,8 +529,6 @@ static void layout_menu_exif_rotate_cb(GtkToggleAction *action, gpointer data)
 
 static void layout_menu_select_rectangle_cb(GtkToggleAction *action, gpointer data)
 {
-	LayoutWindow *lw = data;
-
 	options->draw_rectangle = gtk_toggle_action_get_active(action);
 }
 
@@ -977,7 +965,6 @@ static void layout_menu_guidelines_cb(GtkToggleAction *action, gpointer data)
 
 	if (gtk_toggle_action_get_active(action))
 		{
-		OsdShowFlags flags = image_osd_get(lw->image);
 		image_osd_set(lw->image, OSD_SHOW_INFO | OSD_SHOW_STATUS | OSD_SHOW_GUIDELINES);
 		layout_util_sync_views(lw);
 		}
@@ -1596,7 +1583,6 @@ static void layout_menu_page_previous_cb(GtkAction *action, gpointer data)
 static void layout_menu_image_forward_cb(GtkAction *action, gpointer data)
 {
 	LayoutWindow *lw = data;
-	FileData *dir_fd;
 
 	/* Obtain next image */
 	layout_set_path(lw, image_chain_forward());
@@ -1605,7 +1591,6 @@ static void layout_menu_image_forward_cb(GtkAction *action, gpointer data)
 static void layout_menu_image_back_cb(GtkAction *action, gpointer data)
 {
 	LayoutWindow *lw = data;
-	FileData *dir_fd;
 
 	/* Obtain previous image */
 	layout_set_path(lw, image_chain_back());
@@ -3151,7 +3136,6 @@ void layout_actions_setup(LayoutWindow *lw)
 {
 	GError *error;
 	gint i;
-	GtkAction *action;
 
 	DEBUG_1("%s layout_actions_setup: start", get_exec_time());
 	if (lw->ui_manager) return;
diff --git a/src/main.c b/src/main.c
index 404c04c2..776154e9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -841,7 +841,6 @@ gint main(gint argc, gchar *argv[])
 	CollectionData *first_collection = NULL;
 	gchar *buf;
 	CollectionData *cd = NULL;
-	gchar *app_lock;
 
 #ifdef HAVE_GTHREAD
 #if !GLIB_CHECK_VERSION(2,32,0)
diff --git a/src/menu.c b/src/menu.c
index a83f08c6..64f6fa20 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -436,7 +436,6 @@ static void add_collection_list(GtkWidget *menu, GCallback func,
 {
 	GList *work;
 	gint index = 0; /* index to existing collection list menu item selected */
-	GtkWidget *item;
 
 	work = collection_list;
 	while (work)
diff --git a/src/misc.c b/src/misc.c
index 104d5de4..82456978 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -253,12 +253,12 @@ int runcmd(gchar *cmd)
  */
 gint date_get_first_day_of_week()
 {
-	gchar *dot;
-	gchar *current_locale;
-
 #ifdef HAVE__NL_TIME_FIRST_WEEKDAY
 	return nl_langinfo(_NL_TIME_FIRST_WEEKDAY)[0];
 #else
+	gchar *dot;
+	gchar *current_locale;
+
 	current_locale = setlocale(LC_ALL, NULL);
 	dot = strstr(current_locale, ".");
 	if ((strncmp(dot - 2, "US", 2) == 0) || (strncmp(dot - 2, "MX", 2) == 0) || (strncmp(dot - 2, "CA", 2) == 0))
diff --git a/src/osd.c b/src/osd.c
index 7e1f6fda..bcc38d72 100644
--- a/src/osd.c
+++ b/src/osd.c
@@ -155,19 +155,11 @@ static void set_osd_button(GtkTable *table, const gint rows, const gint cols, co
 
 GtkWidget *osd_new(gint max_cols, GtkWidget *template_view)
 {
-	GtkWidget *hbox;
 	GtkWidget *vbox;
-	GtkWidget *vbox_buttons;
-	GtkWidget *group;
-	GtkWidget *button;
 	GtkWidget *scrolled;
-	GtkTextBuffer *buffer;
-	GtkWidget *label;
-	GtkWidget *	subgroup;
 	gint i = 0;
 	gint rows = 0;
 	gint max_rows = 0;
-	gint col = 0;
 	gint cols = 0;
 	gdouble entries;
 	GtkWidget *viewport;
@@ -181,7 +173,6 @@ GtkWidget *osd_new(gint max_cols, GtkWidget *template_view)
 	gtk_container_set_border_width(GTK_CONTAINER(scrolled), PREF_PAD_BORDER);
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
 				       GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-	label = gtk_label_new("title");
 	gtk_widget_show(scrolled);
 	gtk_widget_set_size_request(scrolled, -1, 140);
 
diff --git a/src/preferences.c b/src/preferences.c
index 2df5c2f1..e5847497 100644
--- a/src/preferences.c
+++ b/src/preferences.c
@@ -1226,8 +1226,6 @@ static gboolean filter_add_scroll(gpointer data)
 	GList *list_cells;
 	GtkCellRenderer *cell;
 	GtkTreeViewColumn *column;
-	const gchar *title;
-	guint i = 0;
 	gint rows;
 
 	rows = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(filter_store), NULL);
@@ -2308,7 +2306,6 @@ static void config_tab_osd(GtkWidget *notebook)
 {
 	GtkWidget *hbox;
 	GtkWidget *vbox;
-	GtkWidget *vbox_buttons;
 	GtkWidget *group;
 	GtkWidget *button;
 	GtkWidget *image_overlay_template_view;
@@ -2316,10 +2313,7 @@ static void config_tab_osd(GtkWidget *notebook)
 	GtkWidget *scrolled_pre_formatted;
 	GtkTextBuffer *buffer;
 	GtkWidget *label;
-	GtkWidget *	subgroup;
-	gint i = 0;
-	gint rows = 0;
-	gint cols = 0;
+	GtkWidget *subgroup;
 
 	vbox = scrolled_notebook_page(notebook, _("OSD"));
 
@@ -3828,7 +3822,6 @@ static void timezone_progress_cb(goffset current_num_bytes, goffset total_num_by
 static void timezone_cancel_button_cb(GenericDialog *gd, gpointer data)
 {
 	TZData *tz = data;
-	GError *error = NULL;
 
 	g_cancellable_cancel(tz->cancellable);
 }
diff --git a/src/remote.c b/src/remote.c
index 2389a17a..5dca7abe 100644
--- a/src/remote.c
+++ b/src/remote.c
@@ -720,7 +720,6 @@ static void gr_pixel_info(const gchar *text, GIOChannel *channel, gpointer data)
 	gint width, height;
 	gint r_mouse, g_mouse, b_mouse;
 	PixbufRenderer *pr;
-	LayoutWindow *lw = NULL;
 
 	if (!layout_valid(&lw_id)) return;
 
@@ -762,7 +761,6 @@ static void gr_rectangle(const gchar *text, GIOChannel *channel, gpointer data)
 {
 	gchar *rectangle_info;
 	PixbufRenderer *pr;
-	LayoutWindow *lw = NULL;
 	gint x1, y1, x2, y2;
 
 	if (!options->draw_rectangle) return;
@@ -1218,8 +1216,6 @@ static void gr_list_add(const gchar *text, GIOChannel *channel, gpointer data)
 
 static void gr_raise(const gchar *text, GIOChannel *channel, gpointer data)
 {
-	LayoutWindow *lw = NULL;
-
 	if (layout_valid(&lw_id))
 		{
 		gtk_window_present(GTK_WINDOW(lw_id->window));
@@ -1243,8 +1239,6 @@ static void gr_pwd(const gchar *text, GIOChannel *channel, gpointer data)
 
 static void gr_print0(const gchar *text, GIOChannel *channel, gpointer data)
 {
-	LayoutWindow *lw = NULL;
-
 	g_io_channel_write_chars(channel, "print0", -1, NULL, NULL);
 	g_io_channel_write_chars(channel, "<gq_end_of_command>", -1, NULL, NULL);
 }
diff --git a/src/search.c b/src/search.c
index aa904db9..c929440e 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1044,20 +1044,6 @@ static void sr_menu_copy_path_unquoted_cb(GtkWidget *widget, gpointer data)
 	file_util_copy_path_list_to_clipboard(search_result_selection_list(sd), FALSE);
 }
 
-static void sr_menu_remove_cb(GtkWidget *widget, gpointer data)
-{
-	SearchData *sd = data;
-
-	search_result_remove_selection(sd);
-}
-
-static void sr_menu_clear_cb(GtkWidget *widget, gpointer data)
-{
-	SearchData *sd = data;
-
-	search_result_clear(sd);
-}
-
 static void sr_menu_play_cb(GtkWidget *widget, gpointer data)
 {
 	SearchData *sd = data;
@@ -1096,7 +1082,6 @@ static GtkWidget *search_result_menu(SearchData *sd, gboolean on_row, gboolean e
 	GtkWidget *menu;
 	GtkWidget *item;
 	GList *editmenu_fd_list;
-	GtkWidget *submenu;
 	gboolean video;
 
 	menu = popup_menu_short_lived();
diff --git a/src/trash.c b/src/trash.c
index b53404e2..0bd3aea1 100644
--- a/src/trash.c
+++ b/src/trash.c
@@ -118,13 +118,6 @@ static gchar *file_util_safe_dest(const gchar *path)
 	return dest;
 }
 
-static void file_util_safe_del_close_cb(GtkWidget *dialog, gpointer data)
-{
-	GenericDialog **gd = data;
-
-	*gd = NULL;
-}
-
 gboolean file_util_safe_unlink(const gchar *path)
 {
 	static GenericDialog *gd = NULL;
@@ -179,7 +172,6 @@ gboolean file_util_safe_unlink(const gchar *path)
 
 		if (result && !gd)
 			{
-			GtkWidget *button;
 			gchar *buf;
 
 			buf = g_strdup_printf(_("Unable to access or create the trash folder.\n\"%s\""), options->file_ops.safe_delete_path);
diff --git a/src/ui_bookmark.c b/src/ui_bookmark.c
index 3cc7789e..725b2789 100644
--- a/src/ui_bookmark.c
+++ b/src/ui_bookmark.c
@@ -543,7 +543,6 @@ static void bookmark_drag_begin(GtkWidget *button, GdkDragContext *context, gpoi
 
 static gboolean bookmark_path_tooltip_cb(GtkWidget *button, gpointer data)
 {
-	BookMarkData *bm = data;
 	BookButtonData *b;
 
 	b = g_object_get_data(G_OBJECT(button), "bookbuttondata");
diff --git a/src/ui_misc.c b/src/ui_misc.c
index 1c20037d..ab02c4a7 100644
--- a/src/ui_misc.c
+++ b/src/ui_misc.c
@@ -1738,7 +1738,6 @@ gchar *text_widget_text_pull_selected(GtkWidget *text_widget)
 		{
 		GtkTextBuffer *buffer;
 		GtkTextIter start, end;
-		GtkTextIter selection_start, selection_end;
 
 		buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_widget));
 		gtk_text_buffer_get_bounds(buffer, &start, &end);
diff --git a/src/view_file/view_file.c b/src/view_file/view_file.c
index ed5c5f0e..f44087cf 100644
--- a/src/view_file/view_file.c
+++ b/src/view_file/view_file.c
@@ -485,23 +485,6 @@ static void vf_pop_menu_toggle_view_type_cb(GtkWidget *widget, gpointer data)
 	layout_views_set(vf->layout, vf->layout->options.dir_view_type, new_type);
 }
 
-static void vf_pop_menu_toggle_star_rating(ViewFile *vf)
-{
-	GtkAllocation allocation;
-
-	options->show_star_rating = !options->show_star_rating;
-
-	gtk_widget_get_allocation(vf->listview, &allocation);
-	vf_star_rating_set(vf, options->show_star_rating);
-}
-
-static void vf_pop_menu_show_star_rating_cb(GtkWidget *widget, gpointer data)
-{
-	ViewFile *vf = data;
-
-	vf_pop_menu_toggle_star_rating(vf);
-}
-
 static void vf_pop_menu_refresh_cb(GtkWidget *widget, gpointer data)
 {
 	ViewFile *vf = data;
@@ -1583,7 +1566,6 @@ static gboolean vf_read_metadata_in_idle_cb(gpointer data)
 {
 	FileData *fd;
 	ViewFile *vf = data;
-	GList *list_entry;
 	GList *work;
 
 	vf_thumb_status(vf, vf_read_metadata_in_idle_progress(vf), _("Loading meta..."));
@@ -1630,9 +1612,6 @@ static void vf_read_metadata_in_idle_finished_cb(gpointer data)
 
 void vf_read_metadata_in_idle(ViewFile *vf)
 {
-	GList *work;
-	FileData *fd;
-
 	if (!vf) return;
 
 	if (vf->read_metadata_in_idle_id)
-- 
2.20.1