workbench fix warnings #1588

Author: WrapEarnPass

workbench/src/search_projects.c

@@ -28,6 +28,7 @@
 #include "dialogs.h"
 #include "sidebar.h"
 #include "menu.h"
+#include "search_projects.h"
 
 
 typedef enum

workbench/src/sidebar.c

@@ -1647,7 +1647,7 @@ static void sidebar_set_context (SIDEBAR_CONTEXT *context, guint dataid, gpointe
 
 
 /* Internal call foreach function. Traverses the whole sidebar. */
-void sidebar_call_foreach_int(SB_CALLFOREACH_CONTEXT *foreach_cntxt,
+static void sidebar_call_foreach_int(SB_CALLFOREACH_CONTEXT *foreach_cntxt,
 							  GtkTreeIter *iter)
 {
 	guint currentid;

workbench/src/tm_control.c

@@ -27,6 +27,7 @@
 
 #include <geanyplugin.h>
 #include "idle_queue.h"
+#include "tm_control.h"
 
 extern GeanyData *geany_data;
 static GHashTable *wb_tm_file_table = NULL;

workbench/src/tm_control.h

@@ -21,8 +21,8 @@
 
 void wb_tm_control_init (void);
 void wb_tm_control_cleanup (void);
-void wb_tm_control_source_file_add(const gchar *filename);
-void wb_tm_control_source_file_remove(const gchar *filename);
+void wb_tm_control_source_file_add(gchar *filename);
+void wb_tm_control_source_file_remove(gchar *filename);
 void wb_tm_control_source_files_remove(GPtrArray *files);
 void wb_tm_control_source_files_new(GPtrArray *files);
 

workbench/src/wb_project.c

@@ -638,14 +638,11 @@ static GSList *wb_project_dir_scan_directory(WB_PROJECT_DIR *root, const gchar *
 		filelist = gp_filelist_scan_directory_callback
 						(searchdir, scan_mode_workbench_cb, &params);
 
-		g_slist_foreach(params.file_patterns_list, (GFunc) g_pattern_spec_free, NULL);
-		g_slist_free(params.file_patterns_list);
+		g_slist_free_full(params.file_patterns_list, (GDestroyNotify)g_pattern_spec_free);
 
-		g_slist_foreach(params.ignored_dirs_list, (GFunc) g_pattern_spec_free, NULL);
-		g_slist_free(params.ignored_dirs_list);
+		g_slist_free_full(params.ignored_dirs_list, (GDestroyNotify)g_pattern_spec_free);
 
-		g_slist_foreach(params.ignored_file_list, (GFunc) g_pattern_spec_free, NULL);
-		g_slist_free(params.ignored_file_list);
+		g_slist_free_full(params.ignored_file_list, (GDestroyNotify)g_pattern_spec_free);
 	}
 	else
 	{
@@ -697,8 +694,7 @@ static guint wb_project_dir_rescan_int(WB_PROJECT *prj, WB_PROJECT_DIR *root)
 		}
 	}
 
-	g_slist_foreach(lst, (GFunc) g_free, NULL);
-	g_slist_free(lst);
+	g_slist_free_full(lst, g_free);
 
 	return filenum;
 }
@@ -797,8 +793,7 @@ static void wb_project_dir_add_file_int(WB_PROJECT *prj, WB_PROJECT_DIR *root, c
 			}
 		}
 
-		g_slist_foreach(scanned, (GFunc) g_free, NULL);
-		g_slist_free(scanned);
+		g_slist_free_full(scanned, g_free);
 	}
 }