Module Name: src
Committed By: skrll
Date: Wed Jan 15 21:52:13 UTC 2014
Modified Files:
src/sys/arch/hp700/stand/boot: boot.c
src/sys/arch/hp700/stand/common: itecons.c lif.c
Log Message:
Fix various DEBUG option builds
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hp700/stand/boot/boot.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hp700/stand/common/itecons.c \
src/sys/arch/hp700/stand/common/lif.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/arch/hp700/stand/boot/boot.c
diff -u src/sys/arch/hp700/stand/boot/boot.c:1.12 src/sys/arch/hp700/stand/boot/boot.c:1.13
--- src/sys/arch/hp700/stand/boot/boot.c:1.12 Sat Jan 22 19:19:17 2011
+++ src/sys/arch/hp700/stand/boot/boot.c Wed Jan 15 21:52:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.12 2011/01/22 19:19:17 joerg Exp $ */
+/* $NetBSD: boot.c,v 1.13 2014/01/15 21:52:13 skrll Exp $ */
/*-
* Copyright (c) 1982, 1986, 1990, 1993
@@ -231,7 +231,7 @@ exec_hp700(char *file, u_long loadaddr,
marks[MARK_START] = loadaddr;
#ifdef EXEC_DEBUG
- printf("file=%s loadaddr=%x howto=%x\n",
+ printf("file=%s loadaddr=%lx howto=%x\n",
file, loadaddr, boot_howto);
#endif
if ((fd = loadfile(file, marks, LOAD_KERNEL)) == -1)
@@ -244,7 +244,7 @@ exec_hp700(char *file, u_long loadaddr,
#ifdef EXEC_DEBUG
if (debug) {
- printf("ep=0x%x [", marks[MARK_ENTRY]);
+ printf("ep=0x%lx [", marks[MARK_ENTRY]);
for (i = 0; i < 10240; i++) {
if (!(i % 8)) {
printf("\b\n%p:", &((u_int *)marks[MARK_ENTRY])[i]);
Index: src/sys/arch/hp700/stand/common/itecons.c
diff -u src/sys/arch/hp700/stand/common/itecons.c:1.10 src/sys/arch/hp700/stand/common/itecons.c:1.11
--- src/sys/arch/hp700/stand/common/itecons.c:1.10 Thu Nov 14 13:01:26 2013
+++ src/sys/arch/hp700/stand/common/itecons.c Wed Jan 15 21:52:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: itecons.c,v 1.10 2013/11/14 13:01:26 skrll Exp $ */
+/* $NetBSD: itecons.c,v 1.11 2014/01/15 21:52:13 skrll Exp $ */
/* $OpenBSD: itecons.c,v 1.6 1999/04/20 20:01:02 mickey Exp $ */
@@ -189,7 +189,7 @@ ite_getc(dev_t dev)
if (!i-- && (dev & 0x80) && l == 0) {
#ifdef DEBUG
if (debug > 2)
- printf("ite_getc(0x%x): no char %d(%x)\n",
+ printf("ite_getc(%llx): no char %d(%x)\n",
dev, l, c);
#endif
return (0);
Index: src/sys/arch/hp700/stand/common/lif.c
diff -u src/sys/arch/hp700/stand/common/lif.c:1.10 src/sys/arch/hp700/stand/common/lif.c:1.11
--- src/sys/arch/hp700/stand/common/lif.c:1.10 Tue Nov 3 05:07:26 2009
+++ src/sys/arch/hp700/stand/common/lif.c Wed Jan 15 21:52:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: lif.c,v 1.10 2009/11/03 05:07:26 snj Exp $ */
+/* $NetBSD: lif.c,v 1.11 2014/01/15 21:52:13 skrll Exp $ */
/* $OpenBSD: lif.c,v 1.7 2001/06/09 03:54:41 mickey Exp $ */
@@ -167,7 +167,7 @@ lif_read(struct open_file *f, void *buf,
#ifdef LIFDEBUG
if (debug)
- printf("lif_read(%p, %p, %u, %p)\n", f, buf, size, resid);
+ printf("lif_read(%p, %p, %zu, %p)\n", f, buf, size, resid);
#endif
for (p = bbuf; size; fp->f_seek += bsize, p += bsize) {
