From ffb357724f3dbec85ac33e9b2bc1be7d96510607 Mon Sep 17 00:00:00 2001
From: Zoltan Somogyi <zoltan.somogyi@runbox.com>
Date: Mon, 30 Jul 2018 09:26:12 +1000
Subject: [PATCH] Fix gcc warnings in some test cases.

tests/hard_coded/target_mlobjs_c.c:
    Fix a bad use of printf.

tests/hard_coded/trace_goal_4.m:
tests/hard_coded/word_aligned_pointer.m:
tests/hard_coded/word_aligned_pointer_2.m:
tests/tabling/memo_non.m:
tests/tabling/table_foreign_output.m:
tests/tabling/test_enum.m:
    Don't assume that MR_Integers are ints; print them using
    MR_INTEGER_LENGTH_MODIFIER.
---
 tests/hard_coded/target_mlobjs_c.c        | 2 +-
 tests/hard_coded/trace_goal_4.m           | 8 ++++----
 tests/hard_coded/word_aligned_pointer.m   | 4 ++--
 tests/hard_coded/word_aligned_pointer_2.m | 7 ++++---
 tests/tabling/memo_non.m                  | 3 ++-
 tests/tabling/table_foreign_output.m      | 5 +++--
 tests/tabling/test_enum.m                 | 2 +-
 7 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/tests/hard_coded/target_mlobjs_c.c b/tests/hard_coded/target_mlobjs_c.c
index 287f90abe..8f941f37d 100644
--- a/tests/hard_coded/target_mlobjs_c.c
+++ b/tests/hard_coded/target_mlobjs_c.c
@@ -3,5 +3,5 @@
 
 void c_write_string(char *string)
 {
-	printf(string);
+	printf("%s", string);
 }
diff --git a/tests/hard_coded/trace_goal_4.m b/tests/hard_coded/trace_goal_4.m
index b1f1302cc..f122ff980 100644
--- a/tests/hard_coded/trace_goal_4.m
+++ b/tests/hard_coded/trace_goal_4.m
@@ -15,12 +15,12 @@
 :- implementation.
 
 main(!IO) :-
-    (
+    ( if
         trace [] impure progress_report(1),
         fail
-    ->
+    then
         true
-    ;
+    else
         trace [] impure progress_report(2)
     ).
 
@@ -30,7 +30,7 @@ main(!IO) :-
     progress_report(X::in),
     [will_not_call_mercury, thread_safe, tabled_for_io],
 "
-    printf(""Progress reported %d\\n"", X);
+    printf(""Progress reported %"" MR_INTEGER_LENGTH_MODIFIER ""d\\n"", X);
 ").
 
 :- pragma foreign_proc("C#",
diff --git a/tests/hard_coded/word_aligned_pointer.m b/tests/hard_coded/word_aligned_pointer.m
index 6b071985a..e6ddd77c9 100644
--- a/tests/hard_coded/word_aligned_pointer.m
+++ b/tests/hard_coded/word_aligned_pointer.m
@@ -43,10 +43,10 @@ main(!IO) :-
 write_bar(Bar, !IO) :-
     (
         Bar = yes(Foo),
-        format("yes(0x%x)\n", [i(get_foo(Foo))], !IO)
+        io.format("yes(0x%x)\n", [i(get_foo(Foo))], !IO)
     ;
         Bar = no,
-        write_string("no", !IO)
+        io.write_string("no", !IO)
     ).
 
 %---------------------------------------------------------------------------%
diff --git a/tests/hard_coded/word_aligned_pointer_2.m b/tests/hard_coded/word_aligned_pointer_2.m
index 173893086..28b8e83c0 100644
--- a/tests/hard_coded/word_aligned_pointer_2.m
+++ b/tests/hard_coded/word_aligned_pointer_2.m
@@ -55,7 +55,8 @@ make_foo = foo(0xcafe).
     [will_not_call_mercury, promise_pure, thread_safe],
 "
     if (X != MR_strip_tag(X)) {
-        fprintf(stderr, ""tag bits not clear in value 0x%x\\n"", X);
+        fprintf(stderr, ""tag bits not clear in value""
+            ""0x%"" MR_INTEGER_LENGTH_MODIFIER ""x\\n"", (MR_Unsigned) X);
         abort();
     }
     Int = MR_unmkbody(X);
@@ -76,10 +77,10 @@ make_bar = yes(make_foo).
 write_bar(Bar, !IO) :-
     (
         Bar = yes(Foo),
-        format("yes(0x%x)\n", [i(get_foo(Foo))], !IO)
+        io.format("yes(0x%x)\n", [i(get_foo(Foo))], !IO)
     ;
         Bar = no,
-        write_string("no", !IO)
+        io.write_string("no", !IO)
     ).
 
 %---------------------------------------------------------------------------%
diff --git a/tests/tabling/memo_non.m b/tests/tabling/memo_non.m
index 6dcff0818..b2858b23f 100644
--- a/tests/tabling/memo_non.m
+++ b/tests/tabling/memo_non.m
@@ -76,6 +76,7 @@ test_multi(A, B, C) :-
     marker(S::in, A::in, B::in, X::out),
     [will_not_call_mercury],
 "
-    printf(""marker executed: %s %d %d\\n"", S, A, B);
+    printf(""marker executed: %s %"" MR_INTEGER_LENGTH_MODIFIER ""d %""
+        MR_INTEGER_LENGTH_MODIFIER ""d\\n"", S, A, B);
     X = 0;
 ").
diff --git a/tests/tabling/table_foreign_output.m b/tests/tabling/table_foreign_output.m
index 1158d9277..effcdbd5a 100644
--- a/tests/tabling/table_foreign_output.m
+++ b/tests/tabling/table_foreign_output.m
@@ -68,7 +68,7 @@ test_memo(Pairs, F) :-
 "
     Foreign *p;
 
-    printf(""make_foreign(%d, %s)\\n"", N, S);
+    printf(""make_foreign(%"" MR_INTEGER_LENGTH_MODIFIER ""d, %s)\\n"", N, S);
     p = (Foreign *) malloc(sizeof(Foreign));
     if (p == NULL) {
         exit(1);
@@ -88,7 +88,8 @@ test_memo(Pairs, F) :-
 "
     Foreign *p;
 
-    printf(""make_foreign_memo(%d, %s)\\n"", N, S);
+    printf(""make_foreign_memo(%"" MR_INTEGER_LENGTH_MODIFIER ""d, %s)\\n"",
+        N, S);
     p = (Foreign *) malloc(sizeof(Foreign));
     if (p == NULL) {
         exit(1);
diff --git a/tests/tabling/test_enum.m b/tests/tabling/test_enum.m
index 4b3e6cfc9..5fa4bcbfb 100644
--- a/tests/tabling/test_enum.m
+++ b/tests/tabling/test_enum.m
@@ -57,6 +57,6 @@ get_start_state(StartCond, Anchor) = State :-
     test_exec(In::in, Out::out),
     [will_not_call_mercury, promise_pure, thread_safe],
 "
-    printf(""test_exec %d\\n"", In);
+    printf(""test_exec %"" MR_INTEGER_LENGTH_MODIFIER ""d\\n"", In);
     Out = In + 1;
 ").