GNOME.org
 

[gnome-keyring] Remove extraneous argument from gck_module_new and gck_module_initialize

commit de7b628ac6e501b200500e42a6d1f169915e2779
Author: Stef Walter <stefw collabora co uk>
Date:   Tue Apr 5 15:21:40 2011 +0200

    Remove extraneous argument from gck_module_new and gck_module_initialize
    
     * Since the signature of these functions changed anyway (API not yet
       stable, we are going to clean them up a bit more.
     * The xxx_full versions may be needed in the future if more options
       show up.

 daemon/dbus/gkd-dbus-secrets.c              |    2 +-
 daemon/gpg-agent/gkd-gpg-agent-standalone.c |    2 +-
 daemon/gpg-agent/gkd-gpg-agent.c            |    2 +-
 daemon/login/gkd-login.c                    |    2 +-
 daemon/ssh-agent/gkd-ssh-agent-standalone.c |    2 +-
 daemon/ssh-agent/gkd-ssh-agent.c            |    2 +-
 gck/gck-module.c                            |   10 ++++------
 gck/gck-modules.c                           |    5 ++---
 gck/gck-private.h                           |    3 +--
 gck/gck.h                                   |    6 ++----
 gck/tests/test-gck-crypto.c                 |    2 +-
 gck/tests/test-gck-enumerator.c             |    2 +-
 gck/tests/test-gck-module.c                 |    8 ++++----
 gck/tests/test-gck-modules.c                |    2 +-
 gck/tests/test-gck-object.c                 |    2 +-
 gck/tests/test-gck-session.c                |    2 +-
 gck/tests/test-gck-slot.c                   |    4 ++--
 gcr/gcr-library.c                           |    4 ++--
 gcr/tests/test-certificate-chain.c          |    2 +-
 gcr/tests/test-pkcs11-certificate.c         |    2 +-
 gcr/tests/test-trust.c                      |    2 +-
 21 files changed, 31 insertions(+), 37 deletions(-)
---
diff --git a/daemon/dbus/gkd-dbus-secrets.c b/daemon/dbus/gkd-dbus-secrets.c
index 98cada7..3a1c727 100644
--- a/daemon/dbus/gkd-dbus-secrets.c
+++ b/daemon/dbus/gkd-dbus-secrets.c
@@ -46,7 +46,7 @@ calculate_secrets_slot (void)
 	GError *err = NULL;
 
 	/* TODO: Should we be handling just one module here? */
-	module = gck_module_new (gkd_pkcs11_get_functions (), 0);
+	module = gck_module_new (gkd_pkcs11_get_functions ());
 	g_return_val_if_fail (module, NULL);
 
 	modules = g_list_prepend (NULL, module);
diff --git a/daemon/gpg-agent/gkd-gpg-agent-standalone.c b/daemon/gpg-agent/gkd-gpg-agent-standalone.c
index 3616984..c0e7fe8 100644
--- a/daemon/gpg-agent/gkd-gpg-agent-standalone.c
+++ b/daemon/gpg-agent/gkd-gpg-agent-standalone.c
@@ -87,7 +87,7 @@ main(int argc, char *argv[])
 		return 1;
 	}
 
-	module = gck_module_initialize (argv[1], 0, &error);
+	module = gck_module_initialize (argv[1], &error);
 	if (!module) {
 		g_message ("couldn't load pkcs11 module: %s", egg_error_message (error));
 		g_clear_error (&error);
diff --git a/daemon/gpg-agent/gkd-gpg-agent.c b/daemon/gpg-agent/gkd-gpg-agent.c
index 0acff2f..7e4aaf8 100644
--- a/daemon/gpg-agent/gkd-gpg-agent.c
+++ b/daemon/gpg-agent/gkd-gpg-agent.c
@@ -405,7 +405,7 @@ gkd_gpg_agent_initialize (CK_FUNCTION_LIST_PTR funcs)
 
 	g_return_val_if_fail (funcs, -1);
 
-	module = gck_module_new (funcs, 0);
+	module = gck_module_new (funcs);
 	ret = gkd_gpg_agent_initialize_with_module (module);
 	g_object_unref (module);
 	return ret;
diff --git a/daemon/login/gkd-login.c b/daemon/login/gkd-login.c
index 2fbbde8..8da57d9 100644
--- a/daemon/login/gkd-login.c
+++ b/daemon/login/gkd-login.c
@@ -38,7 +38,7 @@
 static GList*
 module_instances (void)
 {
-	GckModule *module = gck_module_new (gkd_pkcs11_get_base_functions (), 0);
+	GckModule *module = gck_module_new (gkd_pkcs11_get_base_functions ());
 	g_return_val_if_fail (module, NULL);
 	return g_list_append (NULL, module);
 }
diff --git a/daemon/ssh-agent/gkd-ssh-agent-standalone.c b/daemon/ssh-agent/gkd-ssh-agent-standalone.c
index a5f827b..11e9472 100644
--- a/daemon/ssh-agent/gkd-ssh-agent-standalone.c
+++ b/daemon/ssh-agent/gkd-ssh-agent-standalone.c
@@ -88,7 +88,7 @@ main(int argc, char *argv[])
 		return 1;
 	}
 
-	module = gck_module_initialize (argv[1], 0, &error);
+	module = gck_module_initialize (argv[1], &error);
 	if (!module) {
 		g_message ("couldn't load pkcs11 module: %s", egg_error_message (error));
 		g_clear_error (&error);
diff --git a/daemon/ssh-agent/gkd-ssh-agent.c b/daemon/ssh-agent/gkd-ssh-agent.c
index a9b6114..649d681 100644
--- a/daemon/ssh-agent/gkd-ssh-agent.c
+++ b/daemon/ssh-agent/gkd-ssh-agent.c
@@ -353,7 +353,7 @@ gkd_ssh_agent_initialize (CK_FUNCTION_LIST_PTR funcs)
 
 	g_return_val_if_fail (funcs, -1);
 
-	module = gck_module_new (funcs, 0);
+	module = gck_module_new (funcs);
 	ret = gkd_ssh_agent_initialize_with_module (module);
 	g_object_unref (module);
 	return ret;
diff --git a/gck/gck-module.c b/gck/gck-module.c
index ccfc5fe..c7e7646 100644
--- a/gck/gck-module.c
+++ b/gck/gck-module.c
@@ -374,7 +374,6 @@ gck_module_info_free (GckModuleInfo *module_info)
 /**
  * gck_module_initialize:
  * @path: The file system path to the PKCS\#11 module to load.
- * @flags: No options are currently available.
  * @error: A location to store an error resulting from a failed load.
  *
  * Load and initialize a PKCS\#11 module represented by a GckModule object.
@@ -382,7 +381,7 @@ gck_module_info_free (GckModuleInfo *module_info)
  * Return value: The loaded PKCS\#11 module or NULL if failed.
  **/
 GckModule*
-gck_module_initialize (const gchar *path, guint flags, GError **error)
+gck_module_initialize (const gchar *path, GError **error)
 {
 	CK_C_GetFunctionList get_function_list;
 	CK_FUNCTION_LIST_PTR funcs;
@@ -437,7 +436,6 @@ gck_module_initialize (const gchar *path, guint flags, GError **error)
 /**
  * gck_module_new:
  * @funcs: Initialized PKCS\#11 function list pointer
- * @flags: Must be zero
  *
  * Create a GckModule representing a PKCS\#11 module. It is assumed that
  * this the module is already initialized. In addition it will not be
@@ -446,16 +444,16 @@ gck_module_initialize (const gchar *path, guint flags, GError **error)
  * Return value: The new PKCS\#11 module.
  **/
 GckModule*
-gck_module_new (CK_FUNCTION_LIST_PTR funcs, guint flags)
+gck_module_new (CK_FUNCTION_LIST_PTR funcs)
 {
 	g_return_val_if_fail (funcs, NULL);
 	return g_object_new (GCK_TYPE_MODULE, "functions", funcs, NULL);
 }
 
 GckModule*
-_gck_module_new_initialized (CK_FUNCTION_LIST_PTR funcs, guint reserved_options)
+_gck_module_new_initialized (CK_FUNCTION_LIST_PTR funcs)
 {
-	GckModule *module = gck_module_new (funcs, reserved_options);
+	GckModule *module = gck_module_new (funcs);
 	module->pv->initialized = TRUE; /* As if we initialized it */
 	return module;
 }
diff --git a/gck/gck-modules.c b/gck/gck-modules.c
index 9bd9e6e..cc342e5 100644
--- a/gck/gck-modules.c
+++ b/gck/gck-modules.c
@@ -43,7 +43,6 @@
 
 /**
  * gck_modules_initialize_registered:
- * @flags: reserved options set to zero.
  *
  * Load and initialize all the registered modules.
  *
@@ -51,7 +50,7 @@
  * be released with gck_list_unref_free().
  */
 GList*
-gck_modules_initialize_registered (guint flags)
+gck_modules_initialize_registered (void)
 {
 	GckModule *module;
 	GList *results = NULL;
@@ -68,7 +67,7 @@ gck_modules_initialize_registered (guint flags)
 	modules = p11_kit_registered_modules ();
 
 	for (funcs = modules; *funcs; ++funcs) {
-		module = _gck_module_new_initialized (*funcs, 0);
+		module = _gck_module_new_initialized (*funcs);
 		results = g_list_prepend (results, module);
 	}
 
diff --git a/gck/gck-private.h b/gck/gck-private.h
index 615a226..f822f3d 100644
--- a/gck/gck-private.h
+++ b/gck/gck-private.h
@@ -62,8 +62,7 @@ gboolean            _gck_ulong_equal                       (gconstpointer v1,
  * MODULE
  */
 
-GckModule*          _gck_module_new_initialized            (CK_FUNCTION_LIST_PTR funcs,
-                                                            guint reserved_options);
+GckModule*          _gck_module_new_initialized            (CK_FUNCTION_LIST_PTR funcs);
 
 gboolean            _gck_module_fire_authenticate_slot     (GckModule *module,
                                                              GckSlot *slot,
diff --git a/gck/gck.h b/gck/gck.h
index 4679526..1db67e1 100644
--- a/gck/gck.h
+++ b/gck/gck.h
@@ -296,11 +296,9 @@ struct _GckModuleClass {
 
 GType                 gck_module_get_type                     (void) G_GNUC_CONST;
 
-GckModule*            gck_module_new                          (CK_FUNCTION_LIST_PTR funcs,
-                                                               guint flags);
+GckModule*            gck_module_new                          (CK_FUNCTION_LIST_PTR funcs);
 
 GckModule*            gck_module_initialize                   (const gchar *path,
-                                                               guint flags,
                                                                GError **error);
 
 gboolean              gck_module_equal                        (gconstpointer module1,
@@ -317,7 +315,7 @@ GckModuleInfo*        gck_module_get_info                     (GckModule *self);
 GList*                gck_module_get_slots                    (GckModule *self,
                                                                gboolean token_present);
 
-GList*                gck_modules_initialize_registered       (guint flags);
+GList*                gck_modules_initialize_registered       (void);
 
 GList*                gck_modules_get_slots                   (GList *modules,
                                                                gboolean token_present);
diff --git a/gck/tests/test-gck-crypto.c b/gck/tests/test-gck-crypto.c
index 300b132..18e9de6 100644
--- a/gck/tests/test-gck-crypto.c
+++ b/gck/tests/test-gck-crypto.c
@@ -57,7 +57,7 @@ setup (Test *test, gconstpointer unused)
 	GckSlot *slot;
 
 	/* Successful load */
-	test->module = gck_module_initialize (BUILDDIR "/.libs/libmock-test-module.so", 0, &err);
+	test->module = gck_module_initialize (BUILDDIR "/.libs/libmock-test-module.so", &err);
 	g_assert_no_error (err);
 	g_assert (GCK_IS_MODULE (test->module));
 
diff --git a/gck/tests/test-gck-enumerator.c b/gck/tests/test-gck-enumerator.c
index e9fcaa6..8049ecd 100644
--- a/gck/tests/test-gck-enumerator.c
+++ b/gck/tests/test-gck-enumerator.c
@@ -48,7 +48,7 @@ setup (Test *test, gconstpointer unused)
 	GError *err = NULL;
 
 	/* Successful load */
-	test->module = gck_module_initialize (BUILDDIR "/.libs/libmock-test-module.so", 0, &err);
+	test->module = gck_module_initialize (BUILDDIR "/.libs/libmock-test-module.so", &err);
 	g_assert_no_error (err);
 	g_assert (GCK_IS_MODULE (test->module));
 
diff --git a/gck/tests/test-gck-module.c b/gck/tests/test-gck-module.c
index 5a6d524..7e1b92a 100644
--- a/gck/tests/test-gck-module.c
+++ b/gck/tests/test-gck-module.c
@@ -40,7 +40,7 @@ setup (Test *test, gconstpointer unused)
 	GError *err = NULL;
 
 	/* Successful load */
-	test->module = gck_module_initialize (BUILDDIR "/.libs/libmock-test-module.so", 0, &err);
+	test->module = gck_module_initialize (BUILDDIR "/.libs/libmock-test-module.so", &err);
 	g_assert_no_error (err);
 	g_assert (test->module);
 }
@@ -58,14 +58,14 @@ test_invalid_modules (Test *test, gconstpointer unused)
 	GError *err = NULL;
 
 	/* Shouldn't be able to load modules */
-	invalid = gck_module_initialize ("blah-blah-non-existant", 0, &err);
+	invalid = gck_module_initialize ("blah-blah-non-existant", &err);
 	g_assert (invalid == NULL);
 	g_assert_error (err, GCK_ERROR, CKR_GCK_MODULE_PROBLEM);
 
 	g_clear_error (&err);
 
 	/* Shouldn't be able to load any file successfully */
-	invalid = gck_module_initialize ("/usr/lib/libm.so", 0, &err);
+	invalid = gck_module_initialize ("/usr/lib/libm.so", &err);
 	g_assert (invalid == NULL);
 	g_assert_error (err, GCK_ERROR, CKR_GCK_MODULE_PROBLEM);
 }
@@ -82,7 +82,7 @@ test_module_equals_hash (Test *test, gconstpointer unused)
 
 	g_assert (gck_module_equal (test->module, test->module));
 
-	other = gck_module_new (gck_module_get_functions (test->module), 0);
+	other = gck_module_new (gck_module_get_functions (test->module));
 	obj = g_object_new (G_TYPE_OBJECT, NULL);
 
 	g_assert (gck_module_equal (test->module, other));
diff --git a/gck/tests/test-gck-modules.c b/gck/tests/test-gck-modules.c
index d3105fd..27927c0 100644
--- a/gck/tests/test-gck-modules.c
+++ b/gck/tests/test-gck-modules.c
@@ -48,7 +48,7 @@ setup (Test *test, gconstpointer unused)
 	GError *err = NULL;
 
 	/* Successful load */
-	module = gck_module_initialize (BUILDDIR "/.libs/libmock-test-module.so", 0, &err);
+	module = gck_module_initialize (BUILDDIR "/.libs/libmock-test-module.so", &err);
 	g_assert_no_error (err);
 	g_assert (GCK_IS_MODULE (module));
 
diff --git a/gck/tests/test-gck-object.c b/gck/tests/test-gck-object.c
index b2a19ff..76afa4c 100644
--- a/gck/tests/test-gck-object.c
+++ b/gck/tests/test-gck-object.c
@@ -50,7 +50,7 @@ setup (Test *test, gconstpointer unused)
 	GList *slots;
 
 	/* Successful load */
-	test->module = gck_module_initialize (BUILDDIR "/.libs/libmock-test-module.so", 0, &err);
+	test->module = gck_module_initialize (BUILDDIR "/.libs/libmock-test-module.so", &err);
 	g_assert_no_error (err);
 	g_assert (GCK_IS_MODULE (test->module));
 
diff --git a/gck/tests/test-gck-session.c b/gck/tests/test-gck-session.c
index c401645..abdd877 100644
--- a/gck/tests/test-gck-session.c
+++ b/gck/tests/test-gck-session.c
@@ -48,7 +48,7 @@ setup (Test *test, gconstpointer unused)
 	GList *slots;
 
 	/* Successful load */
-	test->module = gck_module_initialize (BUILDDIR "/.libs/libmock-test-module.so", 0, &err);
+	test->module = gck_module_initialize (BUILDDIR "/.libs/libmock-test-module.so", &err);
 	g_assert_no_error (err);
 	g_assert (GCK_IS_MODULE (test->module));
 
diff --git a/gck/tests/test-gck-slot.c b/gck/tests/test-gck-slot.c
index d03db98..8f76492 100644
--- a/gck/tests/test-gck-slot.c
+++ b/gck/tests/test-gck-slot.c
@@ -43,7 +43,7 @@ setup (Test *test, gconstpointer unused)
 	GList *slots;
 
 	/* Successful load */
-	test->module = gck_module_initialize (BUILDDIR "/.libs/libmock-test-module.so", 0, &err);
+	test->module = gck_module_initialize (BUILDDIR "/.libs/libmock-test-module.so", &err);
 	g_assert_no_error (err);
 	g_assert (GCK_IS_MODULE (test->module));
 
@@ -145,7 +145,7 @@ test_slot_equals_hash (Test *test, gconstpointer unused)
 
 	g_assert (gck_slot_equal (test->slot, test->slot));
 
-	other_mod = gck_module_new (gck_module_get_functions (test->module), 0);
+	other_mod = gck_module_new (gck_module_get_functions (test->module));
 	other_slot = g_object_new (GCK_TYPE_SLOT, "module", other_mod, "handle", gck_slot_get_handle (test->slot), NULL);
 	g_assert (gck_slot_equal (test->slot, other_slot));
 	g_object_unref (other_mod);
diff --git a/gcr/gcr-library.c b/gcr/gcr-library.c
index 40cf8f5..32db673 100644
--- a/gcr/gcr-library.c
+++ b/gcr/gcr-library.c
@@ -181,7 +181,7 @@ _gcr_initialize (void)
 	egg_libgcrypt_initialize ();
 
 	if (g_once_init_enter (&gcr_initialized)) {
-		all_modules = gck_modules_initialize_registered (0);
+		all_modules = gck_modules_initialize_registered ();
 
 		/*
 		 * Soon we're going to have support for using a configuration of
@@ -292,7 +292,7 @@ gcr_pkcs11_add_module_from_file (const gchar *module_path, gpointer unused,
 	g_return_val_if_fail (module_path, FALSE);
 	g_return_val_if_fail (!error || !*error, FALSE);
 
-	module = gck_module_initialize (module_path, 0, error);
+	module = gck_module_initialize (module_path, error);
 	if (module == NULL)
 		return FALSE;
 
diff --git a/gcr/tests/test-certificate-chain.c b/gcr/tests/test-certificate-chain.c
index 55df209..39d7400 100644
--- a/gcr/tests/test-certificate-chain.c
+++ b/gcr/tests/test-certificate-chain.c
@@ -148,7 +148,7 @@ setup (Test *test, gconstpointer unused)
 	gck_assert_cmprv (rv, ==, CKR_OK);
 
 	g_assert (!modules);
-	module = gck_module_new (&test->funcs, 0);
+	module = gck_module_new (&test->funcs);
 	modules = g_list_prepend (modules, module);
 	gcr_pkcs11_set_modules (modules);
 	uris[0] = GCK_MOCK_SLOT_ONE_URI;
diff --git a/gcr/tests/test-pkcs11-certificate.c b/gcr/tests/test-pkcs11-certificate.c
index feed864..8e5e1f6 100644
--- a/gcr/tests/test-pkcs11-certificate.c
+++ b/gcr/tests/test-pkcs11-certificate.c
@@ -78,7 +78,7 @@ setup (Test *test, gconstpointer unused)
 	gck_assert_cmprv (rv, ==, CKR_OK);
 
 	g_assert (!modules);
-	module = gck_module_new (&test->funcs, 0);
+	module = gck_module_new (&test->funcs);
 	modules = g_list_prepend (modules, module);
 	gcr_pkcs11_set_modules (modules);
 	gck_list_unref_free (modules);
diff --git a/gcr/tests/test-trust.c b/gcr/tests/test-trust.c
index 1ddf8a8..861651a 100644
--- a/gcr/tests/test-trust.c
+++ b/gcr/tests/test-trust.c
@@ -70,7 +70,7 @@ setup (Test *test, gconstpointer unused)
 	gck_assert_cmprv (rv, ==, CKR_OK);
 
 	g_assert (!modules);
-	module = gck_module_new (&test->funcs, 0);
+	module = gck_module_new (&test->funcs);
 	modules = g_list_prepend (modules, module);
 	gcr_pkcs11_set_modules (modules);
 	gck_list_unref_free (modules);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]