From 251fbfd8b01fffbba4389f60229018fd198cb0c6 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Thu, 18 Oct 2007 15:57:44 +0000 Subject: [PATCH] simply check for G_MODULE_SUFFIX and remove utility function 2007-10-18 Michael Natterer * libgimpmodule/gimpmoduledb.c (gimp_module_db_module_initialize): simply check for G_MODULE_SUFFIX and remove utility function is_valid_module_name(). svn path=/trunk/; revision=23876 --- ChangeLog | 6 ++++++ libgimpmodule/gimpmoduledb.c | 30 ++---------------------------- 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index 64bbf03d0a..4a0b3e4169 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-10-18 Michael Natterer + + * libgimpmodule/gimpmoduledb.c (gimp_module_db_module_initialize): + simply check for G_MODULE_SUFFIX and remove utility function + is_valid_module_name(). + 2007-10-18 Sven Neumann * app/config/gimpcoreconfig.c: lower the upper limit for diff --git a/libgimpmodule/gimpmoduledb.c b/libgimpmodule/gimpmoduledb.c index 1290f68768..09ce1a5880 100644 --- a/libgimpmodule/gimpmoduledb.c +++ b/libgimpmodule/gimpmoduledb.c @@ -312,33 +312,6 @@ gimp_module_db_refresh (GimpModuleDB *db, db); } -/* name must be of the form lib*.so (Unix) or *.dll (Win32) */ -static gboolean -valid_module_name (const gchar *filename) -{ - gchar *basename = g_path_get_basename (filename); - -#if !defined(G_OS_WIN32) && !defined(G_WITH_CYGWIN) - if (strncmp (basename, "lib", 3)) - goto no_module; - - if (! gimp_datafiles_check_extension (basename, ".so")) - goto no_module; -#else - if (! gimp_datafiles_check_extension (basename, ".dll")) - goto no_module; -#endif - - g_free (basename); - - return TRUE; - - no_module: - g_free (basename); - - return FALSE; -} - static void gimp_module_db_module_initialize (const GimpDatafileData *file_data, gpointer user_data) @@ -347,7 +320,8 @@ gimp_module_db_module_initialize (const GimpDatafileData *file_data, GimpModule *module; gboolean load_inhibit; - if (! valid_module_name (file_data->filename)) + if (! gimp_datafiles_check_extension (file_data->filename, + "." G_MODULE_SUFFIX)) return; /* don't load if we already know about it */