Module Name: src
Committed By: christos
Date: Fri Apr 5 20:09:29 UTC 2019
Modified Files:
src/sys/lib/libsa: bootp.c ext2fs.c loadfile.c rarp.c rpc.c
Log Message:
Go back ot using 0x%x instead of %#x because we don't always support the
format. See subr_prf.c
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/lib/libsa/bootp.c
cvs rdiff -u -r1.26 -r1.27 src/sys/lib/libsa/ext2fs.c
cvs rdiff -u -r1.31 -r1.32 src/sys/lib/libsa/loadfile.c
cvs rdiff -u -r1.33 -r1.34 src/sys/lib/libsa/rarp.c
cvs rdiff -u -r1.30 -r1.31 src/sys/lib/libsa/rpc.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/lib/libsa/bootp.c
diff -u src/sys/lib/libsa/bootp.c:1.42 src/sys/lib/libsa/bootp.c:1.43
--- src/sys/lib/libsa/bootp.c:1.42 Sun Mar 31 16:08:45 2019
+++ src/sys/lib/libsa/bootp.c Fri Apr 5 16:09:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bootp.c,v 1.42 2019/03/31 20:08:45 christos Exp $ */
+/* $NetBSD: bootp.c,v 1.43 2019/04/05 20:09:29 christos Exp $ */
/*
* Copyright (c) 1992 Regents of the University of California.
@@ -323,7 +323,7 @@ bootprecv(struct iodesc *d, void *pkt, s
if (bp->bp_xid != htonl(d->xid)) {
#ifdef BOOTP_DEBUG
if (debug) {
- printf("%s: expected xid %#lx, got %#x\n", __func__,
+ printf("%s: expected xid 0x%lx, got 0x%x\n", __func__,
d->xid, ntohl(bp->bp_xid));
}
#endif
Index: src/sys/lib/libsa/ext2fs.c
diff -u src/sys/lib/libsa/ext2fs.c:1.26 src/sys/lib/libsa/ext2fs.c:1.27
--- src/sys/lib/libsa/ext2fs.c:1.26 Sun Mar 31 16:08:45 2019
+++ src/sys/lib/libsa/ext2fs.c Fri Apr 5 16:09:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs.c,v 1.26 2019/03/31 20:08:45 christos Exp $ */
+/* $NetBSD: ext2fs.c,v 1.27 2019/04/05 20:09:29 christos Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer.
@@ -992,7 +992,7 @@ dump_sblock(struct m_ext2fs *fs)
printf("fs->e2fs.e2fs_log_bsize = %u\n", fs->e2fs.e2fs_log_bsize);
printf("fs->e2fs.e2fs_bpg = %u\n", fs->e2fs.e2fs_bpg);
printf("fs->e2fs.e2fs_ipg = %u\n", fs->e2fs.e2fs_ipg);
- printf("fs->e2fs.e2fs_magic = %#x\n", fs->e2fs.e2fs_magic);
+ printf("fs->e2fs.e2fs_magic = 0x%x\n", fs->e2fs.e2fs_magic);
printf("fs->e2fs.e2fs_rev = %u\n", fs->e2fs.e2fs_rev);
if (fs->e2fs.e2fs_rev == E2FS_REV1) {
Index: src/sys/lib/libsa/loadfile.c
diff -u src/sys/lib/libsa/loadfile.c:1.31 src/sys/lib/libsa/loadfile.c:1.32
--- src/sys/lib/libsa/loadfile.c:1.31 Sun Mar 31 16:08:45 2019
+++ src/sys/lib/libsa/loadfile.c Fri Apr 5 16:09:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile.c,v 1.31 2019/03/31 20:08:45 christos Exp $ */
+/* $NetBSD: loadfile.c,v 1.32 2019/04/05 20:09:29 christos Exp $ */
/*-
* Copyright (c) 1997, 2008 The NetBSD Foundation, Inc.
@@ -185,7 +185,7 @@ fdloadfile(int fd, u_long *marks, int fl
if (rval == 0) {
if ((flags & LOAD_ALL) != 0)
- PROGRESS(("=%#lx\n",
+ PROGRESS(("=0x%lx\n",
marks[MARK_END] - marks[MARK_START]));
return 0;
}
Index: src/sys/lib/libsa/rarp.c
diff -u src/sys/lib/libsa/rarp.c:1.33 src/sys/lib/libsa/rarp.c:1.34
--- src/sys/lib/libsa/rarp.c:1.33 Sun Mar 31 16:08:45 2019
+++ src/sys/lib/libsa/rarp.c Fri Apr 5 16:09:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rarp.c,v 1.33 2019/03/31 20:08:45 christos Exp $ */
+/* $NetBSD: rarp.c,v 1.34 2019/04/05 20:09:29 christos Exp $ */
/*
* Copyright (c) 1992 Regents of the University of California.
@@ -196,7 +196,7 @@ rarprecv(struct iodesc *d, void *pkt, si
if (etype != ETHERTYPE_REVARP) {
#ifdef RARP_DEBUG
if (debug)
- printf("bad type=%#x\n", etype);
+ printf("bad type=0x%x\n", etype);
#endif
return -1;
}
@@ -217,7 +217,7 @@ rarprecv(struct iodesc *d, void *pkt, si
if (ap->arp_op != htons(ARPOP_REVREPLY)) {
#ifdef RARP_DEBUG
if (debug)
- printf("bad op=%#x\n", ntohs(ap->arp_op));
+ printf("bad op=0x%x\n", ntohs(ap->arp_op));
#endif
return -1;
}
Index: src/sys/lib/libsa/rpc.c
diff -u src/sys/lib/libsa/rpc.c:1.30 src/sys/lib/libsa/rpc.c:1.31
--- src/sys/lib/libsa/rpc.c:1.30 Sun Mar 31 16:08:45 2019
+++ src/sys/lib/libsa/rpc.c Fri Apr 5 16:09:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rpc.c,v 1.30 2019/03/31 20:08:45 christos Exp $ */
+/* $NetBSD: rpc.c,v 1.31 2019/04/05 20:09:29 christos Exp $ */
/*
* Copyright (c) 1992 Regents of the University of California.
@@ -127,7 +127,7 @@ rpc_call(struct iodesc *d, n_long prog,
#ifdef RPC_DEBUG
if (debug)
- printf("%s: prog=%#x vers=%d proc=%d\n", __func__,
+ printf("%s: prog=0x%x vers=%d proc=%d\n", __func__,
prog, vers, proc);
#endif
@@ -408,7 +408,7 @@ rpc_getport(struct iodesc *d, n_long pro
#ifdef RPC_DEBUG
if (debug)
- printf("%s: prog=%#x vers=%d\n", __func__, prog, vers);
+ printf("%s: prog=0x%x vers=%d\n", __func__, prog, vers);
#endif
/* This one is fixed forever. */
