SF.net SVN: geany: [2558] branches/custom-filetypes

[ntrel at users.sourceforge.net]

Revision: 2558
          http://geany.svn.sourceforge.net/geany/?rev=2558&view=rev
Author:   ntrel
Date:     2008-05-07 07:09:12 -0700 (Wed, 07 May 2008)

Log Message:
-----------
Rename static functions for filetype creation & addition.
Make filetypes_add(), filetypes_remove() static.

Modified Paths:
--------------
    branches/custom-filetypes/ChangeLog
    branches/custom-filetypes/src/filetypes.c
    branches/custom-filetypes/src/filetypes.h

Modified: branches/custom-filetypes/ChangeLog
===================================================================
--- branches/custom-filetypes/ChangeLog	2008-05-07 14:01:30 UTC (rev 2557)
+++ branches/custom-filetypes/ChangeLog	2008-05-07 14:09:12 UTC (rev 2558)
@@ -18,6 +18,9 @@
  * src/plugindata.h:
    Add deprecated aliases for GEANY_MAX_FILE_TYPES and
    GEANY_FILETYPES_ALL.
+ * src/filetypes.c, src/filetypes.h:
+   Rename static functions for filetype creation & addition.
+   Make filetypes_add(), filetypes_remove() static.
 
 
 2008-05-06  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: branches/custom-filetypes/src/filetypes.c
===================================================================
--- branches/custom-filetypes/src/filetypes.c	2008-05-07 14:01:30 UTC (rev 2557)
+++ branches/custom-filetypes/src/filetypes.c	2008-05-07 14:09:12 UTC (rev 2558)
@@ -415,7 +415,7 @@
 
 
 /* initialize fields. */
-static filetype *filetypes_new(void)
+static filetype *filetype_new(void)
 {
 	FullFileType *fft = g_new0(FullFileType, 1);
 	filetype *ft = (filetype*) fft;
@@ -430,6 +430,17 @@
 }
 
 
+/* Add a filetype pointer to the list of available filetypes. */
+static void filetype_add(filetype *ft)
+{
+	g_return_if_fail(ft);
+	g_return_if_fail(ft->name);
+
+	g_ptr_array_add(filetypes_array, ft);
+	g_hash_table_insert(filetypes_hash, ft->name, ft);
+}
+
+
 /* Create the filetypes array and fill it with the known filetypes. */
 void filetypes_init_types()
 {
@@ -444,14 +455,14 @@
 	/* Create built-in filetypes */
 	for (ft_id = 0; ft_id < GEANY_MAX_BUILT_IN_FILETYPES; ft_id++)
 	{
-		filetypes[ft_id] = filetypes_new();
+		filetypes[ft_id] = filetype_new();
 	}
 	init_builtin_filetypes();
 
 	/* Add built-in filetypes to the hash now the name fields are set */
 	for (ft_id = 0; ft_id < GEANY_MAX_BUILT_IN_FILETYPES; ft_id++)
 	{
-		filetypes_add(filetypes[ft_id]);
+		filetype_add(filetypes[ft_id]);
 	}
 }
 
@@ -741,8 +752,22 @@
 }
 
 
-static void free_filetype(gpointer data, G_GNUC_UNUSED gpointer user_data)
+#if 0
+/* Remove a filetype pointer from the list of available filetypes. */
+static void filetype_remove(filetype *ft)
 {
+	g_return_if_fail(ft);
+
+	g_ptr_array_remove(filetypes_array, ft);
+
+	if (!g_hash_table_remove(filetypes_hash, ft))
+		g_warning("Could not remove filetype %p!", ft);
+}
+#endif
+
+
+static void filetype_free(gpointer data, G_GNUC_UNUSED gpointer user_data)
+{
 	filetype *ft = data;
 
 	g_return_if_fail(ft != NULL);
@@ -771,7 +796,7 @@
 	g_return_if_fail(filetypes_array != NULL);
 	g_return_if_fail(filetypes_hash != NULL);
 
-	g_ptr_array_foreach(filetypes_array, free_filetype, NULL);
+	g_ptr_array_foreach(filetypes_array, filetype_free, NULL);
 	g_ptr_array_free(filetypes_array, TRUE);
 	g_hash_table_destroy(filetypes_hash);
 }
@@ -1025,29 +1050,6 @@
 }
 
 
-/* Add a filetype pointer to the list of available filetypes. */
-void filetypes_add(filetype *ft)
-{
-	g_return_if_fail(ft);
-	g_return_if_fail(ft->name);
-
-	g_ptr_array_add(filetypes_array, ft);
-	g_hash_table_insert(filetypes_hash, ft->name, ft);
-}
-
-
-/* Remove a filetype pointer from the list of available filetypes. */
-void filetypes_remove(filetype *ft)
-{
-	g_return_if_fail(ft);
-
-	g_ptr_array_remove(filetypes_array, ft);
-
-	if (!g_hash_table_remove(filetypes_hash, ft))
-		g_warning("Could not remove filetype %p!", ft);
-}
-
-
 /** Find a filetype pointer from its @c name field. */
 filetype *filetypes_lookup_by_name(const gchar *name)
 {

Modified: branches/custom-filetypes/src/filetypes.h
===================================================================
--- branches/custom-filetypes/src/filetypes.h	2008-05-07 14:01:30 UTC (rev 2557)
+++ branches/custom-filetypes/src/filetypes.h	2008-05-07 14:09:12 UTC (rev 2558)
@@ -126,10 +126,6 @@
 #define filetypes	((filetype **)filetypes_array->pdata)
 
 
-void filetypes_add(filetype *ft);
-
-void filetypes_remove(filetype *ft);
-
 filetype *filetypes_lookup_by_name(const gchar *name);
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.