Module Name: src
Committed By: jakllsch
Date: Tue Jul 27 14:34:34 UTC 2010
Modified Files:
src/sys/dev: midi.c rnd.c
src/sys/dev/ic: bha.c mb89352.c
src/sys/dev/isa: spkr.c
src/sys/dev/pci: trm.c twe.c
Log Message:
printf() size_t with 'z' format modifier in debug code.
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/sys/dev/midi.c
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/rnd.c
cvs rdiff -u -r1.72 -r1.73 src/sys/dev/ic/bha.c
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/ic/mb89352.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/isa/spkr.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/pci/trm.c
cvs rdiff -u -r1.90 -r1.91 src/sys/dev/pci/twe.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/midi.c
diff -u src/sys/dev/midi.c:1.71 src/sys/dev/midi.c:1.72
--- src/sys/dev/midi.c:1.71 Sun Dec 6 22:42:48 2009
+++ src/sys/dev/midi.c Tue Jul 27 14:34:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: midi.c,v 1.71 2009/12/06 22:42:48 dyoung Exp $ */
+/* $NetBSD: midi.c,v 1.72 2010/07/27 14:34:33 jakllsch Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.71 2009/12/06 22:42:48 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.72 2010/07/27 14:34:33 jakllsch Exp $");
#include "midi.h"
#include "sequencer.h"
@@ -1512,7 +1512,7 @@
#ifdef MIDI_DEBUG
if (error)
printf("midi_write:(1) uiomove failed %d; "
- "xfrcount=%d inp=%p\n",
+ "xfrcount=%zu inp=%p\n",
error, xfrcount, inp);
#endif
if ( error )
Index: src/sys/dev/rnd.c
diff -u src/sys/dev/rnd.c:1.77 src/sys/dev/rnd.c:1.78
--- src/sys/dev/rnd.c:1.77 Sun Nov 1 21:08:32 2009
+++ src/sys/dev/rnd.c Tue Jul 27 14:34:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rnd.c,v 1.77 2009/11/01 21:08:32 rmind Exp $ */
+/* $NetBSD: rnd.c,v 1.78 2010/07/27 14:34:33 jakllsch Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rnd.c,v 1.77 2009/11/01 21:08:32 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rnd.c,v 1.78 2010/07/27 14:34:33 jakllsch Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -370,7 +370,7 @@
int ret;
DPRINTF(RND_DEBUG_READ,
- ("Random: Read of %d requested, flags 0x%08x\n",
+ ("Random: Read of %zu requested, flags 0x%08x\n",
uio->uio_resid, ioflag));
if (uio->uio_resid == 0)
@@ -459,7 +459,7 @@
int n, ret;
DPRINTF(RND_DEBUG_WRITE,
- ("Random: Write of %d requested\n", uio->uio_resid));
+ ("Random: Write of %zu requested\n", uio->uio_resid));
if (uio->uio_resid == 0)
return (0);
Index: src/sys/dev/ic/bha.c
diff -u src/sys/dev/ic/bha.c:1.72 src/sys/dev/ic/bha.c:1.73
--- src/sys/dev/ic/bha.c:1.72 Mon Nov 23 02:13:46 2009
+++ src/sys/dev/ic/bha.c Tue Jul 27 14:34:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bha.c,v 1.72 2009/11/23 02:13:46 rmind Exp $ */
+/* $NetBSD: bha.c,v 1.73 2010/07/27 14:34:34 jakllsch Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bha.c,v 1.72 2009/11/23 02:13:46 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bha.c,v 1.73 2010/07/27 14:34:34 jakllsch Exp $");
#include "opt_ddb.h"
@@ -937,7 +937,7 @@
*/
if (i) {
#ifdef BHADEBUG
- printf("bha_find: board returned %d instead of %d to %s\n",
+ printf("bha_find: board returned %d instead of %zu to %s\n",
i, sizeof(inquire.reply), "INQUIRE_EXTENDED");
#endif
return (0);
Index: src/sys/dev/ic/mb89352.c
diff -u src/sys/dev/ic/mb89352.c:1.51 src/sys/dev/ic/mb89352.c:1.52
--- src/sys/dev/ic/mb89352.c:1.51 Mon Nov 23 02:13:46 2009
+++ src/sys/dev/ic/mb89352.c Tue Jul 27 14:34:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mb89352.c,v 1.51 2009/11/23 02:13:46 rmind Exp $ */
+/* $NetBSD: mb89352.c,v 1.52 2010/07/27 14:34:34 jakllsch Exp $ */
/* NecBSD: mb89352.c,v 1.4 1998/03/14 07:31:20 kmatsuda Exp */
/*-
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mb89352.c,v 1.51 2009/11/23 02:13:46 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mb89352.c,v 1.52 2010/07/27 14:34:34 jakllsch Exp $");
#ifdef DDB
#define integrate
@@ -1954,7 +1954,7 @@
case PH_DATAOUT:
if (sc->sc_state != SPC_CONNECTED)
break;
- SPC_MISC(("dataout dleft=%d ", sc->sc_dleft));
+ SPC_MISC(("dataout dleft=%zu ", sc->sc_dleft));
if (sc->sc_dma_start != NULL &&
sc->sc_dleft > SPC_MIN_DMA_LEN) {
(*sc->sc_dma_start)(sc, sc->sc_dp, sc->sc_dleft, 0);
Index: src/sys/dev/isa/spkr.c
diff -u src/sys/dev/isa/spkr.c:1.30 src/sys/dev/isa/spkr.c:1.31
--- src/sys/dev/isa/spkr.c:1.30 Wed Mar 18 10:22:40 2009
+++ src/sys/dev/isa/spkr.c Tue Jul 27 14:34:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr.c,v 1.30 2009/03/18 10:22:40 cegger Exp $ */
+/* $NetBSD: spkr.c,v 1.31 2010/07/27 14:34:34 jakllsch Exp $ */
/*
* Copyright (c) 1990 Eric S. Raymond ([email protected])
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.30 2009/03/18 10:22:40 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.31 2010/07/27 14:34:34 jakllsch Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -447,7 +447,7 @@
int n;
int error;
#ifdef SPKRDEBUG
- printf("spkrwrite: entering with dev = %"PRIx64", count = %d\n",
+ printf("spkrwrite: entering with dev = %"PRIx64", count = %zu\n",
dev, uio->uio_resid);
#endif /* SPKRDEBUG */
Index: src/sys/dev/pci/trm.c
diff -u src/sys/dev/pci/trm.c:1.30 src/sys/dev/pci/trm.c:1.31
--- src/sys/dev/pci/trm.c:1.30 Wed May 14 13:29:29 2008
+++ src/sys/dev/pci/trm.c Tue Jul 27 14:34:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: trm.c,v 1.30 2008/05/14 13:29:29 tsutsui Exp $ */
+/* $NetBSD: trm.c,v 1.31 2010/07/27 14:34:34 jakllsch Exp $ */
/*-
* Copyright (c) 2002 Izumi Tsutsui. All rights reserved.
*
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trm.c,v 1.30 2008/05/14 13:29:29 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trm.c,v 1.31 2010/07/27 14:34:34 jakllsch Exp $");
/* #define TRM_DEBUG */
#ifdef TRM_DEBUG
@@ -574,7 +574,7 @@
sc->sc_srb = malloc(sizeof(struct trm_srb) * TRM_MAX_SRB,
M_DEVBUF, M_NOWAIT|M_ZERO);
- DPRINTF(("all SRB size=%x\n", sizeof(struct trm_srb) * TRM_MAX_SRB));
+ DPRINTF(("all SRB size=%zx\n", sizeof(struct trm_srb) * TRM_MAX_SRB));
if (sc->sc_srb == NULL) {
aprint_error(": can not allocate SRB\n");
return 1;
Index: src/sys/dev/pci/twe.c
diff -u src/sys/dev/pci/twe.c:1.90 src/sys/dev/pci/twe.c:1.91
--- src/sys/dev/pci/twe.c:1.90 Tue May 12 08:23:01 2009
+++ src/sys/dev/pci/twe.c Tue Jul 27 14:34:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: twe.c,v 1.90 2009/05/12 08:23:01 cegger Exp $ */
+/* $NetBSD: twe.c,v 1.91 2010/07/27 14:34:34 jakllsch Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.90 2009/05/12 08:23:01 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.91 2010/07/27 14:34:34 jakllsch Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1762,7 +1762,7 @@
*/
if (tu->tu_size > TWE_SECTOR_SIZE) {
#ifdef TWE_DEBUG
- printf("%s: TWEIO_COMMAND: tu_size = %d\n",
+ printf("%s: TWEIO_COMMAND: tu_size = %zu\n",
device_xname(&twe->sc_dv), tu->tu_size);
#endif
return EINVAL;
