Fix compiler warnings and add -Werror back in when --enable-tests is

	* configure.in:
	* gp11/gp11.h:
	* gp11/reference/Makefile.am:
	* gp11/tests/gp11-test-module.c:
	* gp11/tests/unit-test-gp11-attributes.c:
	* pam/tests/unit-test-pam-setup.c:
	* pkcs11/gck/gck-file-store.c:
	* pkcs11/gck/gck-file-tracker.c:
	* pkcs11/gck/gck-manager.c:
	* pkcs11/gck/gck-session.c:
	* pkcs11/roots/gck-roots-certificate.c:
	* pkcs11/rpc-layer/gck-rpc-module.c:
	* pkcs11/ssh-agent/gck-ssh-agent-ops.c:
	* pkcs11/ssh-store/gck-ssh-public-key.c: Fix compiler warnings
	and add -Werror back in when --enable-tests is configured.

svn path=/trunk/; revision=1442

diff --git a/gp11/gp11.h b/gp11/gp11.h
index d300d53..10ed991 100644 (file)
--- a/gp11/gp11.h
+++ b/gp11/gp11.h
@@ -72,7 +72,14 @@ enum {
        GP11_DATE = -4
 };
 
-#define GP11_INVALID (gulong)-1
+#define GP11_INVALID -1UL
+
+/* Used on varargs functions that should end with GP11_INVALID */
+#ifdef NOT_YET_SUPPORTED
+#define GP11_INVALID_TERMINATED __attribute__((__sentinel__(-1UL)))
+#else
+#define GP11_INVALID_TERMINATED
+#endif
 
 void                gp11_attribute_init                     (GP11Attribute *attr,
                                                              gulong attr_type,
@@ -150,13 +157,16 @@ GType               gp11_attributes_get_boxed_type          (void) G_GNUC_CONST;
 
 GP11Attributes*     gp11_attributes_new                     (void);
 
-GP11Attributes*     gp11_attributes_new_empty               (gulong attr_type, ...);
+GP11Attributes*     gp11_attributes_new_empty               (gulong attr_type,
+                                                             ...) GP11_INVALID_TERMINATED;
 
 GP11Attributes*     gp11_attributes_new_full                (GP11Allocator allocator);
 
-GP11Attributes*     gp11_attributes_newv                    (gulong attr_type, ...);
+GP11Attributes*     gp11_attributes_newv                    (gulong attr_type,
+                                                             ...) GP11_INVALID_TERMINATED;
 
-GP11Attributes*     gp11_attributes_new_valist              (GP11Allocator allocator, va_list va);
+GP11Attributes*     gp11_attributes_new_valist              (GP11Allocator allocator,
+                                                             va_list va);
 
 GP11Attribute*      gp11_attributes_at                      (GP11Attributes *attrs,
                                                              guint index);
@@ -298,7 +308,7 @@ void                  gp11_module_set_auto_authenticate       (GP11Module *self,
 gboolean              gp11_module_enumerate_objects           (GP11Module *self,
                                                                GP11ObjectForeachFunc func,
                                                                gpointer user_data,
-                                                               ...);
+                                                               ...) GP11_INVALID_TERMINATED;
 
 gboolean              gp11_module_enumerate_objects_full      (GP11Module *self,
                                                                GP11Attributes *attrs,
@@ -631,7 +641,7 @@ gboolean            gp11_session_logout_finish              (GP11Session *self,
 
 GP11Object*         gp11_session_create_object              (GP11Session *self,
                                                              GError **err,
-                                                             ...);
+                                                             ...) GP11_INVALID_TERMINATED;
 
 GP11Object*         gp11_session_create_object_full         (GP11Session *self,
                                                              GP11Attributes *attrs,
@@ -650,7 +660,7 @@ GP11Object*         gp11_session_create_object_finish       (GP11Session *self,
 
 GList*              gp11_session_find_objects               (GP11Session *self,
                                                              GError **err,
-                                                             ...);
+                                                             ...) GP11_INVALID_TERMINATED;
 
 GList*              gp11_session_find_objects_full          (GP11Session *self,
                                                              GP11Attributes *attrs,
@@ -672,38 +682,38 @@ GList*              gp11_session_find_objects_finish        (GP11Session *self,
 GP11Object*         gp11_session_generate_key               (GP11Session *self,
                                                              GP11Mechanism *mechanism,
                                                              GError **err,
-                                                             ...);
+                                                             ...) GP11_INVALID_TERMINATED;
 
 void                gp11_session_generate_key_async         (GP11Session *self,
                                                              GP11Mechanism *mechanism,
                                                              GAsyncReadyCallback callback,
                                                              gpointer user_data,
-                                                             ...);
+                                                             ...) GP11_INVALID_TERMINATED;
 
 GP11Object*         gp11_session_generate_key_finish        (GP11Session *self,
                                                              GAsyncResult *result,
                                                              GError **err,
-                                                             ...);
+                                                             ...) GP11_INVALID_TERMINATED;
 
 gboolean            gp11_session_generate_key_pair          (GP11Session *self,
                                                              GP11Mechanism *mechanism,
                                                              GP11Object **public_key,
                                                              GP11Object **private_key,
                                                              GError **err,
-                                                             ...);
+                                                             ...) GP11_INVALID_TERMINATED;
 
 void                gp11_session_generate_key_pair_async    (GP11Session *self,
                                                              GP11Mechanism *mechanism,
                                                              GAsyncReadyCallback callback,
                                                              gpointer user_data,
-                                                             ...);
+                                                             ...) GP11_INVALID_TERMINATED;
 
 gboolean            gp11_session_generate_key_pair_finish   (GP11Session *self,
                                                              GAsyncResult *result,
                                                              GP11Object **public_key,
                                                              GP11Object **private_key,
                                                              GError **err,
-                                                             ...);
+                                                             ...) GP11_INVALID_TERMINATED;
 
 gboolean            gp11_session_seed_random                (GP11Session *self,
                                                              const guchar *seed,
@@ -1165,7 +1175,7 @@ GP11Object*         gp11_session_unwrap                      (GP11Session *self,
                                                               const guchar *input,
                                                               gsize n_input,
                                                               GError **err,
-                                                              ...);
+                                                              ...) GP11_INVALID_TERMINATED;
 
 GP11Object*         gp11_session_unwrap                      (GP11Session *self,
                                                               GP11Object *key,
@@ -1174,7 +1184,7 @@ GP11Object*         gp11_session_unwrap                      (GP11Session *self,
                                                               gsize n_input,
                                                               GCancellable *cancellable,
                                                               GError **err,
-                                                              ...);
+                                                              ...) GP11_INVALID_TERMINATED;
 
 void                gp11_session_unwrap_async                (GP11Session *self,
                                                               GP11Object *key,
@@ -1184,7 +1194,7 @@ void                gp11_session_unwrap_async                (GP11Session *self,
                                                               GCancellable *cancellable,
                                                               GAsyncReadyCallback callback,
                                                               gpointer user_data);
-                                                              ...);
+                                                              ...) GP11_INVALID_TERMINATED;
 
 GP11Object*         gp11_session_unwrap_finish               (GP11Session *self,
                                                               GAsyncResult *result,
@@ -1194,14 +1204,14 @@ GP11Object*         gp11_session_derive                      (GP11Session *self,
                                                               GP11Object *key,
                                                               gulong mech_type,
                                                               GError **err,
-                                                              ...);
+                                                              ...) GP11_INVALID_TERMINATED;
 
 GP11Object*         gp11_session_derive_full                 (GP11Session *self,
                                                               GP11Object *key,
                                                               GP11Mechanism *mech_args,
                                                               GCancellable *cancellable,
                                                               GError **err,
-                                                              ...);
+                                                              ...) GP11_INVALID_TERMINATED;
 
 void                gp11_session_derive_async                (GP11Session *self,
                                                               GP11Object *key,
@@ -1209,7 +1219,7 @@ void                gp11_session_derive_async                (GP11Session *self,
                                                               GCancellable *cancellable,
                                                               GAsyncReadyCallback callback,
                                                               gpointer user_data);
-                                                              ...);
+                                                              ...) GP11_INVALID_TERMINATED;
 
 GP11Object*         gp11_session_derive_finish               (GP11Session *self,
                                                               GAsyncResult *result,
@@ -1320,7 +1330,7 @@ gssize              gp11_object_get_size_finish             (GP11Object *self,
 
 gboolean            gp11_object_set                         (GP11Object *self,
                                                              GError **err,
-                                                             ...);
+                                                             ...) GP11_INVALID_TERMINATED;
 
 gboolean            gp11_object_set_full                    (GP11Object *self,
                                                              GP11Attributes *attrs,
@@ -1339,7 +1349,7 @@ gboolean            gp11_object_set_finish                  (GP11Object *self,
 
 GP11Attributes*     gp11_object_get                         (GP11Object *self,
                                                              GError **err,
-                                                             ...);
+                                                             ...) GP11_INVALID_TERMINATED;
 
 GP11Attributes*     gp11_object_get_full                    (GP11Object *self,
                                                              GP11Attributes *attrs,

diff --git a/gp11/reference/Makefile.am b/gp11/reference/Makefile.am
index 2a2015b..f26a4ba 100644 (file)
--- a/gp11/reference/Makefile.am
+++ b/gp11/reference/Makefile.am
@@ -85,6 +85,9 @@ GTKDOC_LIBS=\
        $(GOBJECT_LIBS) \
        $(NULL)
 
+# gtk-doc has warnings
+CFLAGS += "-Wno-error"
+
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
 

diff --git a/gp11/reference/gp11-undeclared.txt b/gp11/reference/gp11-undeclared.txt
index 33511cd..999caac 100644 (file)
--- a/gp11/reference/gp11-undeclared.txt
+++ b/gp11/reference/gp11-undeclared.txt
@@ -556,11 +556,25 @@ firmware_version
 free_private_memory
 free_public_memory
 gp11_attributes_is_immutable
+gp11_attributes_new_valist
 gp11_attributes_set_immutable
+gp11_object_get_full
 gp11_object_get_one
 gp11_object_get_one_async
 gp11_object_get_one_finish
 gp11_object_get_one_full
+gp11_object_set_full
+gp11_session_create_object_full
+gp11_session_derive_async
+gp11_session_derive_full
+gp11_session_find_objects_full
+gp11_session_generate_key_async
+gp11_session_generate_key_finish
+gp11_session_generate_key_pair
+gp11_session_generate_key_pair_async
+gp11_session_generate_key_pair_finish
+gp11_session_seed_random
+gp11_session_unwrap_async
 gp11_slot_get_auto_login
 gp11_slot_get_reuse_sessions
 gp11_slot_set_auto_login

diff --git a/gp11/reference/tmpl/gp11-unused.sgml b/gp11/reference/tmpl/gp11-unused.sgml
index caceca5..efc46c8 100644 (file)
--- a/gp11/reference/tmpl/gp11-unused.sgml
+++ b/gp11/reference/tmpl/gp11-unused.sgml
@@ -3393,6 +3393,15 @@
 @attrs:
 @Returns:
 
+<!-- ##### FUNCTION gp11_attributes_new_valist ##### -->
+<para>
+
+</para>
+
+@allocator:
+@va:
+@Returns:
+
 <!-- ##### FUNCTION gp11_attributes_set_immutable ##### -->
 <para>
 
@@ -3400,6 +3409,17 @@
 
 @attrs:
 
+<!-- ##### FUNCTION gp11_object_get_full ##### -->
+<para>
+
+</para>
+
+@self:
+@attrs:
+@cancellable:
+@err:
+@Returns:
+
 <!-- ##### FUNCTION gp11_object_get_one ##### -->
 <para>
 
@@ -3442,6 +3462,148 @@
 @err:
 @Returns:
 
+<!-- ##### FUNCTION gp11_object_set_full ##### -->
+<para>
+
+</para>
+
+@self:
+@attrs:
+@cancellable:
+@err:
+@Returns:
+
+<!-- ##### FUNCTION gp11_session_create_object_full ##### -->
+<para>
+
+</para>
+
+@self:
+@attrs:
+@cancellable:
+@err:
+@Returns:
+
+<!-- ##### FUNCTION gp11_session_derive_async ##### -->
+<para>
+
+</para>
+
+@self:
+@key:
+@mech_args:
+@cancellable:
+@callback:
+@user_data:
+
+<!-- ##### FUNCTION gp11_session_derive_full ##### -->
+<para>
+
+</para>
+
+@self:
+@key:
+@mech_args:
+@cancellable:
+@err:
+@Varargs:
+@Returns:
+
+<!-- ##### FUNCTION gp11_session_find_objects_full ##### -->
+<para>
+
+</para>
+
+@self:
+@attrs:
+@cancellable:
+@err:
+@Returns:
+
+<!-- ##### FUNCTION gp11_session_generate_key_async ##### -->
+<para>
+
+</para>
+
+@self:
+@mechanism:
+@callback:
+@user_data:
+@Varargs:
+
+<!-- ##### FUNCTION gp11_session_generate_key_finish ##### -->
+<para>
+
+</para>
+
+@self:
+@result:
+@err:
+@Varargs:
+@Returns:
+
+<!-- ##### FUNCTION gp11_session_generate_key_pair ##### -->
+<para>
+
+</para>
+
+@self:
+@mechanism:
+@public_key:
+@private_key:
+@err:
+@Varargs:
+@Returns:
+
+<!-- ##### FUNCTION gp11_session_generate_key_pair_async ##### -->
+<para>
+
+</para>
+
+@self:
+@mechanism:
+@callback:
+@user_data:
+@Varargs:
+
+<!-- ##### FUNCTION gp11_session_generate_key_pair_finish ##### -->
+<para>
+
+</para>
+
+@self:
+@result:
+@public_key:
+@private_key:
+@err:
+@Varargs:
+@Returns:
+
+<!-- ##### FUNCTION gp11_session_seed_random ##### -->
+<para>
+
+</para>
+
+@self:
+@seed:
+@n_seed:
+@err:
+@Returns:
+
+<!-- ##### FUNCTION gp11_session_unwrap_async ##### -->
+<para>
+
+</para>
+
+@self:
+@key:
+@mech_args:
+@input:
+@n_input:
+@cancellable:
+@callback:
+@user_data:
+
 <!-- ##### FUNCTION gp11_slot_get_auto_login ##### -->
 <para>
 

diff --git a/gp11/reference/tmpl/gp11.sgml b/gp11/reference/tmpl/gp11.sgml
index 11302f7..40e155e 100644 (file)
--- a/gp11/reference/tmpl/gp11.sgml
+++ b/gp11/reference/tmpl/gp11.sgml
@@ -332,17 +332,6 @@ GP11Object
 </para>
 
 @attr_type:
-@Varargs:
-@Returns:
-
-
-<!-- ##### FUNCTION gp11_attributes_new_valist ##### -->
-<para>
-
-</para>
-
-@allocator:
-@va:
 @Returns:
 
 
@@ -1292,19 +1281,6 @@ GP11Object
 
 @self:
 @err:
-@Varargs:
-@Returns:
-
-
-<!-- ##### FUNCTION gp11_session_create_object_full ##### -->
-<para>
-
-</para>
-
-@self:
-@attrs:
-@cancellable:
-@err:
 @Returns:
 
 
@@ -1338,19 +1314,6 @@ GP11Object
 
 @self:
 @err:
-@Varargs:
-@Returns:
-
-
-<!-- ##### FUNCTION gp11_session_find_objects_full ##### -->
-<para>
-
-</para>
-
-@self:
-@attrs:
-@cancellable:
-@err:
 @Returns:
 
 
@@ -1385,83 +1348,6 @@ GP11Object
 @self:
 @mechanism:
 @err:
-@Varargs:
-@Returns:
-
-
-<!-- ##### FUNCTION gp11_session_generate_key_async ##### -->
-<para>
-
-</para>
-
-@self:
-@mechanism:
-@callback:
-@user_data:
-@Varargs:
-
-
-<!-- ##### FUNCTION gp11_session_generate_key_finish ##### -->
-<para>
-
-</para>
-
-@self:
-@result:
-@err:
-@Varargs:
-@Returns:
-
-
-<!-- ##### FUNCTION gp11_session_generate_key_pair ##### -->
-<para>
-
-</para>
-
-@self:
-@mechanism:
-@public_key:
-@private_key:
-@err:
-@Varargs:
-@Returns:
-
-
-<!-- ##### FUNCTION gp11_session_generate_key_pair_async ##### -->
-<para>
-
-</para>
-
-@self:
-@mechanism:
-@callback:
-@user_data:
-@Varargs:
-
-
-<!-- ##### FUNCTION gp11_session_generate_key_pair_finish ##### -->
-<para>
-
-</para>
-
-@self:
-@result:
-@public_key:
-@private_key:
-@err:
-@Varargs:
-@Returns:
-
-
-<!-- ##### FUNCTION gp11_session_seed_random ##### -->
-<para>
-
-</para>
-
-@self:
-@seed:
-@n_seed:
-@err:
 @Returns:
 
 
@@ -2323,25 +2209,9 @@ GP11Object
 @input:
 @n_input:
 @err:
-@Varargs:
 @Returns:
 
 
-<!-- ##### FUNCTION gp11_session_unwrap_async ##### -->
-<para>
-
-</para>
-
-@self:
-@key:
-@mech_args:
-@input:
-@n_input:
-@cancellable:
-@callback:
-@user_data:
-
-
 <!-- ##### FUNCTION gp11_session_unwrap_finish ##### -->
 <para>
 
@@ -2362,37 +2232,9 @@ GP11Object
 @key:
 @mech_type:
 @err:
-@Varargs:
 @Returns:
 
 
-<!-- ##### FUNCTION gp11_session_derive_full ##### -->
-<para>
-
-</para>
-
-@self:
-@key:
-@mech_args:
-@cancellable:
-@err:
-@Varargs:
-@Returns:
-
-
-<!-- ##### FUNCTION gp11_session_derive_async ##### -->
-<para>
-
-</para>
-
-@self:
-@key:
-@mech_args:
-@cancellable:
-@callback:
-@user_data:
-
-
 <!-- ##### FUNCTION gp11_session_derive_finish ##### -->
 <para>
 
@@ -2652,19 +2494,6 @@ GP11Object
 
 @self:
 @err:
-@Varargs:
-@Returns:
-
-
-<!-- ##### FUNCTION gp11_object_set_full ##### -->
-<para>
-
-</para>
-
-@self:
-@attrs:
-@cancellable:
-@err:
 @Returns:
 
 
@@ -2698,19 +2527,6 @@ GP11Object
 
 @self:
 @err:
-@Varargs:
-@Returns:
-
-
-<!-- ##### FUNCTION gp11_object_get_full ##### -->
-<para>
-
-</para>
-
-@self:
-@attrs:
-@cancellable:
-@err:
 @Returns:
 
 

diff --git a/gp11/tests/gp11-test-module.c b/gp11/tests/gp11-test-module.c
index 7847b25..180540c 100644 (file)
--- a/gp11/tests/gp11-test-module.c
+++ b/gp11/tests/gp11-test-module.c
@@ -126,7 +126,7 @@ test_C_Initialize (CK_VOID_PTR pInitArgs)
        /* Our token object */
        attrs = gp11_attributes_newv (CKA_CLASS, GP11_ULONG, CKO_DATA,
                                      CKA_LABEL, GP11_STRING, "TEST LABEL",
-                                     -1);
+                                     GP11_INVALID);
        g_hash_table_insert (the_objects, GUINT_TO_POINTER (2), attrs);
 
        /* Private capitalize key */
@@ -136,7 +136,7 @@ test_C_Initialize (CK_VOID_PTR pInitArgs)
                                      CKA_ALLOWED_MECHANISMS, sizeof (value), &value,
                                      CKA_DECRYPT, GP11_BOOLEAN, TRUE,
                                      CKA_PRIVATE, GP11_BOOLEAN, TRUE,
-                                     -1);
+                                     GP11_INVALID);
        g_hash_table_insert (the_objects, GUINT_TO_POINTER (PRIVATE_KEY_CAPITALIZE), attrs);
 
        /* Public capitalize key */
@@ -146,7 +146,7 @@ test_C_Initialize (CK_VOID_PTR pInitArgs)
                                      CKA_ALLOWED_MECHANISMS, sizeof (value), &value,
                                      CKA_ENCRYPT, GP11_BOOLEAN, TRUE,
                                      CKA_PRIVATE, GP11_BOOLEAN, FALSE,
-                                     -1);
+                                     GP11_INVALID);
        g_hash_table_insert (the_objects, GUINT_TO_POINTER (PUBLIC_KEY_CAPITALIZE), attrs);
 
        /* Private prefix key */
@@ -157,7 +157,7 @@ test_C_Initialize (CK_VOID_PTR pInitArgs)
                                      CKA_SIGN, GP11_BOOLEAN, TRUE,
                                      CKA_PRIVATE, GP11_BOOLEAN, TRUE,
                                      CKA_ALWAYS_AUTHENTICATE, GP11_BOOLEAN, TRUE,
-                                     -1);
+                                     GP11_INVALID);
        g_hash_table_insert (the_objects, GUINT_TO_POINTER (PRIVATE_KEY_PREFIX), attrs);
 
        /* Private prefix key */
@@ -167,7 +167,7 @@ test_C_Initialize (CK_VOID_PTR pInitArgs)
                                      CKA_ALLOWED_MECHANISMS, sizeof (value), &value,
                                      CKA_VERIFY, GP11_BOOLEAN, TRUE,
                                      CKA_PRIVATE, GP11_BOOLEAN, FALSE,
-                                     -1);
+                                     GP11_INVALID);
        g_hash_table_insert (the_objects, GUINT_TO_POINTER (PUBLIC_KEY_PREFIX), attrs);
 
        initialized = TRUE;

diff --git a/gp11/tests/unit-test-gp11-attributes.c b/gp11/tests/unit-test-gp11-attributes.c
index 647dcd2..e502139 100644 (file)
--- a/gp11/tests/unit-test-gp11-attributes.c
+++ b/gp11/tests/unit-test-gp11-attributes.c
@@ -355,7 +355,7 @@ DEFINE_TEST(newv_attributes)
                                      202, GP11_STRING, "string",
                                      303, GP11_DATE, date,
                                      404, N_ATTR_DATA, ATTR_DATA,
-                                     -1);
+                                     GP11_INVALID);
        g_date_free (date);
 
        test_attributes_contents (attrs, FALSE);