From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sat, 18 Oct 2014 17:51:16 +0000 (+0100)
Subject: Compiler quietening
X-Git-Tag: exim-4_85_RC1~39
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/dd4c8678de8ed13eedcf543b301b92216f6352de

Compiler quietening
---

diff --git a/test/src/client.c b/test/src/client.c
index e7210f223..b97aa5475 100644
--- a/test/src/client.c
+++ b/test/src/client.c
@@ -518,7 +518,7 @@ while (argc >= argi + 1 && argv[argi][0] == '-')
       strcmp(argv[argi], "--help") == 0 ||
       strcmp(argv[argi], "-h") == 0)
     {
-    printf(HELP_MESSAGE);
+    puts(HELP_MESSAGE);
     exit(0);
     }
   if (strcmp(argv[argi], "-tls-on-connect") == 0)
@@ -549,13 +549,13 @@ while (argc >= argi + 1 && argv[argi][0] == '-')
       }
     if (tmplong > 10000L)
       {
-      fprintf(stderr, "Unreasonably long wait of %d seconds requested\n",
+      fprintf(stderr, "Unreasonably long wait of %ld seconds requested\n",
         tmplong);
       exit(1);
       }
     if (tmplong < 0L)
       {
-      fprintf(stderr, "Timeout must not be negative (%d)\n", tmplong);
+      fprintf(stderr, "Timeout must not be negative (%ld)\n", tmplong);
       exit(1);
       }
     timeout = (int) tmplong;
diff --git a/test/src/fd.c b/test/src/fd.c
index 12a8dbc48..2dc12c6a7 100644
--- a/test/src/fd.c
+++ b/test/src/fd.c
@@ -50,7 +50,8 @@ if (filter)
   {
   int len;
   while ((len = read(0, buffer, sizeof(buffer))) > 0)
-    write(1, buffer, len);
+    if (write(1, buffer, len) < 0)
+	exit(1);
   }
 
 p += sprintf(p, "max fd = %d\n", (int)mac_maxfd);