diff options
author | Stef Walter <stefw@collabora.co.uk> | 2011-08-25 12:33:48 +0200 |
---|---|---|
committer | Stef Walter <stefw@collabora.co.uk> | 2011-08-25 12:41:09 +0200 |
commit | 9bda5ed162eadecc6122e6a542ea2808e839ac78 (patch) | |
tree | 40d1217f0d76b430850071bb2dc17802d6d2ba14 /gck | |
parent | 273ddd8bc0df79ce8197cb91e4aac5337b351181 (diff) | |
download | gnome-keyring-9bda5ed162eadecc6122e6a542ea2808e839ac78.tar.gz |
gck: Cleanup gck API for consistency
* The GCK library is incrementing its major library version number
this release cycle. So take that advantage to cleanup the API
a little bit before stable releases.
Diffstat (limited to 'gck')
-rw-r--r-- | gck/gck-module.c | 4 | ||||
-rw-r--r-- | gck/gck-modules.c | 21 | ||||
-rw-r--r-- | gck/gck.h | 4 | ||||
-rw-r--r-- | gck/gck.symbols | 9 | ||||
-rw-r--r-- | gck/tests/test-gck-crypto.c | 2 | ||||
-rw-r--r-- | gck/tests/test-gck-enumerator.c | 2 | ||||
-rw-r--r-- | gck/tests/test-gck-module.c | 6 | ||||
-rw-r--r-- | gck/tests/test-gck-modules.c | 2 | ||||
-rw-r--r-- | gck/tests/test-gck-object.c | 2 | ||||
-rw-r--r-- | gck/tests/test-gck-session.c | 2 | ||||
-rw-r--r-- | gck/tests/test-gck-slot.c | 2 |
11 files changed, 33 insertions, 23 deletions
diff --git a/gck/gck-module.c b/gck/gck-module.c index fa2fd842..1b018ed9 100644 --- a/gck/gck-module.c +++ b/gck/gck-module.c @@ -448,6 +448,7 @@ free_initialize (Initialize *args) /** * gck_module_initialize: * @path: The file system path to the PKCS\#11 module to load. + * @cancellable: (allow-none): optional cancellation object * @error: A location to store an error resulting from a failed load. * * Load and initialize a PKCS\#11 module represented by a GckModule object. @@ -456,6 +457,7 @@ free_initialize (Initialize *args) **/ GckModule* gck_module_initialize (const gchar *path, + GCancellable *cancellable, GError **error) { Initialize args = { GCK_ARGUMENTS_INIT, 0, }; @@ -465,7 +467,7 @@ gck_module_initialize (const gchar *path, args.path = g_strdup (path); - if (!_gck_call_sync (NULL, perform_initialize, NULL, &args, NULL, error)) { + if (!_gck_call_sync (NULL, perform_initialize, NULL, &args, cancellable, error)) { /* A custom error from perform_initialize */ if (args.error) { diff --git a/gck/gck-modules.c b/gck/gck-modules.c index fd0d4564..8d47ba71 100644 --- a/gck/gck-modules.c +++ b/gck/gck-modules.c @@ -88,6 +88,8 @@ free_initialize_registered (InitializeRegistered *args) /** * gck_modules_initialize_registered: + * @cancellable: (allow-none): optional cancellation object + * @error: (allow-none): location to place an error on failure * * Load and initialize all the registered modules. * @@ -95,21 +97,20 @@ free_initialize_registered (InitializeRegistered *args) * be released with gck_list_unref_free(). */ GList* -gck_modules_initialize_registered (void) +gck_modules_initialize_registered (GCancellable *cancellable, + GError **error) { InitializeRegistered args = { GCK_ARGUMENTS_INIT, 0, }; - GError *error = NULL; - - if (!_gck_call_sync (NULL, perform_initialize_registered, NULL, &args, NULL, &error)) { - if (args.error) - g_warning ("%s", args.error->message); - else - g_warning ("couldn't initialize registered PKCS#11 modules: %s", - error->message); + + if (!_gck_call_sync (NULL, perform_initialize_registered, NULL, &args, cancellable, error)) { + if (args.error) { + g_clear_error (error); + g_propagate_error (error, args.error); + args.error = NULL; + } } g_clear_error (&args.error); - g_clear_error (&error); return args.results; } @@ -299,6 +299,7 @@ GType gck_module_get_type (void) G_GNUC_CONS GckModule* gck_module_new (CK_FUNCTION_LIST_PTR funcs); GckModule* gck_module_initialize (const gchar *path, + GCancellable *cancellable, GError **error); void gck_module_initialize_async (const gchar *path, @@ -323,7 +324,8 @@ GckModuleInfo* gck_module_get_info (GckModule *self); GList* gck_module_get_slots (GckModule *self, gboolean token_present); -GList* gck_modules_initialize_registered (void); +GList* gck_modules_initialize_registered (GCancellable *cancellable, + GError **error); void gck_modules_initialize_registered_async (GCancellable *cancellable, GAsyncReadyCallback callback, diff --git a/gck/gck.symbols b/gck/gck.symbols index 2ab48d98..4b708a3b 100644 --- a/gck/gck.symbols +++ b/gck/gck.symbols @@ -71,12 +71,15 @@ gck_module_get_type gck_module_hash gck_module_info_free gck_module_initialize +gck_module_initialize_async +gck_module_initialize_finish gck_module_new gck_modules_enumerate_objects gck_modules_enumerate_uri gck_modules_get_slots gck_modules_initialize_registered -gck_modules_list_registered_paths +gck_modules_initialize_registered_async +gck_modules_initialize_registered_finish gck_modules_object_for_uri gck_modules_objects_for_uri gck_modules_token_for_uri @@ -186,10 +189,12 @@ gck_slot_open_session_full gck_slot_open_session_full_async gck_slots_enumerate_objects gck_string_from_chars +gck_string_to_chars gck_token_info_free gck_uri_build +gck_uri_data_free +gck_uri_data_new gck_uri_get_error_quark -gck_uri_info_free gck_uri_parse gck_value_to_boolean gck_value_to_ulong diff --git a/gck/tests/test-gck-crypto.c b/gck/tests/test-gck-crypto.c index 18e9de63..7959a9d9 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", &err); + test->module = gck_module_initialize (BUILDDIR "/.libs/libmock-test-module.so", NULL, &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 8049ecda..9287b1b4 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", &err); + test->module = gck_module_initialize (BUILDDIR "/.libs/libmock-test-module.so", NULL, &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 72df3603..b5db530a 100644 --- a/gck/tests/test-gck-module.c +++ b/gck/tests/test-gck-module.c @@ -42,7 +42,7 @@ setup (Test *test, gconstpointer unused) GError *err = NULL; /* Successful load */ - test->module = gck_module_initialize (BUILDDIR "/.libs/libmock-test-module.so", &err); + test->module = gck_module_initialize (BUILDDIR "/.libs/libmock-test-module.so", NULL, &err); g_assert_no_error (err); g_assert (test->module); } @@ -92,14 +92,14 @@ test_invalid_modules (Test *test, gconstpointer unused) GError *error = NULL; /* Shouldn't be able to load modules */ - invalid = gck_module_initialize ("blah-blah-non-existant", &error); + invalid = gck_module_initialize ("blah-blah-non-existant", NULL, &error); g_assert_error (error, GCK_ERROR, (int)CKR_GCK_MODULE_PROBLEM); g_assert (invalid == NULL); g_clear_error (&error); /* Shouldn't be able to load any file successfully */ - invalid = gck_module_initialize ("/usr/lib/libm.so", &error); + invalid = gck_module_initialize ("/usr/lib/libm.so", NULL, &error); g_assert_error (error, GCK_ERROR, (int)CKR_GCK_MODULE_PROBLEM); g_assert (invalid == NULL); diff --git a/gck/tests/test-gck-modules.c b/gck/tests/test-gck-modules.c index 27927c05..246c771f 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", &err); + module = gck_module_initialize (BUILDDIR "/.libs/libmock-test-module.so", NULL, &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 76afa4cd..21d2ea03 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", &err); + test->module = gck_module_initialize (BUILDDIR "/.libs/libmock-test-module.so", NULL, &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 abdd8772..e89ce54a 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", &err); + test->module = gck_module_initialize (BUILDDIR "/.libs/libmock-test-module.so", NULL, &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 8f76492c..175c140f 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", &err); + test->module = gck_module_initialize (BUILDDIR "/.libs/libmock-test-module.so", NULL, &err); g_assert_no_error (err); g_assert (GCK_IS_MODULE (test->module)); |