Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/x68k kill sprintf, fix unused.



details:   https://anonhg.NetBSD.org/src/rev/3e8d08e485ba
branches:  trunk
changeset: 328091:3e8d08e485ba
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Mar 26 08:17:59 2014 +0000

description:
kill sprintf, fix unused.

diffstat:

 sys/arch/x68k/dev/fd.c                |   8 ++++----
 sys/arch/x68k/dev/intio_dmac.c        |   6 +++---
 sys/arch/x68k/dev/ite.c               |  12 ++++++------
 sys/arch/x68k/dev/mfp.c               |   6 +++---
 sys/arch/x68k/dev/mha.c               |   7 +++----
 sys/arch/x68k/dev/ms.c                |   6 ++----
 sys/arch/x68k/dev/neptune.c           |   6 +++---
 sys/arch/x68k/dev/opm.c               |   6 +++---
 sys/arch/x68k/dev/par.c               |   6 +++---
 sys/arch/x68k/dev/rtclock.c           |   6 +++---
 sys/arch/x68k/dev/scsirom.c           |   6 +++---
 sys/arch/x68k/dev/vs.c                |   8 ++------
 sys/arch/x68k/dev/xel.c               |   6 +++---
 sys/arch/x68k/stand/newdisk/newdisk.c |   6 +++---
 sys/arch/x68k/x68k/autoconf.c         |   8 ++++----
 sys/arch/x68k/x68k/machdep.c          |  12 +++++++-----
 16 files changed, 55 insertions(+), 60 deletions(-)

diffs (truncated from 523 to 300 lines):

diff -r 86242e167971 -r 3e8d08e485ba sys/arch/x68k/dev/fd.c
--- a/sys/arch/x68k/dev/fd.c    Wed Mar 26 08:17:32 2014 +0000
+++ b/sys/arch/x68k/dev/fd.c    Wed Mar 26 08:17:59 2014 +0000
@@ -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 @@
 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);
diff -r 86242e167971 -r 3e8d08e485ba sys/arch/x68k/dev/intio_dmac.c
--- a/sys/arch/x68k/dev/intio_dmac.c    Wed Mar 26 08:17:32 2014 +0000
+++ b/sys/arch/x68k/dev/intio_dmac.c    Wed Mar 26 08:17:59 2014 +0000
@@ -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 @@
        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;
diff -r 86242e167971 -r 3e8d08e485ba sys/arch/x68k/dev/ite.c
--- a/sys/arch/x68k/dev/ite.c   Wed Mar 26 08:17:32 2014 +0000
+++ b/sys/arch/x68k/dev/ite.c   Wed Mar 26 08:17:59 2014 +0000
@@ -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 @@
 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 @@
                                        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;
                                }
diff -r 86242e167971 -r 3e8d08e485ba sys/arch/x68k/dev/mfp.c
--- a/sys/arch/x68k/dev/mfp.c   Wed Mar 26 08:17:32 2014 +0000
+++ b/sys/arch/x68k/dev/mfp.c   Wed Mar 26 08:17:59 2014 +0000
@@ -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 @@
 {
        struct mfp_softc *sc = device_private(self);
        struct intio_attach_args *ia = aux;
-       int r;
+       int r __diagused;
 
        aprint_normal("\n");
        mfp_attached = 1;
diff -r 86242e167971 -r 3e8d08e485ba sys/arch/x68k/dev/mha.c
--- a/sys/arch/x68k/dev/mha.c   Wed Mar 26 08:17:32 2014 +0000
+++ b/sys/arch/x68k/dev/mha.c   Wed Mar 26 08:17:59 2014 +0000
@@ -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 @@
     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 @@
        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 @@
                                        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;
diff -r 86242e167971 -r 3e8d08e485ba sys/arch/x68k/dev/ms.c
--- a/sys/arch/x68k/dev/ms.c    Wed Mar 26 08:17:32 2014 +0000
+++ b/sys/arch/x68k/dev/ms.c    Wed Mar 26 08:17:59 2014 +0000
@@ -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 @@
        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;
diff -r 86242e167971 -r 3e8d08e485ba sys/arch/x68k/dev/neptune.c
--- a/sys/arch/x68k/dev/neptune.c       Wed Mar 26 08:17:32 2014 +0000
+++ b/sys/arch/x68k/dev/neptune.c       Wed Mar 26 08:17:59 2014 +0000
@@ -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 @@
        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;
diff -r 86242e167971 -r 3e8d08e485ba sys/arch/x68k/dev/opm.c
--- a/sys/arch/x68k/dev/opm.c   Wed Mar 26 08:17:32 2014 +0000
+++ b/sys/arch/x68k/dev/opm.c   Wed Mar 26 08:17:59 2014 +0000
@@ -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 @@
 {
        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;
diff -r 86242e167971 -r 3e8d08e485ba sys/arch/x68k/dev/par.c
--- a/sys/arch/x68k/dev/par.c   Wed Mar 26 08:17:32 2014 +0000
+++ b/sys/arch/x68k/dev/par.c   Wed Mar 26 08:17:59 2014 +0000
@@ -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 @@
 {
        struct par_softc *sc = device_private(self);
        struct intio_attach_args *ia = aux;
-       int r;
+       int r __diagused;
        
        par_attached = 1;
 
diff -r 86242e167971 -r 3e8d08e485ba sys/arch/x68k/dev/rtclock.c
--- a/sys/arch/x68k/dev/rtclock.c       Wed Mar 26 08:17:32 2014 +0000
+++ b/sys/arch/x68k/dev/rtclock.c       Wed Mar 26 08:17:59 2014 +0000
@@ -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 $");



Home | Main Index | Thread Index | Old Index