test: Warning cleanup

const char in test/xfree86.c. Cast values to (intmax_t) for %ju format
in test/signal-logging.c.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>

2 files changed, 5 insertions, 4 deletions

diff --git a/test/signal-logging.c b/test/signal-logging.c
index a03c5acbe..7bbd9105e 100644
--- a/test/signal-logging.c
+++ b/test/signal-logging.c
@@ -56,7 +56,7 @@ check_signed_number_format_test(long int number)
     FormatInt64(number, string);
     if(strncmp(string, expected, 21) != 0) {
         fprintf(stderr, "Failed to convert %jd to decimal string (expected %s but got %s)\n",
-                number, expected, string);
+                (intmax_t) number, expected, string);
         return FALSE;
     }
 
@@ -93,7 +93,7 @@ check_number_format_test(long unsigned int number)
     FormatUInt64(number, string);
     if(strncmp(string, expected, 21) != 0) {
         fprintf(stderr, "Failed to convert %ju to decimal string (%s vs %s)\n",
-                number, expected, string);
+                (intmax_t) number, expected, string);
         return FALSE;
     }
 
@@ -101,7 +101,7 @@ check_number_format_test(long unsigned int number)
     FormatUInt64Hex(number, string);
     if(strncmp(string, expected, 17) != 0) {
         fprintf(stderr, "Failed to convert %ju to hexadecimal string (%s vs %s)\n",
-                number, expected, string);
+                (intmax_t) number, expected, string);
         return FALSE;
     }
 
diff --git a/test/xfree86.c b/test/xfree86.c
index f9892e68e..a98671183 100644
--- a/test/xfree86.c
+++ b/test/xfree86.c
@@ -73,7 +73,8 @@ xfree86_option_list_duplicate(void)
 static void
 xfree86_add_comment(void)
 {
-    char *current = NULL, *comment;
+    char *current = NULL;
+    const char *comment;
     char compare[1024] = { 0 };
 
     comment = "# foo";