Module Name: src
Committed By: christos
Date: Sat Nov 9 21:41:03 UTC 2013
Modified Files:
src/lib/libm/noieee_src: n_gamma.c
src/sys/arch/vax/boot/boot: if_ni.c mfm.c ra.c
Log Message:
fix unused variable warnings
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/libm/noieee_src/n_gamma.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/vax/boot/boot/if_ni.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/vax/boot/boot/mfm.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/vax/boot/boot/ra.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/libm/noieee_src/n_gamma.c
diff -u src/lib/libm/noieee_src/n_gamma.c:1.8 src/lib/libm/noieee_src/n_gamma.c:1.9
--- src/lib/libm/noieee_src/n_gamma.c:1.8 Fri Jun 8 07:13:33 2012
+++ src/lib/libm/noieee_src/n_gamma.c Sat Nov 9 16:41:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: n_gamma.c,v 1.8 2012/06/08 11:13:33 abs Exp $ */
+/* $NetBSD: n_gamma.c,v 1.9 2013/11/09 21:41:03 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -158,6 +158,7 @@ gamma(double x)
else return (one/x);
}
b =one+1e-20; /* Raise inexact flag. ??? -ragge */
+ __USE(b);
return (one/x);
} else if (!finite(x)) {
if (_IEEE) /* x = NaN, -Inf */
Index: src/sys/arch/vax/boot/boot/if_ni.c
diff -u src/sys/arch/vax/boot/boot/if_ni.c:1.9 src/sys/arch/vax/boot/boot/if_ni.c:1.10
--- src/sys/arch/vax/boot/boot/if_ni.c:1.9 Sun Jul 3 04:56:25 2011
+++ src/sys/arch/vax/boot/boot/if_ni.c Sat Nov 9 16:41:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ni.c,v 1.9 2011/07/03 08:56:25 mrg Exp $ */
+/* $NetBSD: if_ni.c,v 1.10 2013/11/09 21:41:03 christos Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -193,7 +193,7 @@ niopen(struct open_file *f, int adapt, i
struct ni_dg *data;
struct ni_msg *msg;
struct ni_ptdb *ptdb;
- int i, va, res;
+ int i, va;
struct ni_param *nip;
if (beenhere++ && askname == 0)
@@ -288,7 +288,7 @@ niopen(struct open_file *f, int adapt, i
for (i = 0; i < NMSGBUF; i++) {
msg = (void *)(va + i * 512);
- res = INSQTI(msg, &fqb->nf_mforw);
+ (void)INSQTI(msg, &fqb->nf_mforw);
}
WAITREG(NI_PCR, PCR_OWN);
NI_WREG(NI_PCR, PCR_FREEQNE|PCR_MFREEQ|PCR_OWN);
@@ -317,7 +317,7 @@ niopen(struct open_file *f, int adapt, i
allocbase += 2048;
data->bufs[0]._index = i;
- res = INSQTI(data, &fqb->nf_dforw);
+ (void)INSQTI(data, &fqb->nf_dforw);
}
WAITREG(NI_PCR, PCR_OWN);
NI_WREG(NI_PCR, PCR_FREEQNE|PCR_DFREEQ|PCR_OWN);
@@ -352,7 +352,7 @@ niopen(struct open_file *f, int adapt, i
data->bufs[0]._len = bd->nb_len;
data->bufs[0]._index = idx;
- res = INSQTI(data, &fqb->nf_rforw);
+ (void)INSQTI(data, &fqb->nf_rforw);
}
WAITREG(NI_PCR, PCR_OWN);
NI_WREG(NI_PCR, PCR_FREEQNE|PCR_RFREEQ|PCR_OWN);
Index: src/sys/arch/vax/boot/boot/mfm.c
diff -u src/sys/arch/vax/boot/boot/mfm.c:1.13 src/sys/arch/vax/boot/boot/mfm.c:1.14
--- src/sys/arch/vax/boot/boot/mfm.c:1.13 Mon Oct 26 15:16:58 2009
+++ src/sys/arch/vax/boot/boot/mfm.c Sat Nov 9 16:41:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mfm.c,v 1.13 2009/10/26 19:16:58 cegger Exp $ */
+/* $NetBSD: mfm.c,v 1.14 2013/11/09 21:41:03 christos Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -240,7 +240,7 @@ static int mfm_retry = 0;
int
mfm_command(int cmd)
{
- int termcode, ready, i;
+ int termcode, i;
creg_write(); /* write command-registers */
*ka410_intclr = INTR_DC;
@@ -280,7 +280,6 @@ mfm_command(int cmd)
goto retry;
}
termcode = (dkc->dkc_stat & DKC_ST_TERMCOD) >> 3;
- ready = sreg.udc_dstat & UDC_DS_READY;
printf("cmd:0x%x: termcode=0x%x, status=0x%x, cstat=0x%x, dstat=0x%x\n",
cmd, termcode, dkc->dkc_stat, sreg.udc_cstat, sreg.udc_dstat);
@@ -456,7 +455,7 @@ int
mfm_rxstrategy(void *f, int func, daddr_t dblk, size_t size, void *buf, size_t *rsize) {
struct mfm_softc *msc = f;
struct disklabel *lp;
- int block, sect, head, cyl, scount, res;
+ int block, sect, head, cyl, scount;
char *cbuf;
cbuf = (char*)buf;
@@ -517,7 +516,7 @@ mfm_rxstrategy(void *f, int func, daddr_
mfm_rxprepare();
/* copy from buf */
memcpy((void *) 0x200D0000, cbuf, *rsize);
- res = mfm_command(DKC_CMD_WRITE_RX33);
+ (void)mfm_command(DKC_CMD_WRITE_RX33);
} else {
creg.udc_rtcnt = UDC_RC_RX33READ;
creg.udc_mode = UDC_MD_RX33;
@@ -526,7 +525,7 @@ mfm_rxstrategy(void *f, int func, daddr_
mfm_rxprepare();
/* clear disk buffer */
memset((void *) 0x200D0000, 0, *rsize);
- res = mfm_command(DKC_CMD_READ_RX33);
+ (void)mfm_command(DKC_CMD_READ_RX33);
/* copy to buf */
memcpy(cbuf, (void *) 0x200D0000, *rsize);
}
@@ -544,7 +543,7 @@ int
mfm_rdstrategy(void *f, int func, daddr_t dblk, size_t size, void *buf, size_t *rsize) {
struct mfm_softc *msc = f;
struct disklabel *lp;
- int block, sect, head, cyl, scount, cmd, res;
+ int block, sect, head, cyl, scount, cmd;
char *cbuf;
cbuf = (char *)buf;
@@ -608,7 +607,7 @@ mfm_rdstrategy(void *f, int func, daddr_
cmd = DKC_CMD_WRITE_HDD;
memcpy((void *) 0x200D0000, cbuf, *rsize);
- res = mfm_command(cmd);
+ (void)mfm_command(cmd);
} else {
creg.udc_rtcnt = UDC_RC_HDD_READ;
creg.udc_mode = UDC_MD_HDD;
@@ -616,7 +615,7 @@ mfm_rdstrategy(void *f, int func, daddr_
cmd = DKC_CMD_READ_HDD;
memset((void *) 0x200D0000, 0, *rsize);
- res = mfm_command(cmd);
+ (void)mfm_command(cmd);
memcpy(cbuf, (void *) 0x200D0000, *rsize);
}
@@ -638,18 +637,17 @@ int
mfmstrategy(void *f, int func, daddr_t dblk, size_t size, void *buf, size_t *rsize)
{
struct mfm_softc *msc = f;
- int res = -1;
switch (msc->unit) {
case 0:
case 1:
- res = mfm_rdstrategy(f, func, dblk, size, buf, rsize);
+ return mfm_rdstrategy(f, func, dblk, size, buf, rsize);
break;
case 2:
- res = mfm_rxstrategy(f, func, dblk, size, buf, rsize);
+ return mfm_rxstrategy(f, func, dblk, size, buf, rsize);
break;
default:
printf("invalid unit %d in mfmstrategy()\n", msc->unit);
+ return -1;
}
- return (res);
}
Index: src/sys/arch/vax/boot/boot/ra.c
diff -u src/sys/arch/vax/boot/boot/ra.c:1.18 src/sys/arch/vax/boot/boot/ra.c:1.19
--- src/sys/arch/vax/boot/boot/ra.c:1.18 Wed Mar 18 12:00:15 2009
+++ src/sys/arch/vax/boot/boot/ra.c Sat Nov 9 16:41:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ra.c,v 1.18 2009/03/18 16:00:15 cegger Exp $ */
+/* $NetBSD: ra.c,v 1.19 2013/11/09 21:41:03 christos Exp $ */
/*
* Copyright (c) 1995 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -242,6 +242,7 @@ igen: uda.uda_cmd.mscp_opcode = cmd;
printf("sending cmd %x...", cmd);
#endif
hej = *ra_ip;
+ __USE(hej);
to = 10000000;
while (uda.uda_ca.ca_rspdsc < 0) {
// if (uda.uda_ca.ca_cmdint)
