summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStef Walter <stefw@collabora.co.uk>2011-06-07 11:46:14 +0000
committerStef Walter <stefw@collabora.co.uk>2011-06-07 11:46:14 +0000
commit0f09803ba95bcdfebf4bde509b43b3ca52cd9d3f (patch)
tree008ff1612f9387db9c3eaffb0af5d85734ad7ccd
parenta5d3e34397d847a0c9b2e3aab7bd9f0b1080af05 (diff)
Fix compiler warnings.
-rw-r--r--p11-kit/hash.c2
-rw-r--r--tests/uri-test.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/p11-kit/hash.c b/p11-kit/hash.c
index 1bb9d61..9be1c32 100644
--- a/p11-kit/hash.c
+++ b/p11-kit/hash.c
@@ -442,7 +442,7 @@ hash_intptr_equal (const void *int_one, const void *int_two)
unsigned int
hash_direct_hash (const void *ptr)
{
- return (unsigned int)ptr;
+ return (unsigned int)(unsigned long)ptr;
}
int
diff --git a/tests/uri-test.c b/tests/uri-test.c
index d26e090..100df31 100644
--- a/tests/uri-test.c
+++ b/tests/uri-test.c
@@ -322,6 +322,7 @@ test_uri_build_empty (CuTest *tc)
CuAssertPtrNotNull (tc, uri);
ret = p11_kit_uri_format (uri, P11_KIT_URI_FOR_ANY, &string);
+ CuAssertIntEquals (tc, P11_KIT_URI_OK, ret);
CuAssertStrEquals (tc, "pkcs11:", string);
free (string);