From f347d8e05cd51e4e826ef7420a3ce2ef473ec853 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Mon, 25 Jun 2012 15:56:36 +0200
Subject: [PATCH] examples: Fix warnings of assert_macro_test.

---
 src/example/assert_macro.c      |  4 +++-
 src/example/assert_macro.h      |  2 ++
 src/example/assert_macro_test.c | 16 +++++++++-------
 3 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 src/example/assert_macro.h

diff --git a/src/example/assert_macro.c b/src/example/assert_macro.c
index b70713b..9590590 100644
--- a/src/example/assert_macro.c
+++ b/src/example/assert_macro.c
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <string.h>
+#include "assert_macro.h"
 
 static const char* status_code_strings[] = {
     "Address not found",
@@ -23,7 +25,7 @@ static const char* status_code_strings[] = {
 
 const char* get_status_code_string(const unsigned int status_code) {
     return status_code_strings[status_code];
-};
+}
 
 unsigned int string_to_status_code(const char* const status_code_string) {
     unsigned int i;
diff --git a/src/example/assert_macro.h b/src/example/assert_macro.h
new file mode 100644
index 0000000..789380c
--- /dev/null
+++ b/src/example/assert_macro.h
@@ -0,0 +1,2 @@
+const char* get_status_code_string(const unsigned int status_code);
+unsigned int string_to_status_code(const char* const status_code_string);
diff --git a/src/example/assert_macro_test.c b/src/example/assert_macro_test.c
index 79e1b53..efe1c64 100644
--- a/src/example/assert_macro_test.c
+++ b/src/example/assert_macro_test.c
@@ -18,24 +18,26 @@
 #include <setjmp.h>
 #include <cmocka.h>
 
-extern const char* get_status_code_string(const unsigned int status_code);
-extern unsigned int string_to_status_code(
-    const char* const status_code_string);
+#include "assert_macro.h"
 
 /* This test will fail since the string returned by get_status_code_string(0)
  * doesn't match "Connection timed out". */
-void get_status_code_string_test(void **state) {
+static void get_status_code_string_test(void **state) {
+    (void) state; /* unused */
+
     assert_string_equal(get_status_code_string(0), "Address not found");
     assert_string_equal(get_status_code_string(1), "Connection timed out");
 }
 
-// This test will fail since the status code of "Connection timed out" isn't 1
-void string_to_status_code_test(void **state) {
+/* This test will fail since the status code of "Connection timed out" isn't 1 */
+static void string_to_status_code_test(void **state) {
+    (void) state; /* unused */
+
     assert_int_equal(string_to_status_code("Address not found"), 0);
     assert_int_equal(string_to_status_code("Connection timed out"), 1);
 }
 
-int main(int argc, char *argv[]) {
+int main(void) {
     const UnitTest tests[] = {
         unit_test(get_status_code_string_test),
         unit_test(string_to_status_code_test),
-- 
2.7.4