Thu Jul 8 15:21:40 2021 UTC ()

fix printf format strings


(christos)

diff -r1.1 -r1.2 src/tests/lib/libc/stdio/h_intr.c

--- src/tests/lib/libc/stdio/h_intr.c 2021/07/08 09:07:46	1.1
+++ src/tests/lib/libc/stdio/h_intr.c 2021/07/08 15:21:40	1.2

 @@ -1,41 +1,41 @@
-/*	$NetBSD: h_intr.c,v 1.1 2021/07/08 09:07:46 christos Exp $	*/
+/*	$NetBSD: h_intr.c,v 1.2 2021/07/08 15:21:40 christos Exp $	*/
 /**
  * Test of interrupted writes to popen()'ed commands.
+ *
  * Example 1:
  * ./h_fwrite -c "gzip -t" *.gz
+ *
  * Example 2:
  * while :; do ./h_fwrite -b $((12*1024)) -t 10 -c "bzip2 -t" *.bz2; sleep 2; done
+ *
  * Example 3:
  * Create checksum file:
  * find /mnt -type f -exec sha512 -n {} + >SHA512
+ *
  * Check program:
  * find /mnt -type f -exec ./h_fwrite -b 512 -c run.sh {} +
+ *
  * ./run.sh:
 	#!/bin/sh
 	set -eu
 	grep -q "^$(sha512 -q)" SHA512
+ *
  * Author: RVP at sdf.org
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: h_intr.c,v 1.1 2021/07/08 09:07:46 christos Exp $");
+__RCSID("$NetBSD: h_intr.c,v 1.2 2021/07/08 15:21:40 christos Exp $");
 #include <time.h>
 #include <err.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <libgen.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 static int process(const char *fn);
 @@ -134,27 +134,27 @@ process(const char *fn)
 	setvbuf(ofp, NULL, opts.btype, opts.ssize);
 	setvbuf(ifp, NULL, opts.btype, opts.ssize);
 	alarmtimer(opts.tmout);
 	while ((n = maxread(ifp, buf, opts.bsize)) > 0) {
 		ssize_t i;
 		if ((i = maxwrite(ofp, buf, n)) == -1) {
 			warn("write failed");
 			break;
+		}
 		nw += i;
+	}
 	alarmtimer(0);
-	// printf("%lu\n", nw);
+	// printf("%zu\n", nw);
 	fclose(ifp);
 	if (pclose(ofp) != 0)
 		warn("command failed `%s'", opts.cmd);
 	else
 		rc = EXIT_SUCCESS;
 	return rc;
+}
 /**
  * maxread - syscall version
  */
 @@ -331,31 +331,31 @@ getbtype(int val) {
+}
 /**
  * Print usage information.
  */
 static void
 usage(FILE* fp)
+{
 	fprintf(fp, "Usage: %s [-b SIZE] [-h] [-t TMOUT] -c CMD FILE...\n",
 	    getprogname());
 	fprintf(fp, "%s: Test interrupted writes to popen()ed CMD.\n",
 	    getprogname());
 	fprintf(fp, "\n");
-	fprintf(fp, "  -b SIZE   Buffer size (%lu)\n", opts.bsize);
+	fprintf(fp, "  -b SIZE   Buffer size (%zu)\n", opts.bsize);
 	fprintf(fp, "  -c CMD    Command to run on each FILE.\n");
 	fprintf(fp, "  -h        This message.\n");
 	fprintf(fp, "  -p        Buffering type %s.\n", getbtype(opts.btype));
-	fprintf(fp, "  -s SIZE   stdio buffer size (%lu)\n", opts.ssize);
+	fprintf(fp, "  -s SIZE   stdio buffer size (%zu)\n", opts.ssize);
 	fprintf(fp, "  -t TMOUT  Interrupt writing to CMD every (%d) ms\n",
 	    opts.tmout);
+}
 /**
  * Process program options.
  */
 static int
 do_opts(int argc, char *argv[])
+{
 	int opt;
 	int i;
 	size_t j;