example: Fix build warnings for assert_module test.

diff --git a/src/example/assert_module.c b/src/example/assert_module.c
index 949ddde4e404400154b3907181f566eedd31981b..4d206dd7c007ac936854e1b42042b2dcb250c213 100644 (file)
--- a/src/example/assert_module.c
+++ b/src/example/assert_module.c
@@ -15,13 +15,15 @@
  */
 #include <assert.h>
 
+#include "assert_module.h"
+
 // If unit testing is enabled override assert with mock_assert().
 #if UNIT_TESTING
 extern void mock_assert(const int result, const char* const expression,
                         const char * const file, const int line);
 #undef assert
 #define assert(expression) \
-    mock_assert((int)(expression), #expression, __FILE__, __LINE__);
+    mock_assert(((expression) ? 1 : 0), #expression, __FILE__, __LINE__);
 #endif // UNIT_TESTING
 
 void increment_value(int * const value) {

diff --git a/src/example/assert_module.h b/src/example/assert_module.h
new file mode 100644 (file)
index 0000000..b68b4d9
--- /dev/null
+++ b/src/example/assert_module.h
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+void increment_value(int * const value);
+void decrement_value(int * const value);

diff --git a/src/example/assert_module_test.c b/src/example/assert_module_test.c
index 39eb539757e2693e5afd4d807e8d08204b348427..6f4f0a9993f2fe098f886133189786e6544d2721 100644 (file)
--- a/src/example/assert_module_test.c
+++ b/src/example/assert_module_test.c
@@ -18,26 +18,35 @@
 #include <setjmp.h>
 #include <cmocka.h>
 
+#include "assert_module.h"
+
 extern void increment_value(int * const value);
 
 /* This test case will fail but the assert is caught by run_tests() and the
  * next test is executed. */
-void increment_value_fail(void **state) {
+static void increment_value_fail(void **state) {
+    (void) state;
+
     increment_value(NULL);
 }
 
-// This test case succeeds since increment_value() asserts on the NULL pointer.
-void increment_value_assert(void **state) {
+/* This test case succeeds since increment_value() asserts on the NULL
+ * pointer. */
+static void increment_value_assert(void **state) {
+    (void) state;
+
     expect_assert_failure(increment_value(NULL));
 }
 
 /* This test case fails since decrement_value() doesn't assert on a NULL
  * pointer. */
-void decrement_value_fail(void **state) {
+static void decrement_value_fail(void **state) {
+    (void) state;
+
     expect_assert_failure(decrement_value(NULL));
 }
 
-int main(int argc, char *argv[]) {
+int main(void) {
     const UnitTest tests[] = {
         unit_test(increment_value_fail),
         unit_test(increment_value_assert),