From fb039d0c292c3cd339179bdc98a09d4103fb9c5f Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Wed, 10 Jul 2013 15:14:06 +0200 Subject: Various documentation tweaks and fixes for warnings --- doc/manual/p11-kit-devel.xml | 2 +- doc/manual/p11-kit-sections.txt | 4 ++++ p11-kit/iter.c | 8 ++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/doc/manual/p11-kit-devel.xml b/doc/manual/p11-kit-devel.xml index 007118a..5ffc32b 100644 --- a/doc/manual/p11-kit-devel.xml +++ b/doc/manual/p11-kit-devel.xml @@ -149,7 +149,7 @@ $ make install during the build, then certain features will be disabled. - libffi1 for shoring of PKCS#11 modules + libffi for sharing of PKCS#11 modules between multiple callers in the same process. It is highly recommended that this dependency be treated as a required dependency. gtk-doc is required to build the reference diff --git a/doc/manual/p11-kit-sections.txt b/doc/manual/p11-kit-sections.txt index 5ccba7c..7ee3019 100644 --- a/doc/manual/p11-kit-sections.txt +++ b/doc/manual/p11-kit-sections.txt @@ -79,8 +79,11 @@ p11_kit_space_strlen CK_FUNCTION_LIST_PTR CK_RV +CK_ATTRIBUTE CK_ATTRIBUTE_PTR CK_ATTRIBUTE_TYPE +CK_FLAGS +CK_FUNCTION_LIST CK_INFO_PTR CK_TOKEN_INFO_PTR CK_ULONG @@ -110,6 +113,7 @@ p11_kit_iter_keep_session p11_kit_iter_get_object p11_kit_iter_load_attributes p11_kit_iter_free +P11KitIterBehavior
diff --git a/p11-kit/iter.c b/p11-kit/iter.c index 1c2994d..9c22ee0 100644 --- a/p11-kit/iter.c +++ b/p11-kit/iter.c @@ -96,6 +96,14 @@ struct p11_kit_iter { }; /** + * P11KitIterBehavior: + * @P11_KIT_ITER_BUSY_SESSIONS: Allow the iterator's sessions to be + * in a busy state when the iterator returns an object. + * + * Various flags controling the behavior of the iterator. + */ + +/** * p11_kit_iter_new: * @uri: (allow-none): a PKCS\#11 URI to filter on, or %NULL * @behavior: various behavior flags for iterator -- cgit v1.1