examples: Fix warnings of product_database_test.
authorAndreas Schneider <asn@cryptomilk.org>
Mon, 25 Jun 2012 13:19:04 +0000 (15:19 +0200)
committerAndreas Schneider <asn@cryptomilk.org>
Mon, 25 Jun 2012 13:45:02 +0000 (15:45 +0200)
src/example/product_database_test.c
src/include/cmocka.h

index abc02d6..9d7bcfc 100644 (file)
@@ -28,32 +28,38 @@ DatabaseConnection* connect_to_database(const char * const url,
                                         const unsigned int port) {
     check_expected(url);
     check_expected(port);
-    return (DatabaseConnection*)((unsigned)mock());
+    return (DatabaseConnection*)((size_t)mock());
 }
 
 static void test_connect_to_product_database(void **state) {
+    (void) state; /* unused */
+
     expect_string(connect_to_database, url, "products.abcd.org");
     expect_value(connect_to_database, port, 322);
     will_return(connect_to_database, 0xDA7ABA53);
-    assert_int_equal((int)connect_to_product_database(), 0xDA7ABA53);
+    assert_int_equal((int)(size_t)connect_to_product_database(), 0xDA7ABA53);
 }
 
 /* This test will fail since the expected URL is different to the URL that is
  * passed to connect_to_database() by connect_to_product_database(). */
 static void test_connect_to_product_database_bad_url(void **state) {
+    (void) state; /* unused */
+
     expect_string(connect_to_database, url, "products.abcd.com");
     expect_value(connect_to_database, port, 322);
     will_return(connect_to_database, 0xDA7ABA53);
-    assert_int_equal((int)connect_to_product_database(), 0xDA7ABA53);
+    assert_int_equal((int)(size_t)connect_to_product_database(), 0xDA7ABA53);
 }
 
 /* This test will fail since the mock connect_to_database() will attempt to
  * retrieve a value for the parameter port which isn't specified by this
  * test function. */
 static void test_connect_to_product_database_missing_parameter(void **state) {
+    (void) state; /* unused */
+
     expect_string(connect_to_database, url, "products.abcd.org");
     will_return(connect_to_database, 0xDA7ABA53);
-    assert_int_equal((int)connect_to_product_database(), 0xDA7ABA53);
+    assert_int_equal((int)(size_t)connect_to_product_database(), 0xDA7ABA53);
 }
 
 int main(void) {
index c139d7d..ae6802d 100755 (executable)
@@ -71,7 +71,7 @@ int __stdcall IsDebuggerPresent();
 
 /* Perform an unsigned cast to LargestIntegralType. */
 #define cast_to_largest_integral_type(value) \
-    ((LargestIntegralType)((unsigned)(value)))
+    ((LargestIntegralType)((unsigned)(size_t)(value)))
 
 /* Smallest integral type capable of holding a pointer. */
 #ifndef _UINTPTR_T