Module Name: src Committed By: rin Date: Mon Feb 24 12:20:30 UTC 2020
Modified Files: src/lib/libcurses: fileio.c refresh.c src/sys/arch/amiga/dev: if_bah_zbus.c src/sys/arch/arm/footbridge: footbridge_pci.c src/sys/arch/emips/ebus: ace_ebus.c src/sys/arch/rs6000/stand/boot: boot.c src/sys/arch/xen/x86: cpu.c src/sys/dev/isa: mcd.c src/sys/dev/pci: if_ena.c if_sk.c src/sys/dev/pci/igma: igmafb.c src/sys/net80211: ieee80211_node.c src/sys/uvm/pmap: pmap_segtab.c src/tests/lib/libc/sys: t_mincore.c Log Message: 0x%p --> %p for non-external codes. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/lib/libcurses/fileio.c cvs rdiff -u -r1.111 -r1.112 src/lib/libcurses/refresh.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/amiga/dev/if_bah_zbus.c cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/footbridge/footbridge_pci.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/emips/ebus/ace_ebus.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/rs6000/stand/boot/boot.c cvs rdiff -u -r1.132 -r1.133 src/sys/arch/xen/x86/cpu.c cvs rdiff -u -r1.119 -r1.120 src/sys/dev/isa/mcd.c cvs rdiff -u -r1.22 -r1.23 src/sys/dev/pci/if_ena.c cvs rdiff -u -r1.104 -r1.105 src/sys/dev/pci/if_sk.c cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/igma/igmafb.c cvs rdiff -u -r1.79 -r1.80 src/sys/net80211/ieee80211_node.c cvs rdiff -u -r1.13 -r1.14 src/sys/uvm/pmap/pmap_segtab.c cvs rdiff -u -r1.14 -r1.15 src/tests/lib/libc/sys/t_mincore.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/lib/libcurses/fileio.c diff -u src/lib/libcurses/fileio.c:1.6 src/lib/libcurses/fileio.c:1.7 --- src/lib/libcurses/fileio.c:1.6 Tue Oct 2 17:35:44 2018 +++ src/lib/libcurses/fileio.c Mon Feb 24 12:20:29 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: fileio.c,v 1.6 2018/10/02 17:35:44 roy Exp $ */ +/* $NetBSD: fileio.c,v 1.7 2020/02/24 12:20:29 rin Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: fileio.c,v 1.6 2018/10/02 17:35:44 roy Exp $"); +__RCSID("$NetBSD: fileio.c,v 1.7 2020/02/24 12:20:29 rin Exp $"); #endif /* not lint */ #include "curses.h" @@ -236,7 +236,7 @@ getwin(FILE *fp) __touchline(win, y, 0, (int) win->maxx - 1); } #ifdef DEBUG - __CTRACE(__CTRACE_FILEIO, "getwin: win = 0x%p\n", win); + __CTRACE(__CTRACE_FILEIO, "getwin: win = %p\n", win); #endif return win; Index: src/lib/libcurses/refresh.c diff -u src/lib/libcurses/refresh.c:1.111 src/lib/libcurses/refresh.c:1.112 --- src/lib/libcurses/refresh.c:1.111 Sun Jun 9 07:40:14 2019 +++ src/lib/libcurses/refresh.c Mon Feb 24 12:20:29 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: refresh.c,v 1.111 2019/06/09 07:40:14 blymn Exp $ */ +/* $NetBSD: refresh.c,v 1.112 2020/02/24 12:20:29 rin Exp $ */ /* * Copyright (c) 1981, 1993, 1994 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)refresh.c 8.7 (Berkeley) 8/13/94"; #else -__RCSID("$NetBSD: refresh.c,v 1.111 2019/06/09 07:40:14 blymn Exp $"); +__RCSID("$NetBSD: refresh.c,v 1.112 2020/02/24 12:20:29 rin Exp $"); #endif #endif /* not lint */ @@ -1436,7 +1436,7 @@ domvcur(WINDOW *win, int oy, int ox, int { #ifdef DEBUG - __CTRACE(__CTRACE_REFRESH, "domvcur: (%d,%d)=>(%d,%d) win 0x%p\n", + __CTRACE(__CTRACE_REFRESH, "domvcur: (%d,%d)=>(%d,%d) win %p\n", oy, ox, ny, nx, win ); #endif /* DEBUG */ Index: src/sys/arch/amiga/dev/if_bah_zbus.c diff -u src/sys/arch/amiga/dev/if_bah_zbus.c:1.17 src/sys/arch/amiga/dev/if_bah_zbus.c:1.18 --- src/sys/arch/amiga/dev/if_bah_zbus.c:1.17 Mon Oct 23 09:21:40 2017 +++ src/sys/arch/amiga/dev/if_bah_zbus.c Mon Feb 24 12:20:29 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: if_bah_zbus.c,v 1.17 2017/10/23 09:21:40 msaitoh Exp $ */ +/* $NetBSD: if_bah_zbus.c,v 1.18 2020/02/24 12:20:29 rin Exp $ */ /*- * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ #endif #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_bah_zbus.c,v 1.17 2017/10/23 09:21:40 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_bah_zbus.c,v 1.18 2020/02/24 12:20:29 rin Exp $"); /* * Driver frontend for the Commodore Busines Machines and the @@ -102,7 +102,7 @@ bah_zbus_attach(device_t parent, device_ sc->sc_dev = self; #if (defined(BAH_DEBUG) && (BAH_DEBUG > 2)) - printf("\n%s: attach(0x%p, 0x%p, 0x%p)\n", + printf("\n%s: attach(%p, %p, %p)\n", device_xname(self), parent, self, aux); #endif bsc->sc_bst.base = (bus_addr_t)zap->va; Index: src/sys/arch/arm/footbridge/footbridge_pci.c diff -u src/sys/arch/arm/footbridge/footbridge_pci.c:1.31 src/sys/arch/arm/footbridge/footbridge_pci.c:1.32 --- src/sys/arch/arm/footbridge/footbridge_pci.c:1.31 Sat Nov 17 01:45:25 2018 +++ src/sys/arch/arm/footbridge/footbridge_pci.c Mon Feb 24 12:20:29 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: footbridge_pci.c,v 1.31 2018/11/17 01:45:25 rjs Exp $ */ +/* $NetBSD: footbridge_pci.c,v 1.32 2020/02/24 12:20:29 rin Exp $ */ /* * Copyright (c) 1997,1998 Mark Brinicombe. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: footbridge_pci.c,v 1.31 2018/11/17 01:45:25 rjs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: footbridge_pci.c,v 1.32 2020/02/24 12:20:29 rin Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -370,7 +370,7 @@ void footbridge_pci_intr_disestablish(void *pcv, void *cookie) { #ifdef PCI_DEBUG - printf("footbridge_pci_intr_disestablish(pcv=%p, cookie=0x%p)\n", + printf("footbridge_pci_intr_disestablish(pcv=%p, cookie=%p)\n", pcv, cookie); #endif /* XXXX Need to free the string */ Index: src/sys/arch/emips/ebus/ace_ebus.c diff -u src/sys/arch/emips/ebus/ace_ebus.c:1.22 src/sys/arch/emips/ebus/ace_ebus.c:1.23 --- src/sys/arch/emips/ebus/ace_ebus.c:1.22 Sat Dec 14 02:58:19 2019 +++ src/sys/arch/emips/ebus/ace_ebus.c Mon Feb 24 12:20:29 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ace_ebus.c,v 1.22 2019/12/14 02:58:19 tsutsui Exp $ */ +/* $NetBSD: ace_ebus.c,v 1.23 2020/02/24 12:20:29 rin Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ace_ebus.c,v 1.22 2019/12/14 02:58:19 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ace_ebus.c,v 1.23 2020/02/24 12:20:29 rin Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -2393,7 +2393,7 @@ acedump(dev_t dev, daddr_t blkno, void * } #else /* ACE_DUMP_NOT_TRUSTED */ /* Let's just talk about this first... */ - device_printf(ace->sc_dev, ": dump addr 0x%p, size %zu blkno %llx\n", + device_printf(ace->sc_dev, ": dump addr %p, size %zu blkno %llx\n", va, size, blkno); DELAY(500 * 1000); /* half a second */ err = 0; Index: src/sys/arch/rs6000/stand/boot/boot.c diff -u src/sys/arch/rs6000/stand/boot/boot.c:1.5 src/sys/arch/rs6000/stand/boot/boot.c:1.6 --- src/sys/arch/rs6000/stand/boot/boot.c:1.5 Sat Jan 22 19:19:22 2011 +++ src/sys/arch/rs6000/stand/boot/boot.c Mon Feb 24 12:20:29 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: boot.c,v 1.5 2011/01/22 19:19:22 joerg Exp $ */ +/* $NetBSD: boot.c,v 1.6 2020/02/24 12:20:29 rin Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -169,7 +169,7 @@ boot(void *iplcb_p, void *extiplcb_p) printf("\n"); //setled(0x31100000); /* we have the console */ - printf("IPLCB ptr = 0x%p\n", iplcb_p); + printf("IPLCB ptr = %p\n", iplcb_p); infop = (struct ipl_info *)((char *)iplcb_p + dirp->iplinfo_off); printf("Machine model = 0x%x\n", infop->model); Index: src/sys/arch/xen/x86/cpu.c diff -u src/sys/arch/xen/x86/cpu.c:1.132 src/sys/arch/xen/x86/cpu.c:1.133 --- src/sys/arch/xen/x86/cpu.c:1.132 Mon Jan 13 20:15:01 2020 +++ src/sys/arch/xen/x86/cpu.c Mon Feb 24 12:20:29 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.132 2020/01/13 20:15:01 bouyer Exp $ */ +/* $NetBSD: cpu.c,v 1.133 2020/02/24 12:20:29 rin Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.132 2020/01/13 20:15:01 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.133 2020/02/24 12:20:29 rin Exp $"); #include "opt_ddb.h" #include "opt_multiprocessor.h" @@ -505,7 +505,7 @@ cpu_attach_common(device_t parent, devic struct pcb *pcb = lwp_getpcb(l); aprint_verbose_dev(self, - "idle lwp at %p, idle sp at 0x%p\n", + "idle lwp at %p, idle sp at %p\n", l, #ifdef i386 (void *)pcb->pcb_esp Index: src/sys/dev/isa/mcd.c diff -u src/sys/dev/isa/mcd.c:1.119 src/sys/dev/isa/mcd.c:1.120 --- src/sys/dev/isa/mcd.c:1.119 Tue Nov 12 13:17:44 2019 +++ src/sys/dev/isa/mcd.c Mon Feb 24 12:20:29 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: mcd.c,v 1.119 2019/11/12 13:17:44 msaitoh Exp $ */ +/* $NetBSD: mcd.c,v 1.120 2020/02/24 12:20:29 rin Exp $ */ /* * Copyright (c) 1993, 1994, 1995 Charles M. Hannum. All rights reserved. @@ -56,7 +56,7 @@ /*static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";*/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mcd.c,v 1.119 2019/11/12 13:17:44 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mcd.c,v 1.120 2020/02/24 12:20:29 rin Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -453,7 +453,7 @@ mcdstrategy(struct buf *bp) lp = sc->sc_dk.dk_label; /* Test validity. */ - MCD_TRACE("strategy: buf=0x%p blkno=%d bcount=%d\n", bp, + MCD_TRACE("strategy: buf=%p blkno=%d bcount=%d\n", bp, (int) bp->b_blkno, bp->b_bcount); if (bp->b_blkno < 0 || (bp->b_bcount % sc->blksize) != 0) { @@ -523,7 +523,7 @@ loop: } /* Block found to process. */ - MCD_TRACE("start: found block bp=0x%p\n", bp); + MCD_TRACE("start: found block bp=%p\n", bp); splx(s); /* Changed media? */ @@ -1214,7 +1214,7 @@ mcdintr(void *arg) sc->lastmode = mbx->mode; firstblock: - MCD_TRACE("doread: read blkno=%d for bp=0x%p\n", + MCD_TRACE("doread: read blkno=%d for bp=%p\n", (int) mbx->blkno, bp); /* Build parameter block. */ Index: src/sys/dev/pci/if_ena.c diff -u src/sys/dev/pci/if_ena.c:1.22 src/sys/dev/pci/if_ena.c:1.23 --- src/sys/dev/pci/if_ena.c:1.22 Fri Feb 7 00:04:28 2020 +++ src/sys/dev/pci/if_ena.c Mon Feb 24 12:20:30 2020 @@ -31,7 +31,7 @@ #if 0 __FBSDID("$FreeBSD: head/sys/dev/ena/ena.c 333456 2018-05-10 09:37:54Z mw $"); #endif -__KERNEL_RCSID(0, "$NetBSD: if_ena.c,v 1.22 2020/02/07 00:04:28 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ena.c,v 1.23 2020/02/24 12:20:30 rin Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1561,7 +1561,7 @@ ena_rx_mbuf(struct ena_ring *rx_ring, st ena_rx_hash_mbuf(rx_ring, ena_rx_ctx, mbuf); #endif - ena_trace(ENA_DBG | ENA_RXPTH, "rx mbuf 0x%p, flags=0x%x, len: %d", + ena_trace(ENA_DBG | ENA_RXPTH, "rx mbuf %p, flags=0x%x, len: %d", mbuf, mbuf->m_flags, mbuf->m_pkthdr.len); /* DMA address is not needed anymore, unmap it */ Index: src/sys/dev/pci/if_sk.c diff -u src/sys/dev/pci/if_sk.c:1.104 src/sys/dev/pci/if_sk.c:1.105 --- src/sys/dev/pci/if_sk.c:1.104 Thu Jan 30 06:03:34 2020 +++ src/sys/dev/pci/if_sk.c Mon Feb 24 12:20:30 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: if_sk.c,v 1.104 2020/01/30 06:03:34 thorpej Exp $ */ +/* $NetBSD: if_sk.c,v 1.105 2020/02/24 12:20:30 rin Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -115,7 +115,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.104 2020/01/30 06:03:34 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.105 2020/02/24 12:20:30 rin Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -864,7 +864,7 @@ sk_alloc_jumbo_mem(struct sk_if_softc *s state = 4; sc_if->sk_cdata.sk_jumbo_buf = (void *)kva; - DPRINTFN(1,("sk_jumbo_buf = 0x%p\n", sc_if->sk_cdata.sk_jumbo_buf)); + DPRINTFN(1,("sk_jumbo_buf = %p\n", sc_if->sk_cdata.sk_jumbo_buf)); LIST_INIT(&sc_if->sk_jfree_listhead); LIST_INIT(&sc_if->sk_jinuse_listhead); Index: src/sys/dev/pci/igma/igmafb.c diff -u src/sys/dev/pci/igma/igmafb.c:1.1 src/sys/dev/pci/igma/igmafb.c:1.2 --- src/sys/dev/pci/igma/igmafb.c:1.1 Tue Jan 21 14:52:07 2014 +++ src/sys/dev/pci/igma/igmafb.c Mon Feb 24 12:20:30 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: igmafb.c,v 1.1 2014/01/21 14:52:07 mlelstv Exp $ */ +/* $NetBSD: igmafb.c,v 1.2 2020/02/24 12:20:30 rin Exp $ */ /* * Copyright (c) 2012 Michael van Elst @@ -21,7 +21,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: igmafb.c,v 1.1 2014/01/21 14:52:07 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: igmafb.c,v 1.2 2020/02/24 12:20:30 rin Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -144,7 +144,7 @@ igmafb_attach(device_t parent, device_t aprint_normal("%s: %d x %d, %d bit, stride %d\n", device_xname(self), sc->sc_width, sc->sc_height, sc->sc_depth, sc->sc_stride); - aprint_normal("%s: %d MB video memory at 0x%p\n", device_xname(self), + aprint_normal("%s: %d MB video memory at %p\n", device_xname(self), (int)sc->sc_fbsize >> 20, (void *)sc->sc_chip.gmb); sc->sc_vga_save = kmem_alloc(256*1024, KM_SLEEP); Index: src/sys/net80211/ieee80211_node.c diff -u src/sys/net80211/ieee80211_node.c:1.79 src/sys/net80211/ieee80211_node.c:1.80 --- src/sys/net80211/ieee80211_node.c:1.79 Fri Dec 27 09:25:58 2019 +++ src/sys/net80211/ieee80211_node.c Mon Feb 24 12:20:30 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ieee80211_node.c,v 1.79 2019/12/27 09:25:58 msaitoh Exp $ */ +/* $NetBSD: ieee80211_node.c,v 1.80 2020/02/24 12:20:30 rin Exp $ */ /* * Copyright (c) 2001 Atsushi Onoe @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.65 2005/08/13 17:50:21 sam Exp $"); #endif #ifdef __NetBSD__ -__KERNEL_RCSID(0, "$NetBSD: ieee80211_node.c,v 1.79 2019/12/27 09:25:58 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ieee80211_node.c,v 1.80 2020/02/24 12:20:30 rin Exp $"); #endif #ifdef _KERNEL_OPT @@ -2136,7 +2136,7 @@ void ieee80211_dump_node(struct ieee80211_node_table *nt, struct ieee80211_node *ni) { - printf("0x%p: mac %s refcnt %d\n", ni, + printf("%p: mac %s refcnt %d\n", ni, ether_sprintf(ni->ni_macaddr), ieee80211_node_refcnt(ni)); printf("\tscangen %u authmode %u flags 0x%x\n", ni->ni_scangen, ni->ni_authmode, ni->ni_flags); Index: src/sys/uvm/pmap/pmap_segtab.c diff -u src/sys/uvm/pmap/pmap_segtab.c:1.13 src/sys/uvm/pmap/pmap_segtab.c:1.14 --- src/sys/uvm/pmap/pmap_segtab.c:1.13 Wed Dec 18 11:27:56 2019 +++ src/sys/uvm/pmap/pmap_segtab.c Mon Feb 24 12:20:30 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_segtab.c,v 1.13 2019/12/18 11:27:56 skrll Exp $ */ +/* $NetBSD: pmap_segtab.c,v 1.14 2020/02/24 12:20:30 rin Exp $ */ /*- * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap_segtab.c,v 1.13 2019/12/18 11:27:56 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap_segtab.c,v 1.14 2020/02/24 12:20:30 rin Exp $"); /* * Manages physical address maps. @@ -139,10 +139,10 @@ pmap_check_stp(pmap_segtab_t *stp, const if (stp->seg_tab[i] != 0) { #ifdef DEBUG_NOISY for (size_t j = i; j < PMAP_SEGTABSIZE; j++) - printf("%s: pm_segtab.seg_tab[%zu] = 0x%p\n", + printf("%s: pm_segtab.seg_tab[%zu] = %p\n", caller, j, stp->seg_tab[j]); #endif - panic("%s: pm_segtab.seg_tab[%zu] != 0 (0x%p): %s", + panic("%s: pm_segtab.seg_tab[%zu] != 0 (%p): %s", caller, i, stp->seg_tab[i], why); } } Index: src/tests/lib/libc/sys/t_mincore.c diff -u src/tests/lib/libc/sys/t_mincore.c:1.14 src/tests/lib/libc/sys/t_mincore.c:1.15 --- src/tests/lib/libc/sys/t_mincore.c:1.14 Sun Oct 8 08:29:57 2017 +++ src/tests/lib/libc/sys/t_mincore.c Mon Feb 24 12:20:30 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: t_mincore.c,v 1.14 2017/10/08 08:29:57 kre Exp $ */ +/* $NetBSD: t_mincore.c,v 1.15 2020/02/24 12:20:30 rin Exp $ */ /*- * Copyright (c) 2011 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__RCSID("$NetBSD: t_mincore.c,v 1.14 2017/10/08 08:29:57 kre Exp $"); +__RCSID("$NetBSD: t_mincore.c,v 1.15 2020/02/24 12:20:30 rin Exp $"); #include <sys/mman.h> #include <sys/stat.h> @@ -103,7 +103,7 @@ check_residency(void *addr, size_t npgs) resident++; #if 0 - (void)fprintf(stderr, "page 0x%p is %sresident\n", + (void)fprintf(stderr, "page %p is %sresident\n", (char *)addr + (i * page), vec[i] ? "" : "not "); #endif }