gnome-keyring r1475 - in trunk: . daemon/pk daemon/pkcs11

[nnielsen svn gnome org]

Author: nnielsen
Date: Thu Jan 22 22:58:59 2009
New Revision: 1475
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1475&view=rev

Log:
Fix compiler warnings


Modified:
   trunk/ChangeLog
   trunk/daemon/pk/gkr-pk-index.c
   trunk/daemon/pkcs11/gkr-pkcs11-auth-ep.c

Modified: trunk/daemon/pk/gkr-pk-index.c
==============================================================================
--- trunk/daemon/pk/gkr-pk-index.c	(original)
+++ trunk/daemon/pk/gkr-pk-index.c	Thu Jan 22 22:58:59 2009
@@ -69,14 +69,13 @@
 	const guchar *digdata;
 	gsize n_group, n_digdata;
 	gchar *group;
-	gboolean r;
 	
 	/* Encode the digest */		
 	digdata = gkr_id_get_raw (digest, &n_digdata);
 	g_assert (digdata);
 	n_group = (n_digdata * 2) + 1;
 	group = egg_hex_encode (digdata, n_digdata);
-	g_assert (r == TRUE);
+	g_assert (group);
 
 	return group;
 }

Modified: trunk/daemon/pkcs11/gkr-pkcs11-auth-ep.c
==============================================================================
--- trunk/daemon/pkcs11/gkr-pkcs11-auth-ep.c	(original)
+++ trunk/daemon/pkcs11/gkr-pkcs11-auth-ep.c	Thu Jan 22 22:58:59 2009
@@ -722,11 +722,11 @@
                           CK_ATTRIBUTE_PTR template, CK_ULONG count)
 {
 	gboolean have_auth = FALSE;
+	CK_BBOOL cached = CK_FALSE;
 	GkrPkcs11AuthObject *info;
 	CK_ATTRIBUTE_PTR normal;
 	CK_ULONG n_normal;
 	CK_RV rv = CKR_OK;
-	CK_BBOOL cached;
 	CK_ULONG i;
 	
 	/* Are there auth custom attributes, also validate. */