From 75c3b378dedfe7c22a7d82098521e2b7046930bb Mon Sep 17 00:00:00 2001
From: Nick Barnes <nb@ravenbrook.com>
Date: Mon, 28 Oct 2002 12:48:29 +0000
Subject: [PATCH] Split long strings to comply with c standard.  also make sure
 %p arguments are pointers.

Copied from Perforce
 Change: 34863
 ServerID: perforce.ravenbrook.com
---
 mps/code/bttest.c   | 12 ++++++------
 mps/code/cbstest.c  |  2 +-
 mps/code/teletest.c |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/mps/code/bttest.c b/mps/code/bttest.c
index 736a0f23c3e..3c5e44833c6 100644
--- a/mps/code/bttest.c
+++ b/mps/code/bttest.c
@@ -223,17 +223,17 @@ static void help(void)
          "d                 destroy the current BT\n"
          "s <i>             set the bit index 'i'\n"
          "r <i>             reset the bit index 'i'\n"
-         "g <i>             get the bit index 'i'\n"
-         "sr [<i> <i>]      set the specified range\n"
+         "g <i>             get the bit index 'i'\n");
+  printf("sr [<i> <i>]      set the specified range\n"
          "rr [<i> <i>]      reset the specified range\n"
          "is [<i> <i>]      is the specified range set?\n"
-         "ir [<i> <i>]      is the specified range reset?\n"
-         "f <l> [<i> <i>]   find a reset range of length 'l'.\n"
+         "ir [<i> <i>]      is the specified range reset?\n");
+  printf("f <l> [<i> <i>]   find a reset range of length 'l'.\n"
          "fh <l> [<i> <i>]  find a reset range length 'l', working downwards\n"
          "fl <l> [<i> <i>]  find a reset range of length at least 'l'\n"
          "q                 quit\n"
-         "?                 print this message\n"
-         "\n"
+         "?                 print this message\n");
+  printf("\n"
          "No way of testing BTSize, BTRangesSame, or BTCopyInvertRange.\n");
 }
 
diff --git a/mps/code/cbstest.c b/mps/code/cbstest.c
index 0e2f4a42fa6..393a17c162d 100644
--- a/mps/code/cbstest.c
+++ b/mps/code/cbstest.c
@@ -607,7 +607,7 @@ extern int main(int argc, char *argv[])
       "failed to allocate block");
   dummyBlock = (Addr)p; /* avoid pun */
 
-  printf("Allocated block [%p, %p)\n", dummyBlock,
+  printf("Allocated block [%p, %p)\n", (void*)dummyBlock,
          (char *)dummyBlock + ArraySize);
 
   checkCBS(cbs, allocTable, dummyBlock);
diff --git a/mps/code/teletest.c b/mps/code/teletest.c
index 571e4e83fc3..ab2a742a891 100644
--- a/mps/code/teletest.c
+++ b/mps/code/teletest.c
@@ -110,8 +110,8 @@ static void doHelp(void)
                "read                     -> <old>          Read filter\n"
                "set <mask>               -> <old> <new>    Set filter\n"
                "reset <mask>             -> <old> <new>    Reset filter\n"
-               "flip <mask>              -> <old> <new>    Toggle filter\n"
-               "intern <string>          -> <id>           Intern string\n"
+               "flip <mask>              -> <old> <new>    Toggle filter\n");
+  (void)printf("intern <string>          -> <id>           Intern string\n"
                "label <address> <id>                       Label address\n"
                "flush                                      Flush buffer\n"
                "help                                       Print this message\n"