jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-03 10:29:15 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix -Wformat warnings from LINT kernel.

Browse Source
This commit is contained in:
Rodney W. Grimes 1995-05-11 19:26:53 +00:00
parent a51ab5ce3b
commit b2b795f07c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=8456
32 changed files with 113 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/amd64/amd64/autoconf.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
* $Id: autoconf.c,v 1.27 1995/04/25 03:41:12 phk Exp $
* $Id: autoconf.c,v 1.28 1995/05/11 02:50:11 wpaul Exp $
*/
/*
@ -118,7 +118,7 @@ find_cdrom_root()
for (j = 0 ; j < 2; j++)
for (k = 0 ; try_cdrom[k].name ; k++) {
rootdev = makedev(try_cdrom[k].major,j*8);
printf("trying rootdev=%x (%s%d)\n",
printf("trying rootdev=0x%lx (%s%d)\n",
rootdev, try_cdrom[k].name,j);
i = (*cd9660_mountroot)();
if (!i) return i;

8
sys/amd64/amd64/machdep.c
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
* $Id: machdep.c,v 1.123 1995/05/11 00:12:54 wollman Exp $
* $Id: machdep.c,v 1.124 1995/05/11 00:16:36 wollman Exp $
*/
#include "npx.h"
@ -532,7 +532,7 @@ identifycpu()
printf(" Id = 0x%lx",cpu_id);
if (!strcmp(cpu_vendor, "GenuineIntel")) {
printf(" Stepping=%d", cpu_id & 0xf);
printf(" Stepping=%ld", cpu_id & 0xf);
if (cpu_high > 0) {
#define FEATUREFMT "\020\001FPU\002VME\003PSE\004MCE\005CX8\006APIC"
printf("\n Features=0x%b", cpu_feature, FEATUREFMT);
@ -1361,10 +1361,10 @@ init386(first)
*/
if (bootinfo.bi_memsizes_valid) {
if (bootinfo.bi_basemem != biosbasemem)
printf("BIOS basemem (%dK) != RTC basemem (%dK)\n",
printf("BIOS basemem (%ldK) != RTC basemem (%dK)\n",
bootinfo.bi_basemem, biosbasemem);
if (bootinfo.bi_extmem != biosextmem)
printf("BIOS extmem (%dK) != RTC extmem (%dK)\n",
printf("BIOS extmem (%ldK) != RTC extmem (%dK)\n",
bootinfo.bi_extmem, biosextmem);
}

5
sys/amd64/amd64/pmap.c
View File

@ -39,7 +39,7 @@
* SUCH DAMAGE.
*
* from: @(#)pmap.c 7.7 (Berkeley) 5/12/91
* $Id: pmap.c,v 1.55 1995/03/30 08:55:39 davidg Exp $
* $Id: pmap.c,v 1.56 1995/04/09 05:40:38 davidg Exp $
*/
/*
@ -1180,7 +1180,8 @@ pmap_enter(pmap, va, pa, prot, wired)
* Page Directory table entry not valid, we need a new PT page
*/
if (*pmap_pde(pmap, va) == 0) {
printf("kernel page directory invalid pdir=0x%x, va=0x%x\n", pmap->pm_pdir[PTDPTDI], va);
printf("kernel page directory invalid pdir=%p, va=0x%lx\n",
pmap->pm_pdir[PTDPTDI], va);
panic("invalid kernel page directory");
}
pte = pmap_pte(pmap, va);

4
sys/dev/mcd/mcd.c
View File

@ -40,7 +40,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: mcd.c,v 1.41 1995/04/12 20:47:58 wollman Exp $
* $Id: mcd.c,v 1.42 1995/05/09 11:39:40 rgrimes Exp $
*/
static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
@ -1075,7 +1075,7 @@ nextblock:
blknum = (bp->b_blkno / (mbx->sz/DEV_BSIZE))
+ mbx->p_offset + mbx->skip/mbx->sz;
MCD_TRACE("mcd_doread: read blknum=%d for bp=0x%x\n",
MCD_TRACE("mcd_doread: read blknum=%d for bp=%p\n",
blknum, bp);
/* build parameter block */

4
sys/dev/sio/sio.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
* $Id: sio.c,v 1.96 1995/04/23 12:41:57 bde Exp $
* $Id: sio.c,v 1.97 1995/05/07 23:00:02 ache Exp $
*/
#include "sio.h"
@ -2329,7 +2329,7 @@ LoadSoftModem(int unit, int base_io, u_long size, u_char *ptr)
return 0;
error:
printf("sio%d: DSI SoftModem microcode load failed: <%s>\n",ptr);
printf("sio%d: DSI SoftModem microcode load failed: <%s>\n",unit,ptr);
outb(base_io+7,0x00); \
outb(base_io+3,data_0187); \
outb(base_io+4,data_0188); \

6
sys/fs/procfs/procfs_vnops.c
View File

@ -36,7 +36,7 @@
*
* @(#)procfs_vnops.c 8.6 (Berkeley) 2/7/94
*
* $Id: procfs_vnops.c,v 1.10 1995/04/15 02:50:13 davidg Exp $
* $Id: procfs_vnops.c,v 1.11 1995/04/15 03:20:31 davidg Exp $
*/
/*
@ -285,8 +285,8 @@ procfs_print(ap)
{
struct pfsnode *pfs = VTOPFS(ap->a_vp);
printf("tag VT_PROCFS, pid %lu, mode %x, flags %x\n",
(u_long)pfs->pfs_pid,
printf("tag VT_PROCFS, pid %lu, mode %x, flags %lx\n",
pfs->pfs_pid,
pfs->pfs_mode, pfs->pfs_flags);
return (0);
}

11
sys/gnu/i386/isa/nic3008.c
View File

@ -1,6 +1,6 @@
static char nic38_id[] = "@(#)$Id: nic3008.c,v 1.3 1995/03/19 14:28:35 davidg Exp $";
static char nic38_id[] = "@(#)$Id: nic3008.c,v 1.4 1995/03/28 07:54:31 bde Exp $";
/*******************************************************************************
* II - Version 0.1 $Revision: 1.3 $ $State: Exp $
* II - Version 0.1 $Revision: 1.4 $ $State: Exp $
*
* Copyright 1994 Dietmar Friede
*******************************************************************************
@ -10,6 +10,11 @@ static char nic38_id[] = "@(#)$Id: nic3008.c,v 1.3 1995/03/19 14:28:35 david
*
*******************************************************************************
* $Log: nic3008.c,v $
* Revision 1.4 1995/03/28 07:54:31 bde
* Add and move declarations to fix all of the warnings from `gcc -Wimplicit'
* (except in netccitt, netiso and netns) that I didn't notice when I fixed
* "all" such warnings before.
*
* Revision 1.3 1995/03/19 14:28:35 davidg
* Removed redundant newlines that were in some panic strings.
*
@ -133,7 +138,7 @@ nicprobe(struct isa_device * is)
if (cstrcmp(dpr->niccy_ver, "NICCY V ") == 0)
{
printf("NICCY NICCY-Card %d not found at %x\n"
printf("NICCY NICCY-Card %d not found at %p\n"
,is->id_unit, is->id_maddr);
return (0);
}

12
sys/gnu/i386/isa/nic3009.c
View File

@ -1,6 +1,6 @@
static char nic39_id[] = "@(#)$Id: nic3009.c,v 1.4 1995/02/16 08:06:21 jkh Exp $";
static char nic39_id[] = "@(#)$Id: nic3009.c,v 1.5 1995/03/28 07:54:33 bde Exp $";
/*******************************************************************************
* II - Version 0.1 $Revision: 1.4 $ $State: Exp $
* II - Version 0.1 $Revision: 1.5 $ $State: Exp $
*
* Copyright 1994 Dietmar Friede
*******************************************************************************
@ -10,6 +10,11 @@ static char nic39_id[] = "@(#)$Id: nic3009.c,v 1.4 1995/02/16 08:06:21 jkh E
*
*******************************************************************************
* $Log: nic3009.c,v $
* Revision 1.5 1995/03/28 07:54:33 bde
* Add and move declarations to fix all of the warnings from `gcc -Wimplicit'
* (except in netccitt, netiso and netns) that I didn't notice when I fixed
* "all" such warnings before.
*
* Revision 1.4 1995/02/16 08:06:21 jkh
* Fix a few bogons introduced when config lost the 3 char limitation.
*
@ -144,7 +149,8 @@ nnicprobe(struct isa_device * is)
for (i=0;i<DPR_LEN;i++)
if (w[i] != ((i+0xaf) & 0xff))
{
printf("Niccy card not found or bad memory %x\n",is->id_maddr);
printf("Niccy card not found or bad memory %p\n",
is->id_maddr);
outb(sc->sc_port, 0);
return(0);
}

9
sys/i386/eisa/aha1742.c
View File

@ -14,7 +14,7 @@
*
* commenced: Sun Sep 27 18:14:01 PDT 1992
*
* $Id: aha1742.c,v 1.31 1995/04/12 20:47:34 wollman Exp $
* $Id: aha1742.c,v 1.32 1995/05/09 12:25:50 rgrimes Exp $
*/
#include <sys/types.h>
@ -996,7 +996,7 @@ ahb_scsi_cmd(xs)
return (TRY_AGAIN_LATER);
}
cheat = ecb;
SC_DEBUG(xs->sc_link, SDEV_DB3, ("start ecb(%x)\n", ecb));
SC_DEBUG(xs->sc_link, SDEV_DB3, ("start ecb(%p)\n", ecb));
ecb->xs = xs;
/*
* If it's a reset, we need to do an 'immediate'
@ -1073,7 +1073,7 @@ ahb_scsi_cmd(xs)
*/
SC_DEBUG(xs->sc_link, SDEV_DB4,
("%d @0x%x:- ", xs->datalen, xs->data));
("%ld @%p:- ", xs->datalen, xs->data));
datalen = xs->datalen;
thiskv = (int) xs->data;
thisphys = KVTOPHYS(thiskv);
@ -1084,7 +1084,8 @@ ahb_scsi_cmd(xs)
/* put in the base address */
sg->addr = thisphys;
SC_DEBUGN(xs->sc_link, SDEV_DB4, ("0x%x", thisphys));
SC_DEBUGN(xs->sc_link, SDEV_DB4, ("0x%lx",
thisphys));
/* do it at least once */
nextphys = thisphys;

4
sys/i386/i386/autoconf.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
* $Id: autoconf.c,v 1.27 1995/04/25 03:41:12 phk Exp $
* $Id: autoconf.c,v 1.28 1995/05/11 02:50:11 wpaul Exp $
*/
/*
@ -118,7 +118,7 @@ find_cdrom_root()
for (j = 0 ; j < 2; j++)
for (k = 0 ; try_cdrom[k].name ; k++) {
rootdev = makedev(try_cdrom[k].major,j*8);
printf("trying rootdev=%x (%s%d)\n",
printf("trying rootdev=0x%lx (%s%d)\n",
rootdev, try_cdrom[k].name,j);
i = (*cd9660_mountroot)();
if (!i) return i;

8
sys/i386/i386/machdep.c
View File

@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
* $Id: machdep.c,v 1.123 1995/05/11 00:12:54 wollman Exp $
* $Id: machdep.c,v 1.124 1995/05/11 00:16:36 wollman Exp $
*/
#include "npx.h"
@ -532,7 +532,7 @@ identifycpu()
printf(" Id = 0x%lx",cpu_id);
if (!strcmp(cpu_vendor, "GenuineIntel")) {
printf(" Stepping=%d", cpu_id & 0xf);
printf(" Stepping=%ld", cpu_id & 0xf);
if (cpu_high > 0) {
#define FEATUREFMT "\020\001FPU\002VME\003PSE\004MCE\005CX8\006APIC"
printf("\n Features=0x%b", cpu_feature, FEATUREFMT);
@ -1361,10 +1361,10 @@ init386(first)
*/
if (bootinfo.bi_memsizes_valid) {
if (bootinfo.bi_basemem != biosbasemem)
printf("BIOS basemem (%dK) != RTC basemem (%dK)\n",
printf("BIOS basemem (%ldK) != RTC basemem (%dK)\n",
bootinfo.bi_basemem, biosbasemem);
if (bootinfo.bi_extmem != biosextmem)
printf("BIOS extmem (%dK) != RTC extmem (%dK)\n",
printf("BIOS extmem (%ldK) != RTC extmem (%dK)\n",
bootinfo.bi_extmem, biosextmem);
}

4
sys/i386/i386/math_emulate.c
View File

@ -6,7 +6,7 @@
* [expediant "port" of linux 8087 emulator to 386BSD, with apologies -wfj]
*
* from: 386BSD 0.1
* $Id: math_emulate.c,v 1.9 1994/05/25 08:54:14 rgrimes Exp $
* $Id: math_emulate.c,v 1.10 1994/09/15 10:58:35 davidg Exp $
*/
/*
@ -94,7 +94,7 @@ math_emulate(struct trapframe * info)
oldeip = info->tf_eip;
/* 0x001f means user code space */
if ((u_short)info->tf_cs != 0x001F) {
printf("math_emulate: %04x:%08x\n\r", (u_short)info->tf_cs,
printf("math_emulate: %04x:%08lx\n\r", (u_short)info->tf_cs,
oldeip);
panic("?Math emulation needed in kernel?");
}

5
sys/i386/i386/pmap.c
View File

@ -39,7 +39,7 @@
* SUCH DAMAGE.
*
* from: @(#)pmap.c 7.7 (Berkeley) 5/12/91
* $Id: pmap.c,v 1.55 1995/03/30 08:55:39 davidg Exp $
* $Id: pmap.c,v 1.56 1995/04/09 05:40:38 davidg Exp $
*/
/*
@ -1180,7 +1180,8 @@ pmap_enter(pmap, va, pa, prot, wired)
* Page Directory table entry not valid, we need a new PT page
*/
if (*pmap_pde(pmap, va) == 0) {
printf("kernel page directory invalid pdir=0x%x, va=0x%x\n", pmap->pm_pdir[PTDPTDI], va);
printf("kernel page directory invalid pdir=%p, va=0x%lx\n",
pmap->pm_pdir[PTDPTDI], va);
panic("invalid kernel page directory");
}
pte = pmap_pte(pmap, va);

9
sys/i386/isa/aha1742.c
View File

@ -14,7 +14,7 @@
*
* commenced: Sun Sep 27 18:14:01 PDT 1992
*
* $Id: aha1742.c,v 1.31 1995/04/12 20:47:34 wollman Exp $
* $Id: aha1742.c,v 1.32 1995/05/09 12:25:50 rgrimes Exp $
*/
#include <sys/types.h>
@ -996,7 +996,7 @@ ahb_scsi_cmd(xs)
return (TRY_AGAIN_LATER);
}
cheat = ecb;
SC_DEBUG(xs->sc_link, SDEV_DB3, ("start ecb(%x)\n", ecb));
SC_DEBUG(xs->sc_link, SDEV_DB3, ("start ecb(%p)\n", ecb));
ecb->xs = xs;
/*
* If it's a reset, we need to do an 'immediate'
@ -1073,7 +1073,7 @@ ahb_scsi_cmd(xs)
*/
SC_DEBUG(xs->sc_link, SDEV_DB4,
("%d @0x%x:- ", xs->datalen, xs->data));
("%ld @%p:- ", xs->datalen, xs->data));
datalen = xs->datalen;
thiskv = (int) xs->data;
thisphys = KVTOPHYS(thiskv);
@ -1084,7 +1084,8 @@ ahb_scsi_cmd(xs)
/* put in the base address */
sg->addr = thisphys;
SC_DEBUGN(xs->sc_link, SDEV_DB4, ("0x%x", thisphys));
SC_DEBUGN(xs->sc_link, SDEV_DB4, ("0x%lx",
thisphys));
/* do it at least once */
nextphys = thisphys;

8
sys/i386/isa/bt742a.c
View File

@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
* $Id: bt742a.c,v 1.33 1995/04/23 09:13:05 julian Exp $
* $Id: bt742a.c,v 1.34 1995/04/23 21:58:35 gibbs Exp $
*/
/*
@ -1446,7 +1446,7 @@ bt_scsi_cmd(xs)
return (TRY_AGAIN_LATER);
}
SC_DEBUG(xs->sc_link, SDEV_DB3,
("start ccb(%x)\n", ccb));
("start ccb(%p)\n", ccb));
/*
* Put all the arguments for the xfer in the ccb
*/
@ -1494,7 +1494,7 @@ bt_scsi_cmd(xs)
*/
SC_DEBUG(xs->sc_link, SDEV_DB4,
("%d @0x%x:- ", xs->datalen, xs->data));
("%ld @%p:- ", xs->datalen, xs->data));
datalen = xs->datalen;
thiskv = (int) xs->data;
thisphys = KVTOPHYS(thiskv);
@ -1506,7 +1506,7 @@ bt_scsi_cmd(xs)
sg->seg_addr = thisphys;
SC_DEBUGN(xs->sc_link, SDEV_DB4,
("0x%x", thisphys));
("0x%lx", thisphys));
/* do it at least once */
nextphys = thisphys;

4
sys/i386/isa/mcd.c
View File

@ -40,7 +40,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: mcd.c,v 1.41 1995/04/12 20:47:58 wollman Exp $
* $Id: mcd.c,v 1.42 1995/05/09 11:39:40 rgrimes Exp $
*/
static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
@ -1075,7 +1075,7 @@ nextblock:
blknum = (bp->b_blkno / (mbx->sz/DEV_BSIZE))
+ mbx->p_offset + mbx->skip/mbx->sz;
MCD_TRACE("mcd_doread: read blknum=%d for bp=0x%x\n",
MCD_TRACE("mcd_doread: read blknum=%d for bp=%p\n",
blknum, bp);
/* build parameter block */

4
sys/i386/isa/sio.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
* $Id: sio.c,v 1.96 1995/04/23 12:41:57 bde Exp $
* $Id: sio.c,v 1.97 1995/05/07 23:00:02 ache Exp $
*/
#include "sio.h"
@ -2329,7 +2329,7 @@ LoadSoftModem(int unit, int base_io, u_long size, u_char *ptr)
return 0;
error:
printf("sio%d: DSI SoftModem microcode load failed: <%s>\n",ptr);
printf("sio%d: DSI SoftModem microcode load failed: <%s>\n",unit,ptr);
outb(base_io+7,0x00); \
outb(base_io+3,data_0187); \
outb(base_io+4,data_0188); \

4
sys/i386/isa/sound/soundcard.c
View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: soundcard.c,v 1.23 1995/03/05 04:01:29 jkh Exp $
* $Id: soundcard.c,v 1.24 1995/03/12 23:34:10 swallace Exp $
*/
#include "sound_config.h"
@ -400,7 +400,7 @@ sound_mem_init (void)
if (tmpbuf == NULL)
{
printk ("snd: Unable to allocate %d bytes of buffer\n",
printk ("snd: Unable to allocate %ld bytes of buffer\n",
audio_devs[dev]->buffsize);
return;
}

9
sys/i386/isa/ultra14f.c
View File

@ -22,7 +22,7 @@
* today: Fri Jun 2 17:21:03 EST 1994
* added 24F support ++sg
*
* $Id: ultra14f.c,v 1.30 1995/04/12 20:48:09 wollman Exp $
* $Id: ultra14f.c,v 1.31 1995/05/07 06:54:01 bde Exp $
*/
#include <sys/types.h>
@ -1103,7 +1103,7 @@ uha_scsi_cmd(xs)
return (TRY_AGAIN_LATER);
}
cheat = mscp;
SC_DEBUG(xs->sc_link, SDEV_DB3, ("start mscp(%x)\n", mscp));
SC_DEBUG(xs->sc_link, SDEV_DB3, ("start mscp(%p)\n", mscp));
mscp->xs = xs;
/*
@ -1186,7 +1186,7 @@ uha_scsi_cmd(xs)
*/
SC_DEBUG(xs->sc_link, SDEV_DB4,
("%d @0x%x:- ", xs->datalen, xs->data));
("%ld @%p:- ", xs->datalen, xs->data));
datalen = xs->datalen;
thiskv = (int) xs->data;
thisphys = KVTOPHYS(thiskv);
@ -1201,7 +1201,8 @@ uha_scsi_cmd(xs)
sg->addr.addr[2] = ((thisphys >> 16) & 0xff);
sg->addr.addr[3] = ((thisphys >> 24) & 0xff);
SC_DEBUGN(xs->sc_link, SDEV_DB4, ("0x%x", thisphys));
SC_DEBUGN(xs->sc_link, SDEV_DB4, ("0x%lx",
thisphys));
/* do it at least once */
nextphys = thisphys;

9
sys/i386/scsi/aic7xxx.c
View File

@ -24,7 +24,7 @@
*
* commenced: Sun Sep 27 18:14:01 PDT 1992
*
* $Id: aic7xxx.c,v 1.24 1995/05/01 09:49:45 gibbs Exp $
* $Id: aic7xxx.c,v 1.25 1995/05/01 18:43:14 gibbs Exp $
*/
/*
* TODO:
@ -1747,7 +1747,7 @@ ahc_scsi_cmd(xs)
xs->error = XS_DRIVER_STUFFUP;
return (TRY_AGAIN_LATER);
}
SC_DEBUG(xs->sc_link, SDEV_DB3, ("start scb(%x)\n", scb));
SC_DEBUG(xs->sc_link, SDEV_DB3, ("start scb(%p)\n", scb));
scb->xs = xs;
if (flags & SCSI_RESET) {
/* XXX: Needs Implementation */
@ -1784,7 +1784,7 @@ ahc_scsi_cmd(xs)
* Set up the scatter gather block
*/
SC_DEBUG(xs->sc_link, SDEV_DB4,
("%d @0x%x:- ", xs->datalen, xs->data));
("%ld @%p:- ", xs->datalen, xs->data));
datalen = xs->datalen;
thiskv = (int) xs->data;
thisphys = KVTOPHYS(thiskv);
@ -1795,7 +1795,8 @@ ahc_scsi_cmd(xs)
/* put in the base address */
sg->addr = thisphys;
SC_DEBUGN(xs->sc_link, SDEV_DB4, ("0x%x", thisphys));
SC_DEBUGN(xs->sc_link, SDEV_DB4, ("0x%lx",
thisphys));
/* do it at least once */
nextphys = thisphys;

4
sys/isa/sio.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)com.c 7.5 (Berkeley) 5/16/91
* $Id: sio.c,v 1.96 1995/04/23 12:41:57 bde Exp $
* $Id: sio.c,v 1.97 1995/05/07 23:00:02 ache Exp $
*/
#include "sio.h"
@ -2329,7 +2329,7 @@ LoadSoftModem(int unit, int base_io, u_long size, u_char *ptr)
return 0;
error:
printf("sio%d: DSI SoftModem microcode load failed: <%s>\n",ptr);
printf("sio%d: DSI SoftModem microcode load failed: <%s>\n",unit,ptr);
outb(base_io+7,0x00); \
outb(base_io+3,data_0187); \
outb(base_io+4,data_0188); \

11
sys/kern/vfs_bio.c
View File

@ -18,7 +18,7 @@
* 5. Modifications may be freely made to this file if the above conditions
* are met.
*
* $Id: vfs_bio.c,v 1.42 1995/04/16 12:02:42 davidg Exp $
* $Id: vfs_bio.c,v 1.43 1995/04/30 05:09:13 davidg Exp $
*/
/*
@ -1132,10 +1132,13 @@ biodone(register struct buf * bp)
* have not set the page busy flag correctly!!!
*/
if (m->busy == 0) {
printf("biodone: page busy < 0, off: %d, foff: %d, resid: %d, index: %d\n",
printf("biodone: page busy < 0, "
"off: %ld, foff: %ld, "
"resid: %d, index: %d\n",
m->offset, foff, resid, i);
printf(" iosize: %d, lblkno: %d\n",
bp->b_vp->v_mount->mnt_stat.f_iosize, bp->b_lblkno);
printf(" iosize: %ld, lblkno: %ld\n",
bp->b_vp->v_mount->mnt_stat.f_iosize,
bp->b_lblkno);
printf(" valid: 0x%x, dirty: 0x%x, mapped: %d\n",
m->valid, m->dirty, m->bmapped);
panic("biodone: page busy < 0\n");

6
sys/miscfs/procfs/procfs_vnops.c
View File

@ -36,7 +36,7 @@
*
* @(#)procfs_vnops.c 8.6 (Berkeley) 2/7/94
*
* $Id: procfs_vnops.c,v 1.10 1995/04/15 02:50:13 davidg Exp $
* $Id: procfs_vnops.c,v 1.11 1995/04/15 03:20:31 davidg Exp $
*/
/*
@ -285,8 +285,8 @@ procfs_print(ap)
{
struct pfsnode *pfs = VTOPFS(ap->a_vp);
printf("tag VT_PROCFS, pid %lu, mode %x, flags %x\n",
(u_long)pfs->pfs_pid,
printf("tag VT_PROCFS, pid %lu, mode %x, flags %lx\n",
pfs->pfs_pid,
pfs->pfs_mode, pfs->pfs_flags);
return (0);
}

7
sys/net/if_spppsubr.c
View File

@ -741,14 +741,15 @@ void sppp_cisco_input (struct sppp *sp, struct mbuf *m)
}
h = mtod (m, struct cisco_packet*);
if (ifp->if_flags & IFF_DEBUG)
printf ("%s%d: cisco input: %d bytes <%xh %xh %xh %xh %xh-%xh>\n",
printf ("%s%d: cisco input: %d bytes "
"<%lxh %lxh %lxh %xh %xh-%xh>\n",
ifp->if_name, ifp->if_unit, m->m_pkthdr.len,
ntohl (h->type), h->par1, h->par2, h->rel,
h->time0, h->time1);
switch (ntohl (h->type)) {
default:
if (ifp->if_flags & IFF_DEBUG)
printf ("%s%d: unknown cisco packet type: 0x%x\n",
printf ("%s%d: unknown cisco packet type: 0x%lx\n",
ifp->if_name, ifp->if_unit, ntohl (h->type));
break;
case CISCO_ADDR_REPLY:
@ -872,7 +873,7 @@ void sppp_cisco_send (struct sppp *sp, int type, long par1, long par2)
ch->time1 = htons ((unsigned short) t);
if (ifp->if_flags & IFF_DEBUG)
printf ("%s%d: cisco output: <%xh %xh %xh %xh %xh-%xh>\n",
printf ("%s%d: cisco output: <%lxh %lxh %lxh %xh %xh-%xh>\n",
ifp->if_name, ifp->if_unit, ntohl (ch->type), ch->par1,
ch->par2, ch->rel, ch->time0, ch->time1);

4
sys/netccitt/hd_input.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)hd_input.c 8.1 (Berkeley) 6/10/93
* $Id: hd_input.c,v 1.2 1994/08/02 07:47:01 davidg Exp $
* $Id: hd_input.c,v 1.3 1995/02/15 06:29:43 jkh Exp $
*/
#include <sys/param.h>
@ -104,7 +104,7 @@ hdintr ()
if (hdp->hd_ifp == ifp)
break;
if (hdp == 0) {
printf ("hdintr: unknown interface %x\n", ifp);
printf ("hdintr: unknown interface %p\n", ifp);
m_freem (m);
continue;
}

5
sys/netccitt/llc_subr.c
View File

@ -37,7 +37,7 @@
* SUCH DAMAGE.
*
* @(#)llc_subr.c 8.1 (Berkeley) 6/10/93
* $Id: llc_subr.c,v 1.2 1994/08/02 07:47:20 davidg Exp $
* $Id: llc_subr.c,v 1.3 1994/12/13 22:32:14 wollman Exp $
*/
#include <sys/param.h>
@ -2335,7 +2335,8 @@ llc_link_dump(struct llc_linkcb* linkp, const char *message)
/* print flag values */
printf("flags P %d/F %d/S %d/DATA %d/REMOTE_BUSY %d\n",
LLC_GETFLAG(linkp, P), LLC_GETFLAG(linkp, S),
LLC_GETFLAG(linkp, P), LLC_GETFLAG(linkp, F),
LLC_GETFLAG(linkp, S),
LLC_GETFLAG(linkp, DATA), LLC_GETFLAG(linkp, REMOTE_BUSY));
/* print send and receive state variables, ack, and window */

8
sys/netinet/ip_fw.c
View File

@ -55,10 +55,10 @@
#endif
#define print_ip(a) printf("%d.%d.%d.%d",(ntohl(a.s_addr)>>24)&0xFF,\
(ntohl(a.s_addr)>>16)&0xFF,\
(ntohl(a.s_addr)>>8)&0xFF,\
(ntohl(a.s_addr))&0xFF);
#define print_ip(a) printf("%ld.%ld.%ld.%ld",(ntohl(a.s_addr)>>24)&0xFF,\
(ntohl(a.s_addr)>>16)&0xFF,\
(ntohl(a.s_addr)>>8)&0xFF,\
(ntohl(a.s_addr))&0xFF);
#ifdef IPFIREWALL_DEBUG
#define dprint_ip(a) print_ip(a)

4
sys/scsi/ch.c
View File

@ -2,7 +2,7 @@
* Written by grefen@?????
* Based on scsi drivers by Julian Elischer (julian@tfs.com)
*
* $Id: ch.c,v 1.18 1995/04/14 15:10:26 dufault Exp $
* $Id: ch.c,v 1.19 1995/05/03 18:09:08 dufault Exp $
*/
#include <sys/types.h>
@ -193,7 +193,7 @@ struct scsi_link *sc_link)
* Make sure data is loaded
*/
if ( (errcode = (ch_mode_sense(unit, SCSI_NOSLEEP | SCSI_NOMASK))) ) {
printf("ch%d: scsi changer :- offline\n", unit);
printf("ch%ld: scsi changer :- offline\n", unit);
sc_link->flags &= ~SDEV_OPEN;
return (errcode);
}

8
sys/ufs/ffs/ffs_alloc.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)ffs_alloc.c 8.8 (Berkeley) 2/21/94
* $Id: ffs_alloc.c,v 1.11 1995/03/19 14:29:11 davidg Exp $
* $Id: ffs_alloc.c,v 1.12 1995/03/26 23:29:09 davidg Exp $
*/
#include <sys/param.h>
@ -176,8 +176,10 @@ ffs_realloccg(ip, lbprev, bpref, osize, nsize, cred, bpp)
if ((u_int)osize > fs->fs_bsize || fragoff(fs, osize) != 0 ||
(u_int)nsize > fs->fs_bsize || fragoff(fs, nsize) != 0) {
printf(
"dev = 0x%lx, bsize = %d, osize = %d, nsize = %d, fs = %s\n",
(u_long)ip->i_dev, fs->fs_bsize, osize, nsize, fs->fs_fsmnt);
"dev = 0x%lx, bsize = %ld, osize = %d, "
"nsize = %d, fs = %s\n",
(u_long)ip->i_dev, fs->fs_bsize, osize,
nsize, fs->fs_fsmnt);
panic("ffs_realloccg: bad size");
}
if (cred == NOCRED)

6
sys/ufs/lfs/lfs_segment.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)lfs_segment.c 8.5 (Berkeley) 1/4/94
* $Id: lfs_segment.c,v 1.8 1995/03/19 14:29:18 davidg Exp $
* $Id: lfs_segment.c,v 1.9 1995/03/28 07:58:05 bde Exp $
*/
#include <sys/param.h>
@ -532,7 +532,7 @@ lfs_writeinode(fs, sp, ip)
#ifdef DIAGNOSTIC
if (sup->su_nbytes < sizeof(struct dinode)) {
/* XXX -- Change to a panic. */
printf("lfs: negative bytes (segment %d)\n",
printf("lfs: negative bytes (segment %ld)\n",
datosn(fs, daddr));
panic("negative bytes");
}
@ -697,7 +697,7 @@ lfs_updatemeta(sp)
#ifdef DIAGNOSTIC
if (sup->su_nbytes < fs->lfs_bsize) {
/* XXX -- Change to a panic. */
printf("lfs: negative bytes (segment %d)\n",
printf("lfs: negative bytes (segment %ld)\n",
datosn(fs, daddr));
panic ("Negative Bytes");
}

4
sys/ufs/lfs/lfs_syscalls.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)lfs_syscalls.c 8.5 (Berkeley) 4/20/94
* $Id: lfs_syscalls.c,v 1.7 1995/03/28 07:58:06 bde Exp $
* $Id: lfs_syscalls.c,v 1.8 1995/04/24 05:13:28 dyson Exp $
*/
#include <sys/param.h>
@ -174,7 +174,7 @@ lfs_markv(p, uap, retval)
blkp->bi_lbn == LFS_UNUSED_LBN ?
blkp->bi_bp : NULL)) {
#ifdef DIAGNOSTIC
printf("lfs_markv: VFS_VGET failed (%d)\n",
printf("lfs_markv: VFS_VGET failed (%ld)\n",
blkp->bi_inode);
#endif
lastino = LFS_UNUSED_INUM;

4
sys/ufs/mfs/mfs_vnops.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)mfs_vnops.c 8.3 (Berkeley) 9/21/93
* $Id: mfs_vnops.c,v 1.8 1995/02/03 06:46:27 davidg Exp $
* $Id: mfs_vnops.c,v 1.9 1995/03/19 14:29:22 davidg Exp $
*/
#include <sys/param.h>
@ -328,7 +328,7 @@ mfs_print(ap)
{
register struct mfsnode *mfsp = VTOMFS(ap->a_vp);
printf("tag VT_MFS, pid %d, base %d, size %d\n", mfsp->mfs_pid,
printf("tag VT_MFS, pid %ld, base %p, size %ld\n", mfsp->mfs_pid,
mfsp->mfs_baseoff, mfsp->mfs_size);
return (0);
}