summaryrefslogtreecommitdiff
path: root/daemon
diff options
context:
space:
mode:
authorStefan Walter <stefw@src.gnome.org>2009-01-22 22:58:59 +0000
committerStefan Walter <stefw@src.gnome.org>2009-01-22 22:58:59 +0000
commit358ca7e13355525d34f95790fd4a2a725e4436de (patch)
treefa600a40c19a11fb7b53bc94208bf7bea632763b /daemon
parent83ca81ea3df493fee93c1aa934aa4b44823ddbe4 (diff)
Fix compiler warnings
svn path=/trunk/; revision=1475
Diffstat (limited to 'daemon')
-rw-r--r--daemon/pk/gkr-pk-index.c3
-rw-r--r--daemon/pkcs11/gkr-pkcs11-auth-ep.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/daemon/pk/gkr-pk-index.c b/daemon/pk/gkr-pk-index.c
index f244a049..ded825ac 100644
--- a/daemon/pk/gkr-pk-index.c
+++ b/daemon/pk/gkr-pk-index.c
@@ -69,14 +69,13 @@ digest_to_group (gkrconstid digest)
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;
}
diff --git a/daemon/pkcs11/gkr-pkcs11-auth-ep.c b/daemon/pkcs11/gkr-pkcs11-auth-ep.c
index 0af19843..1beac051 100644
--- a/daemon/pkcs11/gkr-pkcs11-auth-ep.c
+++ b/daemon/pkcs11/gkr-pkcs11-auth-ep.c
@@ -722,11 +722,11 @@ auth_C_SetAttributeValue (CK_SESSION_HANDLE handle, CK_OBJECT_HANDLE object,
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. */