example: Fix build warnings of product_database_test.
authorAndreas Schneider <asn@cryptomilk.org>
Tue, 31 May 2011 19:48:22 +0000 (21:48 +0200)
committerAndreas Schneider <asn@cryptomilk.org>
Tue, 31 May 2011 19:52:36 +0000 (21:52 +0200)
src/example/product_database.c
src/example/product_database_test.c

index 1f03cd0977f06be3a4dbc2e884becf3d2bbd11d5..3fb96418e3c5936a883638f07e67c84a045780f9 100644 (file)
  */
 #include <database.h>
 
+DatabaseConnection* connect_to_product_database(void);
+
 // Connect to the database containing customer information.
-DatabaseConnection* connect_to_product_database() {
+DatabaseConnection* connect_to_product_database(void) {
     return connect_to_database("products.abcd.org", 322);
 }
 
index e1985161d193af6358d8cf656245920443061e71..571d51a7d582aabc7f3174a1fa162b7fed0d65b3 100644 (file)
@@ -19,7 +19,7 @@
 #include <cmockery.h>
 #include <database.h>
 
-extern DatabaseConnection* connect_to_product_database();
+extern DatabaseConnection* connect_to_product_database(void);
 
 /* Mock connect to database function.
  * NOTE: This mock function is very general could be shared between tests
@@ -31,7 +31,7 @@ DatabaseConnection* connect_to_database(const char * const url,
     return (DatabaseConnection*)((unsigned)mock());
 }
 
-void test_connect_to_product_database(void **state) {
+static void test_connect_to_product_database(void **state) {
     expect_string(connect_to_database, url, "products.abcd.org");
     expect_value(connect_to_database, port, 322);
     will_return(connect_to_database, 0xDA7ABA53);
@@ -40,7 +40,7 @@ void test_connect_to_product_database(void **state) {
 
 /* 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(). */
-void test_connect_to_product_database_bad_url(void **state) {
+static void test_connect_to_product_database_bad_url(void **state) {
     expect_string(connect_to_database, url, "products.abcd.com");
     expect_value(connect_to_database, port, 322);
     will_return(connect_to_database, 0xDA7ABA53);
@@ -50,13 +50,13 @@ void test_connect_to_product_database_bad_url(void **state) {
 /* 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. */
-void test_connect_to_product_database_missing_parameter(void **state) {
+static void test_connect_to_product_database_missing_parameter(void **state) {
     expect_string(connect_to_database, url, "products.abcd.org");
     will_return(connect_to_database, 0xDA7ABA53);
     assert_int_equal((int)connect_to_product_database(), 0xDA7ABA53);
 }
 
-int main(int argc, char* argv[]) {
+int main(void) {
     const UnitTest tests[] = {
         unit_test(test_connect_to_product_database),
         unit_test(test_connect_to_product_database_bad_url),