Module Name: src
Committed By: christos
Date: Wed Mar 26 08:17:59 UTC 2014
Modified Files:
src/sys/arch/x68k/dev: fd.c intio_dmac.c ite.c mfp.c mha.c ms.c
neptune.c opm.c par.c rtclock.c scsirom.c vs.c xel.c
src/sys/arch/x68k/stand/newdisk: newdisk.c
src/sys/arch/x68k/x68k: autoconf.c machdep.c
Log Message:
kill sprintf, fix unused.
To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/sys/arch/x68k/dev/fd.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/x68k/dev/intio_dmac.c
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/x68k/dev/ite.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/x68k/dev/mfp.c
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/x68k/dev/mha.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/x68k/dev/ms.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/x68k/dev/neptune.c \
src/sys/arch/x68k/dev/opm.c src/sys/arch/x68k/dev/scsirom.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/x68k/dev/par.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/x68k/dev/rtclock.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/x68k/dev/vs.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/x68k/dev/xel.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/x68k/stand/newdisk/newdisk.c
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/x68k/x68k/autoconf.c
cvs rdiff -u -r1.189 -r1.190 src/sys/arch/x68k/x68k/machdep.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/x68k/dev/fd.c
diff -u src/sys/arch/x68k/dev/fd.c:1.107 src/sys/arch/x68k/dev/fd.c:1.108
--- src/sys/arch/x68k/dev/fd.c:1.107 Sun Mar 16 01:20:26 2014
+++ src/sys/arch/x68k/dev/fd.c Wed Mar 26 04:17:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.107 2014/03/16 05:20:26 dholland Exp $ */
+/* $NetBSD: fd.c,v 1.108 2014/03/26 08:17:59 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.107 2014/03/16 05:20:26 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.108 2014/03/26 08:17:59 christos Exp $");
#include "opt_ddb.h"
#include "opt_m68k_arch.h"
@@ -523,12 +523,12 @@ fdcreset(struct fdc_softc *fdc)
static int
fdcpoll(struct fdc_softc *fdc)
{
- int i = 25000, n;
+ int i = 25000;
while (--i > 0) {
if ((intio_get_sicilian_intr() & SICILIAN_STAT_FDC) != 0) {
out_fdc(fdc->sc_iot, fdc->sc_ioh, NE7CMD_SENSEI);
- n = fdcresult(fdc);
+ fdcresult(fdc);
break;
}
DELAY(100);
Index: src/sys/arch/x68k/dev/intio_dmac.c
diff -u src/sys/arch/x68k/dev/intio_dmac.c:1.34 src/sys/arch/x68k/dev/intio_dmac.c:1.35
--- src/sys/arch/x68k/dev/intio_dmac.c:1.34 Sun Oct 14 12:36:31 2012
+++ src/sys/arch/x68k/dev/intio_dmac.c Wed Mar 26 04:17:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: intio_dmac.c,v 1.34 2012/10/14 16:36:31 tsutsui Exp $ */
+/* $NetBSD: intio_dmac.c,v 1.35 2014/03/26 08:17:59 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#include "opt_m68k_arch.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intio_dmac.c,v 1.34 2012/10/14 16:36:31 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intio_dmac.c,v 1.35 2014/03/26 08:17:59 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -110,7 +110,7 @@ dmac_attach(device_t parent, device_t se
struct dmac_softc *sc = device_private(self);
struct intio_attach_args *ia = aux;
struct intio_softc *intio;
- int r;
+ int r __diagused;
sc->sc_dev = self;
dmac_attached = 1;
Index: src/sys/arch/x68k/dev/ite.c
diff -u src/sys/arch/x68k/dev/ite.c:1.61 src/sys/arch/x68k/dev/ite.c:1.62
--- src/sys/arch/x68k/dev/ite.c:1.61 Sun Mar 16 01:20:26 2014
+++ src/sys/arch/x68k/dev/ite.c Wed Mar 26 04:17:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ite.c,v 1.61 2014/03/16 05:20:26 dholland Exp $ */
+/* $NetBSD: ite.c,v 1.62 2014/03/26 08:17:59 christos Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.61 2014/03/16 05:20:26 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.62 2014/03/26 08:17:59 christos Exp $");
#include "ite.h"
#if NITE > 0
@@ -508,11 +508,10 @@ void
itestart(struct tty *tp)
{
struct clist *rbp;
- struct ite_softc *ip;
u_char buf[ITEBURST];
int s, len;
- ip = getitesp(tp->t_dev);
+ getitesp(tp->t_dev);
/*
* (Potentially) lower priority. We only need to protect ourselves
* from keyboard interrupts since that is all that can affect the
@@ -1577,8 +1576,9 @@ iteputchar(int c, struct ite_softc *ip)
break;
case 6:
/* cursor position report */
- sprintf(ip->argbuf, "\033[%d;%dR",
- ip->cury + 1, ip->curx + 1);
+ snprintf(ip->argbuf, sizeof(ip->argbuf),
+ "\033[%d;%dR",
+ ip->cury + 1, ip->curx + 1);
ite_sendstr(ip, ip->argbuf);
break;
}
Index: src/sys/arch/x68k/dev/mfp.c
diff -u src/sys/arch/x68k/dev/mfp.c:1.25 src/sys/arch/x68k/dev/mfp.c:1.26
--- src/sys/arch/x68k/dev/mfp.c:1.25 Thu May 5 09:44:35 2011
+++ src/sys/arch/x68k/dev/mfp.c Wed Mar 26 04:17:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mfp.c,v 1.25 2011/05/05 13:44:35 tsutsui Exp $ */
+/* $NetBSD: mfp.c,v 1.26 2014/03/26 08:17:59 christos Exp $ */
/*-
* Copyright (c) 1998 NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfp.c,v 1.25 2011/05/05 13:44:35 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfp.c,v 1.26 2014/03/26 08:17:59 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -98,7 +98,7 @@ mfp_attach(device_t parent, device_t sel
{
struct mfp_softc *sc = device_private(self);
struct intio_attach_args *ia = aux;
- int r;
+ int r __diagused;
aprint_normal("\n");
mfp_attached = 1;
Index: src/sys/arch/x68k/dev/mha.c
diff -u src/sys/arch/x68k/dev/mha.c:1.53 src/sys/arch/x68k/dev/mha.c:1.54
--- src/sys/arch/x68k/dev/mha.c:1.53 Wed Oct 10 12:55:50 2012
+++ src/sys/arch/x68k/dev/mha.c Wed Mar 26 04:17:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mha.c,v 1.53 2012/10/10 16:55:50 tsutsui Exp $ */
+/* $NetBSD: mha.c,v 1.54 2014/03/26 08:17:59 christos Exp $ */
/*-
* Copyright (c) 1996-1999 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mha.c,v 1.53 2012/10/10 16:55:50 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mha.c,v 1.54 2014/03/26 08:17:59 christos Exp $");
#include "opt_ddb.h"
@@ -673,7 +673,6 @@ mha_scsi_request(struct scsipi_channel *
void *arg)
{
struct scsipi_xfer *xs;
- struct scsipi_periph *periph;
struct mha_softc *sc = device_private(chan->chan_adapter->adapt_dev);
struct acb *acb;
int s, flags;
@@ -681,7 +680,6 @@ mha_scsi_request(struct scsipi_channel *
switch (req) {
case ADAPTER_REQ_RUN_XFER:
xs = arg;
- periph = xs->xs_periph;
SPC_TRACE(("[mha_scsi_cmd] "));
SPC_CMDS(("[0x%x, %d]->%d ", (int)xs->cmd->opcode, xs->cmdlen,
@@ -1729,6 +1727,7 @@ mhaintr(void *arg)
WAIT;
s = MBR;
SPC_ASSERT(s == 1);
+ __USE(s);
acb->stat = sc->sc_pcx[0]; /* XXX */
SPC_MISC(("stat=0x%02x ", acb->stat));
sc->sc_prevphase = STATUS_PHASE;
Index: src/sys/arch/x68k/dev/ms.c
diff -u src/sys/arch/x68k/dev/ms.c:1.32 src/sys/arch/x68k/dev/ms.c:1.33
--- src/sys/arch/x68k/dev/ms.c:1.32 Fri Mar 21 12:58:54 2014
+++ src/sys/arch/x68k/dev/ms.c Wed Mar 26 04:17:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ms.c,v 1.32 2014/03/21 16:58:54 tsutsui Exp $ */
+/* $NetBSD: ms.c,v 1.33 2014/03/26 08:17:59 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.32 2014/03/21 16:58:54 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.33 2014/03/26 08:17:59 christos Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -204,14 +204,12 @@ ms_attach(device_t parent, device_t self
struct ms_softc *ms = device_private(self);
struct zsc_softc *zsc = device_private(parent);
struct zs_chanstate *cs;
- cfdata_t cf;
int reset;
ms->ms_dev = self;
callout_init(&ms->ms_modem_ch, 0);
mutex_init(&ms->ms_lock, MUTEX_DEFAULT, IPL_SERIAL);
- cf = device_cfdata(self);
cs = zsc->zsc_cs[1];
cs->cs_private = ms;
cs->cs_ops = &zsops_ms;
Index: src/sys/arch/x68k/dev/neptune.c
diff -u src/sys/arch/x68k/dev/neptune.c:1.19 src/sys/arch/x68k/dev/neptune.c:1.20
--- src/sys/arch/x68k/dev/neptune.c:1.19 Thu Dec 18 00:56:42 2008
+++ src/sys/arch/x68k/dev/neptune.c Wed Mar 26 04:17:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: neptune.c,v 1.19 2008/12/18 05:56:42 isaki Exp $ */
+/* $NetBSD: neptune.c,v 1.20 2014/03/26 08:17:59 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: neptune.c,v 1.19 2008/12/18 05:56:42 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: neptune.c,v 1.20 2014/03/26 08:17:59 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -98,7 +98,7 @@ neptune_attach(device_t parent, device_t
struct neptune_softc *sc = device_private(self);
struct intio_attach_args *ia = aux;
struct neptune_attach_args na;
- int r;
+ int r __diagused;
cfdata_t cf;
ia->ia_size = 0x400;
Index: src/sys/arch/x68k/dev/opm.c
diff -u src/sys/arch/x68k/dev/opm.c:1.19 src/sys/arch/x68k/dev/opm.c:1.20
--- src/sys/arch/x68k/dev/opm.c:1.19 Wed Jun 25 04:14:59 2008
+++ src/sys/arch/x68k/dev/opm.c Wed Mar 26 04:17:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: opm.c,v 1.19 2008/06/25 08:14:59 isaki Exp $ */
+/* $NetBSD: opm.c,v 1.20 2014/03/26 08:17:59 christos Exp $ */
/*
* Copyright (c) 1995 Masanobu Saitoh, Takuya Harakawa.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opm.c,v 1.19 2008/06/25 08:14:59 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opm.c,v 1.20 2014/03/26 08:17:59 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -87,7 +87,7 @@ opm_attach(device_t parent, device_t sel
{
struct opm_softc *sc = device_private(self);
struct intio_attach_args *ia = aux;
- int r;
+ int r __diagused;
aprint_normal("\n");
ia->ia_size = 0x2000;
Index: src/sys/arch/x68k/dev/scsirom.c
diff -u src/sys/arch/x68k/dev/scsirom.c:1.19 src/sys/arch/x68k/dev/scsirom.c:1.20
--- src/sys/arch/x68k/dev/scsirom.c:1.19 Thu Dec 18 00:56:42 2008
+++ src/sys/arch/x68k/dev/scsirom.c Wed Mar 26 04:17:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: scsirom.c,v 1.19 2008/12/18 05:56:42 isaki Exp $ */
+/* $NetBSD: scsirom.c,v 1.20 2014/03/26 08:17:59 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsirom.c,v 1.19 2008/12/18 05:56:42 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsirom.c,v 1.20 2014/03/26 08:17:59 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -132,7 +132,7 @@ scsirom_attach(device_t parent, device_t
{
struct scsirom_softc *sc = device_private(self);
struct intio_attach_args *ia = aux;
- int r;
+ int r __diagused;
cfdata_t cf;
sc->sc_addr = ia->ia_addr;
Index: src/sys/arch/x68k/dev/par.c
diff -u src/sys/arch/x68k/dev/par.c:1.40 src/sys/arch/x68k/dev/par.c:1.41
--- src/sys/arch/x68k/dev/par.c:1.40 Sun Mar 16 01:20:26 2014
+++ src/sys/arch/x68k/dev/par.c Wed Mar 26 04:17:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: par.c,v 1.40 2014/03/16 05:20:26 dholland Exp $ */
+/* $NetBSD: par.c,v 1.41 2014/03/26 08:17:59 christos Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: par.c,v 1.40 2014/03/16 05:20:26 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: par.c,v 1.41 2014/03/26 08:17:59 christos Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@@ -167,7 +167,7 @@ parattach(device_t parent, device_t self
{
struct par_softc *sc = device_private(self);
struct intio_attach_args *ia = aux;
- int r;
+ int r __diagused;
par_attached = 1;
Index: src/sys/arch/x68k/dev/rtclock.c
diff -u src/sys/arch/x68k/dev/rtclock.c:1.23 src/sys/arch/x68k/dev/rtclock.c:1.24
--- src/sys/arch/x68k/dev/rtclock.c:1.23 Sat Jan 3 04:32:13 2009
+++ src/sys/arch/x68k/dev/rtclock.c Wed Mar 26 04:17:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rtclock.c,v 1.23 2009/01/03 09:32:13 isaki Exp $ */
+/* $NetBSD: rtclock.c,v 1.24 2014/03/26 08:17:59 christos Exp $ */
/*
* Copyright 1993, 1994 Masaru Oki
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtclock.c,v 1.23 2009/01/03 09:32:13 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtclock.c,v 1.24 2014/03/26 08:17:59 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -90,7 +90,7 @@ rtc_attach(device_t parent, device_t sel
{
struct rtc_softc *sc = device_private(self);
struct intio_attach_args *ia = aux;
- int r;
+ int r __diagused;
rtc_attached = 1;
Index: src/sys/arch/x68k/dev/vs.c
diff -u src/sys/arch/x68k/dev/vs.c:1.35 src/sys/arch/x68k/dev/vs.c:1.36
--- src/sys/arch/x68k/dev/vs.c:1.35 Wed Nov 23 18:07:30 2011
+++ src/sys/arch/x68k/dev/vs.c Wed Mar 26 04:17:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vs.c,v 1.35 2011/11/23 23:07:30 jmcneill Exp $ */
+/* $NetBSD: vs.c,v 1.36 2014/03/26 08:17:59 christos Exp $ */
/*
* Copyright (c) 2001 Tetsuya Isaki. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vs.c,v 1.35 2011/11/23 23:07:30 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vs.c,v 1.36 2014/03/26 08:17:59 christos Exp $");
#include "audio.h"
#include "vs.h"
@@ -387,8 +387,6 @@ vs_set_params(void *hdl, int setmode, in
struct audio_params *p;
int mode;
int rate;
- stream_filter_factory_t *pswcode;
- stream_filter_factory_t *rswcode;
audio_params_t hw;
int matched;
@@ -408,8 +406,6 @@ vs_set_params(void *hdl, int setmode, in
return EINVAL;
rate = p->sample_rate;
- pswcode = NULL;
- rswcode = NULL;
hw = *p;
hw.encoding = AUDIO_ENCODING_ADPCM;
hw.precision = hw.validbits = 4;
Index: src/sys/arch/x68k/dev/xel.c
diff -u src/sys/arch/x68k/dev/xel.c:1.17 src/sys/arch/x68k/dev/xel.c:1.18
--- src/sys/arch/x68k/dev/xel.c:1.17 Wed Dec 31 04:50:21 2008
+++ src/sys/arch/x68k/dev/xel.c Wed Mar 26 04:17:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: xel.c,v 1.17 2008/12/31 09:50:21 isaki Exp $ */
+/* $NetBSD: xel.c,v 1.18 2014/03/26 08:17:59 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xel.c,v 1.17 2008/12/31 09:50:21 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xel.c,v 1.18 2014/03/26 08:17:59 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -190,7 +190,7 @@ xel_attach(device_t parent, device_t sel
struct intio_attach_args *ia = aux;
cfdata_t cf = device_cfdata(self);
paddr_t addr;
- int r;
+ int r __diagused;
addr = xel_addr(parent, cf, aux);
sc->sc_bst = ia->ia_bst;
Index: src/sys/arch/x68k/stand/newdisk/newdisk.c
diff -u src/sys/arch/x68k/stand/newdisk/newdisk.c:1.10 src/sys/arch/x68k/stand/newdisk/newdisk.c:1.11
--- src/sys/arch/x68k/stand/newdisk/newdisk.c:1.10 Sat Jun 23 04:48:15 2012
+++ src/sys/arch/x68k/stand/newdisk/newdisk.c Wed Mar 26 04:17:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: newdisk.c,v 1.10 2012/06/23 08:48:15 minoura Exp $ */
+/* $NetBSD: newdisk.c,v 1.11 2014/03/26 08:17:59 christos Exp $ */
/*-
* Copyright (c) 1999 Minoura Makoto
@@ -134,7 +134,7 @@ main(int argc, char *argv[])
fprintf(stderr, "Building disk mark... ");
memset(buf, 0, 3072);
#define n label.d_secperunit
- sprintf(buf, "X68SCSI1%c%c%c%c%c%c%c%c%s",
+ snprintf(buf, sizeof(buf), "X68SCSI1%c%c%c%c%c%c%c%c%s",
2, 0,
(n/16777216)%256, (n/65536)%256, (n/256)%256, n%256,
1, 0, copyright);
@@ -158,7 +158,7 @@ main(int argc, char *argv[])
fprintf(stderr,
"Creating an empty partition table... ");
#define n (label.d_secperunit/2)
- sprintf(buf+2048,
+ snprintf(buf + 2048, sizeof(buf) - 2048,
"X68K%c%c%c%c%c%c%c%c%c%c%c%c",
0, 0, 0, 32,
(n/16777215)%256, (n/65536)%256, (n/256)%256, n%256,
Index: src/sys/arch/x68k/x68k/autoconf.c
diff -u src/sys/arch/x68k/x68k/autoconf.c:1.67 src/sys/arch/x68k/x68k/autoconf.c:1.68
--- src/sys/arch/x68k/x68k/autoconf.c:1.67 Sun Jul 29 14:05:47 2012
+++ src/sys/arch/x68k/x68k/autoconf.c Wed Mar 26 04:17:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.67 2012/07/29 18:05:47 mlelstv Exp $ */
+/* $NetBSD: autoconf.c,v 1.68 2014/03/26 08:17:59 christos Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.67 2012/07/29 18:05:47 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.68 2014/03/26 08:17:59 christos Exp $");
#include "opt_compat_netbsd.h"
#include "scsibus.h"
@@ -144,7 +144,7 @@ device_register(device_t dev, void *aux)
if (device_class(dev) == DV_IFNET) {
majdev = B_TYPE(bootdev);
if (X68K_BOOT_DEV_IS_NETIF(majdev)) {
- sprintf(tname, "%s%d",
+ snprintf(tname, sizeof(tname), "%s%d",
name_netif[255 - majdev], B_UNIT(bootdev));
if (!strcmp(tname, device_xname(dev)))
goto found;
@@ -195,7 +195,7 @@ scsi_find(dev_t bdev)
* search for the scsibus whose parent is
* the specified SCSI interface
*/
- sprintf(tname, "%s%" PRIu64,
+ snprintf(tname, sizeof(tname), "%s%" PRIu64,
name_scsiif[ifid], B_X68K_SCSI_IF_UN(bdev));
for (scsibus = deviter_first(&di, DEVITER_F_ROOT_FIRST);
Index: src/sys/arch/x68k/x68k/machdep.c
diff -u src/sys/arch/x68k/x68k/machdep.c:1.189 src/sys/arch/x68k/x68k/machdep.c:1.190
--- src/sys/arch/x68k/x68k/machdep.c:1.189 Mon Mar 24 16:06:33 2014
+++ src/sys/arch/x68k/x68k/machdep.c Wed Mar 26 04:17:59 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.189 2014/03/24 20:06:33 christos Exp $ */
+/* $NetBSD: machdep.c,v 1.190 2014/03/26 08:17:59 christos Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.189 2014/03/24 20:06:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.190 2014/03/26 08:17:59 christos Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -362,19 +362,19 @@ identifycpu(void)
check_emulator(emubuf, sizeof(emubuf));
cpuspeed = 2048 / delay_divisor;
- sprintf(clock, "%dMHz", cpuspeed);
+ snprintf(clock, sizeof(clock), "%dMHz", cpuspeed);
switch (cputype) {
case CPU_68060:
cpu_type = "m68060";
mmu = "/MMU";
cpuspeed = 128 / delay_divisor;
- sprintf(clock, "%d/%dMHz", cpuspeed*2, cpuspeed);
+ snprintf(clock, sizeof(clock), "%d/%dMHz", cpuspeed*2, cpuspeed);
break;
case CPU_68040:
cpu_type = "m68040";
mmu = "/MMU";
cpuspeed = 759 / delay_divisor;
- sprintf(clock, "%d/%dMHz", cpuspeed*2, cpuspeed);
+ snprintf(clock, sizeof(clock), "%d/%dMHz", cpuspeed*2, cpuspeed);
break;
case CPU_68030:
cpu_type = "m68030";
@@ -874,6 +874,7 @@ badaddr(volatile void* addr)
return 1;
}
i = *(volatile short *)addr;
+ __USE(i);
nofault = NULL;
return 0;
}
@@ -890,6 +891,7 @@ badbaddr(volatile void *addr)
return 1;
}
i = *(volatile char *)addr;
+ __USE(i);
nofault = NULL;
return 0;
}
