Wed Mar 4 13:34:49 2015 UTC ()

PR/49716: Henning Petersen: Use false and true on bool, fix sign in printf
formats.


(christos)

diff -r1.7 -r1.8 src/usr.bin/midirecord/midirecord.c

--- src/usr.bin/midirecord/midirecord.c 2015/03/01 09:56:54	1.7
+++ src/usr.bin/midirecord/midirecord.c 2015/03/04 13:34:49	1.8

 @@ -1,14 +1,14 @@
-/*	$NetBSD: midirecord.c,v 1.7 2015/03/01 09:56:54 mrg Exp $	*/
+/*	$NetBSD: midirecord.c,v 1.8 2015/03/04 13:34:49 christos Exp $	*/
 /*
  * Copyright (c) 2014 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -23,27 +23,27 @@
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * midirecord(1), similar to audiorecord(1).
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: midirecord.c,v 1.7 2015/03/01 09:56:54 mrg Exp $");
+__RCSID("$NetBSD: midirecord.c,v 1.8 2015/03/04 13:34:49 christos Exp $");
 #endif
 #include <sys/param.h>
 #include <sys/midiio.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <sys/uio.h>
 #include <err.h>
 #include <errno.h>
 #include <ctype.h>
 #include <fcntl.h>
 #include <paths.h>
 @@ -112,27 +112,27 @@ main(int argc, char *argv[])
 		switch (ch) {
 		case 'a':
 			aflag++;
 			break;
 		case 'B':
 			bufsize = strsuftoll("read buffer size", optarg,
 , UINT_MAX);
 			break;
 		case 'c':
 			parse_ints(optarg, &filt_chans, &num_filt_chans,
 			    "channels");
 			break;
 		case 'D':
-			debug++;
+			debug = true;
 			break;
 		case 'd':
 			parse_ints(optarg, &filt_devnos, &num_filt_devnos,
 			    "devices");
 			break;
 		case 'f':
 			midi_device = optarg;
 			ignore_timer_fail = true;
 			break;
 		case 'n':
 			decode_uint(optarg, &notes_per_beat);
 			break;
 		case 'o':
 @@ -227,27 +227,27 @@ main(int argc, char *argv[])
 	/* set the tempo */
 	if (ioctl(midifd, SEQUENCER_TMR_TEMPO, &tempo) < 0) {
 		if (ignore_timer_fail)
 			warn("SEQUENCER_TMR_TIMEBASE: tempo %d", tempo);
 		else
 			err(1, "SEQUENCER_TMR_TIMEBASE: tempo %d", tempo);
+	}
 	signal(SIGINT, cleanup);
 	data_size = 0;
 	if (verbose)
-		fprintf(stderr, "tempo=%d notes_per_beat=%d\n",
+		fprintf(stderr, "tempo=%d notes_per_beat=%u\n",
 		   tempo, notes_per_beat);
 	if (!no_time_limit && verbose)
 		fprintf(stderr, "recording for %lu seconds, %lu microseconds\n",
 		    (u_long)record_time.tv_sec, (u_long)record_time.tv_usec);
 	/* Create a midi header. */
 	write_midi_header();
 	(void)gettimeofday(&start_time, NULL);
 	while (no_time_limit || timeleft(&start_time, &record_time)) {
 		seq_event_t e;
 		size_t wrsize;
 @@ -272,27 +272,27 @@ main(int argc, char *argv[])
 			data_size += wrsize;
+		}
+	}
 	cleanup(0);
+}
 static void
 debug_log(const char *file, size_t line, const char *fmt, ...)
+{
 	va_list ap;
 	if (!debug)
 		return;
-	fprintf(stderr, "%s:%zd: ", file, line);
+	fprintf(stderr, "%s:%zu: ", file, line);
 	va_start(ap, fmt);
 	vfprintf(stderr, fmt, ap);
 	va_end(ap);
 	fprintf(stderr, "\n");
+}
 #define LOG(fmt...) \
 	debug_log(__func__, __LINE__, fmt)
 /*
  * handle a SEQ_LOCAL event.  NetBSD /dev/music doesn't generate these.
  */