HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename static functions for filetype creation & addition.

Browse Source 
Make filetypes_add(), filetypes_remove() static.


git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/custom-filetypes@2558 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Nick Treleaven 2008-05-07 14:09:12 +00:00
parent f6f49dc117
commit eb8e2a1a65
3 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -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>

58
src/filetypes.c
View File

@ -415,7 +415,7 @@ static void init_builtin_filetypes(void)
/* 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 @@ static filetype *filetypes_new(void)
}
/* 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 @@ void filetypes_init_types()
/* 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,7 +752,21 @@ static void create_radio_menu_item(GtkWidget *menu, const gchar *label, filetype
}
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;
@ -771,7 +796,7 @@ void filetypes_free_types()
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 @@ gboolean filetype_has_tags(filetype *ft)
}
/* 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)
{

4
src/filetypes.h
View File

@ -126,10 +126,6 @@ extern GPtrArray *filetypes_array;
#define filetypes ((filetype **)filetypes_array->pdata)
void filetypes_add(filetype *ft);
void filetypes_remove(filetype *ft);
filetype *filetypes_lookup_by_name(const gchar *name);