summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/arch/i386/i386/freebsd_machdep.c4
-rw-r--r--sys/arch/i386/i386/linux_machdep.c4
-rw-r--r--sys/arch/i386/i386/mem.c4
-rw-r--r--sys/arch/i386/i386/svr4_machdep.c4
-rw-r--r--sys/arch/i386/isa/isa_machdep.c6
-rw-r--r--sys/compat/ibcs2/ibcs2_exec.c7
-rw-r--r--sys/crypto/criov.c8
-rw-r--r--sys/crypto/cryptosoft.c4
-rw-r--r--sys/dev/ic/twe.c4
-rw-r--r--sys/dev/isa/sbdsp.c10
-rw-r--r--sys/dev/pci/auich.c6
-rw-r--r--sys/dev/pci/bktr/bktr_core.c4
-rw-r--r--sys/dev/pci/maestro.c4
-rw-r--r--sys/dev/pci/ubsec.c4
-rw-r--r--sys/isofs/cd9660/cd9660_vnops.c4
-rw-r--r--sys/kern/exec_elf.c4
-rw-r--r--sys/kern/uipc_mbuf.c5
-rw-r--r--sys/nfs/nfs_subs.c6
-rw-r--r--sys/nfs/nfs_vnops.c14
-rw-r--r--sys/scsi/scsiconf.c7
-rw-r--r--sys/ufs/ufs/ufs_vnops.c5
21 files changed, 62 insertions, 56 deletions
diff --git a/sys/arch/i386/i386/freebsd_machdep.c b/sys/arch/i386/i386/freebsd_machdep.c
index c1e2a7261c5..bb1cd69add0 100644
--- a/sys/arch/i386/i386/freebsd_machdep.c
+++ b/sys/arch/i386/i386/freebsd_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: freebsd_machdep.c,v 1.20 2006/09/19 11:06:33 jsg Exp $ */
+/* $OpenBSD: freebsd_machdep.c,v 1.21 2006/12/29 13:04:36 pedro Exp $ */
/* $NetBSD: freebsd_machdep.c,v 1.10 1996/05/03 19:42:05 christos Exp $ */
/*-
@@ -95,7 +95,7 @@ freebsd_sendsig(sig_t catcher, int sig, int mask, u_long code, int type,
*/
if ((psp->ps_flags & SAS_ALTSTACK) && !oonstack &&
(psp->ps_sigonstack & sigmask(sig))) {
- fp = (struct freebsd_sigframe *)(psp->ps_sigstk.ss_sp +
+ fp = (struct freebsd_sigframe *)((char *)psp->ps_sigstk.ss_sp +
psp->ps_sigstk.ss_size - sizeof(struct freebsd_sigframe));
psp->ps_sigstk.ss_flags |= SS_ONSTACK;
} else {
diff --git a/sys/arch/i386/i386/linux_machdep.c b/sys/arch/i386/i386/linux_machdep.c
index 5177e6718eb..7169a3afab9 100644
--- a/sys/arch/i386/i386/linux_machdep.c
+++ b/sys/arch/i386/i386/linux_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: linux_machdep.c,v 1.32 2006/09/19 11:06:33 jsg Exp $ */
+/* $OpenBSD: linux_machdep.c,v 1.33 2006/12/29 13:04:37 pedro Exp $ */
/* $NetBSD: linux_machdep.c,v 1.29 1996/05/03 19:42:11 christos Exp $ */
/*
@@ -121,7 +121,7 @@ linux_sendsig(sig_t catcher, int sig, int mask, u_long code, int type,
*/
if ((psp->ps_flags & SAS_ALTSTACK) && !oonstack &&
(psp->ps_sigonstack & sigmask(sig))) {
- fp = (struct linux_sigframe *)(psp->ps_sigstk.ss_sp +
+ fp = (struct linux_sigframe *)((char *)psp->ps_sigstk.ss_sp +
psp->ps_sigstk.ss_size - sizeof(struct linux_sigframe));
psp->ps_sigstk.ss_flags |= SS_ONSTACK;
} else {
diff --git a/sys/arch/i386/i386/mem.c b/sys/arch/i386/i386/mem.c
index 1643f68a649..b65b85a9ff1 100644
--- a/sys/arch/i386/i386/mem.c
+++ b/sys/arch/i386/i386/mem.c
@@ -1,5 +1,5 @@
/* $NetBSD: mem.c,v 1.31 1996/05/03 19:42:19 christos Exp $ */
-/* $OpenBSD: mem.c,v 1.31 2006/09/19 11:06:33 jsg Exp $ */
+/* $OpenBSD: mem.c,v 1.32 2006/12/29 13:04:37 pedro Exp $ */
/*
* Copyright (c) 1988 University of Utah.
* Copyright (c) 1982, 1986, 1990, 1993
@@ -194,7 +194,7 @@ mmrw(dev_t dev, struct uio *uio, int flags)
default:
return (ENXIO);
}
- iov->iov_base += c;
+ (char *)iov->iov_base += c;
iov->iov_len -= c;
uio->uio_offset += c;
uio->uio_resid -= c;
diff --git a/sys/arch/i386/i386/svr4_machdep.c b/sys/arch/i386/i386/svr4_machdep.c
index 001b7ec6287..d4d77930505 100644
--- a/sys/arch/i386/i386/svr4_machdep.c
+++ b/sys/arch/i386/i386/svr4_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: svr4_machdep.c,v 1.24 2006/09/19 11:06:33 jsg Exp $ */
+/* $OpenBSD: svr4_machdep.c,v 1.25 2006/12/29 13:04:37 pedro Exp $ */
/* $NetBSD: svr4_machdep.c,v 1.24 1996/05/03 19:42:26 christos Exp $ */
/*
@@ -323,7 +323,7 @@ svr4_sendsig(sig_t catcher, int sig, int mask, u_long code, int type,
*/
if ((psp->ps_flags & SAS_ALTSTACK) && !oonstack &&
(psp->ps_sigonstack & sigmask(sig))) {
- fp = (struct svr4_sigframe *)(psp->ps_sigstk.ss_sp +
+ fp = (struct svr4_sigframe *)((char *)psp->ps_sigstk.ss_sp +
psp->ps_sigstk.ss_size - sizeof(struct svr4_sigframe));
psp->ps_sigstk.ss_flags |= SS_ONSTACK;
} else {
diff --git a/sys/arch/i386/isa/isa_machdep.c b/sys/arch/i386/isa/isa_machdep.c
index 7fd9125e29b..cbe72d2b01f 100644
--- a/sys/arch/i386/isa/isa_machdep.c
+++ b/sys/arch/i386/isa/isa_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isa_machdep.c,v 1.56 2006/11/11 21:47:52 kettenis Exp $ */
+/* $OpenBSD: isa_machdep.c,v 1.57 2006/12/29 13:04:37 pedro Exp $ */
/* $NetBSD: isa_machdep.c,v 1.22 1997/06/12 23:57:32 thorpej Exp $ */
#define ISA_DMA_STATS
@@ -951,7 +951,7 @@ _isa_bus_dmamap_sync(bus_dma_tag_t t, bus_dmamap_t map, bus_addr_t offset,
* caller's buffer to the bounce buffer.
*/
if (cookie->id_flags & ID_IS_BOUNCING)
- bcopy(cookie->id_origbuf + offset,
+ bcopy((char *)cookie->id_origbuf + offset,
cookie->id_bouncebuf + offset,
len);
break;
@@ -962,7 +962,7 @@ _isa_bus_dmamap_sync(bus_dma_tag_t t, bus_dmamap_t map, bus_addr_t offset,
* bounce buffer to the caller's buffer.
*/
if (cookie->id_flags & ID_IS_BOUNCING)
- bcopy(cookie->id_bouncebuf + offset,
+ bcopy((char *)cookie->id_bouncebuf + offset,
cookie->id_origbuf + offset,
len);
break;
diff --git a/sys/compat/ibcs2/ibcs2_exec.c b/sys/compat/ibcs2/ibcs2_exec.c
index e27b4b52359..1649bbb29b0 100644
--- a/sys/compat/ibcs2/ibcs2_exec.c
+++ b/sys/compat/ibcs2/ibcs2_exec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ibcs2_exec.c,v 1.17 2003/11/18 06:26:15 tedu Exp $ */
+/* $OpenBSD: ibcs2_exec.c,v 1.18 2006/12/29 13:04:37 pedro Exp $ */
/* $NetBSD: ibcs2_exec.c,v 1.12 1996/10/12 02:13:52 thorpej Exp $ */
/*
@@ -131,7 +131,8 @@ exec_ibcs2_coff_makecmds(p, epp)
if (COFF_BADMAG(fp))
return ENOEXEC;
- ap = epp->ep_hdr + sizeof(struct coff_filehdr);
+ ap = (struct coff_aouthdr *)((char *)epp->ep_hdr +
+ sizeof(struct coff_filehdr));
switch (ap->a_magic) {
case COFF_OMAGIC:
error = exec_ibcs2_coff_prep_omagic(p, epp, fp, ap);
@@ -589,7 +590,7 @@ exec_ibcs2_xout_makecmds(p, epp)
if ((xp->x_renv & (XE_ABS | XE_VMOD)) || !(xp->x_renv & XE_EXEC))
return ENOEXEC;
- xep = epp->ep_hdr + sizeof(struct xexec);
+ xep = (struct xext *)((char *)epp->ep_hdr + sizeof(struct xexec));
#ifdef notyet
if (xp->x_renv & XE_PURE)
error = exec_ibcs2_xout_prep_zmagic(p, epp, xp, xep);
diff --git a/sys/crypto/criov.c b/sys/crypto/criov.c
index cd1b5c41d8c..a2ca3e9d55c 100644
--- a/sys/crypto/criov.c
+++ b/sys/crypto/criov.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: criov.c,v 1.15 2006/11/19 22:13:47 jmc Exp $ */
+/* $OpenBSD: criov.c,v 1.16 2006/12/29 13:04:37 pedro Exp $ */
/*
* Copyright (c) 1999 Theo de Raadt
@@ -71,11 +71,12 @@ cuio_copydata(struct uio *uio, int off, int len, caddr_t cp)
}
void
-cuio_copyback(struct uio *uio, int off, int len, const void *cp)
+cuio_copyback(struct uio *uio, int off, int len, const void *_cp)
{
struct iovec *iov = uio->uio_iov;
int iol = uio->uio_iovcnt;
unsigned count;
+ caddr_t cp = (caddr_t)_cp;
if (off < 0)
panic("cuio_copyback: off %d < 0", off);
@@ -157,7 +158,8 @@ cuio_apply(struct uio *uio, int off, int len,
ind, uio->uio_iovcnt);
count = min(uio->uio_iov[ind].iov_len - off, len);
- rval = f(fstate, uio->uio_iov[ind].iov_base + off, count);
+ rval = f(fstate, (char *)uio->uio_iov[ind].iov_base + off,
+ count);
if (rval)
return (rval);
diff --git a/sys/crypto/cryptosoft.c b/sys/crypto/cryptosoft.c
index a96a317dd71..470d2c73ca0 100644
--- a/sys/crypto/cryptosoft.c
+++ b/sys/crypto/cryptosoft.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cryptosoft.c,v 1.45 2005/05/25 05:47:53 markus Exp $ */
+/* $OpenBSD: cryptosoft.c,v 1.46 2006/12/29 13:04:37 pedro Exp $ */
/*
* The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
@@ -330,7 +330,7 @@ swcr_encdec(struct cryptodesc *crd, struct swcr_data *sw, caddr_t buf,
* we only use it in the while() loop, only if
* there are indeed enough data.
*/
- idat = uio->uio_iov[ind].iov_base + k;
+ idat = (char *)uio->uio_iov[ind].iov_base + k;
while (uio->uio_iov[ind].iov_len >= k + blks &&
i > 0) {
diff --git a/sys/dev/ic/twe.c b/sys/dev/ic/twe.c
index dfe26330469..b17721ef9a1 100644
--- a/sys/dev/ic/twe.c
+++ b/sys/dev/ic/twe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: twe.c,v 1.26 2006/11/28 23:59:45 dlg Exp $ */
+/* $OpenBSD: twe.c,v 1.27 2006/12/29 13:04:37 pedro Exp $ */
/*
* Copyright (c) 2000-2002 Michael Shalayeff. All rights reserved.
@@ -185,7 +185,7 @@ twe_attach(sc)
pa = sc->sc_cmdmap->dm_segs[0].ds_addr +
sizeof(struct twe_cmd) * (TWE_MAXCMDS - 1);
- for (cmd = sc->sc_cmds + sizeof(struct twe_cmd) * (TWE_MAXCMDS - 1);
+ for (cmd = (struct twe_cmd *)sc->sc_cmds + TWE_MAXCMDS - 1;
cmd >= (struct twe_cmd *)sc->sc_cmds; cmd--, pa -= sizeof(*cmd)) {
cmd->cmd_index = cmd - (struct twe_cmd *)sc->sc_cmds;
diff --git a/sys/dev/isa/sbdsp.c b/sys/dev/isa/sbdsp.c
index 6f56edfc746..37eb608932c 100644
--- a/sys/dev/isa/sbdsp.c
+++ b/sys/dev/isa/sbdsp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbdsp.c,v 1.24 2005/04/15 13:05:14 mickey Exp $ */
+/* $OpenBSD: sbdsp.c,v 1.25 2006/12/29 13:04:37 pedro Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -1238,8 +1238,8 @@ sbdsp_trigger_input(addr, start, end, blksize, intr, arg, param)
DPRINTF(("sbdsp: dma start loop input start=%p end=%p chan=%d\n",
start, end, sc->sc_i.dmachan));
- isa_dmastart(sc->sc_isa, sc->sc_i.dmachan, start, end - start,
- NULL, DMAMODE_READ | DMAMODE_LOOP, BUS_DMA_NOWAIT);
+ isa_dmastart(sc->sc_isa, sc->sc_i.dmachan, start, (char *)end -
+ (char *)start, NULL, DMAMODE_READ | DMAMODE_LOOP, BUS_DMA_NOWAIT);
return sbdsp_block_input(addr);
}
@@ -1373,8 +1373,8 @@ sbdsp_trigger_output(addr, start, end, blksize, intr, arg, param)
DPRINTF(("sbdsp: dma start loop output start=%p end=%p chan=%d\n",
start, end, sc->sc_o.dmachan));
- isa_dmastart(sc->sc_isa, sc->sc_o.dmachan, start, end - start,
- NULL, DMAMODE_WRITE | DMAMODE_LOOP, BUS_DMA_NOWAIT);
+ isa_dmastart(sc->sc_isa, sc->sc_o.dmachan, start, (char *)end -
+ (char *)start, NULL, DMAMODE_WRITE | DMAMODE_LOOP, BUS_DMA_NOWAIT);
return sbdsp_block_output(addr);
}
diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c
index 3be479ca428..c2a434eaffc 100644
--- a/sys/dev/pci/auich.c
+++ b/sys/dev/pci/auich.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auich.c,v 1.62 2006/08/19 19:06:51 brad Exp $ */
+/* $OpenBSD: auich.c,v 1.63 2006/12/29 13:04:37 pedro Exp $ */
/*
* Copyright (c) 2000,2001 Michael Shalayeff
@@ -1312,7 +1312,7 @@ auich_trigger_output(v, start, end, blksize, intr, arg, param)
*/
sc->pcmo_start = p->segs->ds_addr;
sc->pcmo_p = sc->pcmo_start + blksize;
- sc->pcmo_end = sc->pcmo_start + (end - start);
+ sc->pcmo_end = sc->pcmo_start + ((char *)end - (char *)start);
sc->pcmo_blksize = blksize;
q = sc->dmap_pcmo = sc->dmalist_pcmo;
@@ -1363,7 +1363,7 @@ auich_trigger_input(v, start, end, blksize, intr, arg, param)
*/
sc->pcmi_start = p->segs->ds_addr;
sc->pcmi_p = sc->pcmi_start + blksize;
- sc->pcmi_end = sc->pcmi_start + (end - start);
+ sc->pcmi_end = sc->pcmi_start + ((char *)end - (char *)start);
sc->pcmi_blksize = blksize;
q = sc->dmap_pcmi = sc->dmalist_pcmi;
diff --git a/sys/dev/pci/bktr/bktr_core.c b/sys/dev/pci/bktr/bktr_core.c
index df3668a329e..ac9eb62ce7e 100644
--- a/sys/dev/pci/bktr/bktr_core.c
+++ b/sys/dev/pci/bktr/bktr_core.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bktr_core.c,v 1.19 2006/01/20 18:14:17 millert Exp $ */
+/* $OpenBSD: bktr_core.c,v 1.20 2006/12/29 13:04:37 pedro Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp $ */
/*
@@ -2878,7 +2878,7 @@ rgb_vbi_prog(bktr_ptr_t bktr, char i_flag, int cols, int rows, int interlace )
*dma_prog++ = (u_int )vtophys(loop_point) ;
#else
*dma_prog++ = htole32(bktr->dm_prog->dm_segs->ds_addr +
- ((void *)loop_point - (void *)bktr->dma_prog));
+ ((char *)loop_point - (char *)bktr->dma_prog));
#endif
*dma_prog++ = htole32(0); /* NULL WORD */
diff --git a/sys/dev/pci/maestro.c b/sys/dev/pci/maestro.c
index 1a6174fa28a..d8e1863a137 100644
--- a/sys/dev/pci/maestro.c
+++ b/sys/dev/pci/maestro.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: maestro.c,v 1.20 2006/10/01 21:46:33 espie Exp $ */
+/* $OpenBSD: maestro.c,v 1.21 2006/12/29 13:04:37 pedro Exp $ */
/* $FreeBSD: /c/ncvs/src/sys/dev/sound/pci/maestro.c,v 1.3 2000/11/21 12:22:11 julian Exp $ */
/*
* FreeBSD's ESS Agogo/Maestro driver
@@ -1300,7 +1300,7 @@ maestro_trigger_output(hdl, start, end, blksize, intr, arg, param)
struct maestro_softc *sc = (struct maestro_softc *)hdl;
u_int offset = ((caddr_t)start - sc->dmabase) >> 1;
- u_int size = (end - start) >> 1;
+ u_int size = ((char *)end - (char *)start) >> 1;
sc->play.mode |= MAESTRO_RUNNING;
sc->play.wpwa = APU_USE_SYSMEM | (offset >> 8);
DPRINTF(("maestro_trigger_output: start=%x, end=%x, blksize=%x ",
diff --git a/sys/dev/pci/ubsec.c b/sys/dev/pci/ubsec.c
index 3749c19a85e..404a1cdff7e 100644
--- a/sys/dev/pci/ubsec.c
+++ b/sys/dev/pci/ubsec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ubsec.c,v 1.137 2006/06/29 21:34:51 deraadt Exp $ */
+/* $OpenBSD: ubsec.c,v 1.138 2006/12/29 13:04:37 pedro Exp $ */
/*
* Copyright (c) 2000 Jason L. Wright (jason@thought.net)
@@ -493,7 +493,7 @@ ubsec_feed(struct ubsec_softc *sc)
SIMPLEQ_REMOVE_HEAD(&sc->sc_queue, q_next);
--sc->sc_nqueue;
- v = ((void *)&q2->q_dma->d_dma->d_mcr) + sizeof(struct ubsec_mcr) -
+ v = ((char *)&q2->q_dma->d_dma->d_mcr) + sizeof(struct ubsec_mcr) -
sizeof(struct ubsec_mcr_add);
bcopy(v, &q->q_dma->d_dma->d_mcradd[i], sizeof(struct ubsec_mcr_add));
q->q_stacked_mcr[i] = q2;
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index b1f367fd4e0..7bb6d23ff28 100644
--- a/sys/isofs/cd9660/cd9660_vnops.c
+++ b/sys/isofs/cd9660/cd9660_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cd9660_vnops.c,v 1.36 2006/10/16 11:27:53 pedro Exp $ */
+/* $OpenBSD: cd9660_vnops.c,v 1.37 2006/12/29 13:04:37 pedro Exp $ */
/* $NetBSD: cd9660_vnops.c,v 1.42 1997/10/16 23:56:57 christos Exp $ */
/*-
@@ -831,7 +831,7 @@ cd9660_readlink(v)
return (error);
}
uio->uio_resid -= symlen;
- uio->uio_iov->iov_base += symlen;
+ (char *)uio->uio_iov->iov_base += symlen;
uio->uio_iov->iov_len -= symlen;
return (0);
}
diff --git a/sys/kern/exec_elf.c b/sys/kern/exec_elf.c
index c09aba62e95..a3e90d30f5f 100644
--- a/sys/kern/exec_elf.c
+++ b/sys/kern/exec_elf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec_elf.c,v 1.55 2006/11/14 18:00:27 jmc Exp $ */
+/* $OpenBSD: exec_elf.c,v 1.56 2006/12/29 13:04:37 pedro Exp $ */
/*
* Copyright (c) 1996 Per Fogelstrom
@@ -159,7 +159,7 @@ ELFNAME(copyargs)(struct exec_package *pack, struct ps_strings *arginfo,
*/
if (pack->ep_interp != NULL) {
pack->ep_emul_argp = stack;
- stack += ELF_AUX_ENTRIES * sizeof (AuxInfo);
+ (char *)stack += ELF_AUX_ENTRIES * sizeof (AuxInfo);
}
return (stack);
}
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 4320cf39cc3..1496a8d6442 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uipc_mbuf.c,v 1.78 2006/11/29 12:39:48 miod Exp $ */
+/* $OpenBSD: uipc_mbuf.c,v 1.79 2006/12/29 13:04:37 pedro Exp $ */
/* $NetBSD: uipc_mbuf.c,v 1.15.4.1 1996/06/13 17:11:44 cgd Exp $ */
/*
@@ -380,11 +380,12 @@ m_copydata(struct mbuf *m, int off, int len, caddr_t cp)
* including the setting of m_len.
*/
void
-m_copyback(struct mbuf *m0, int off, int len, const void *cp)
+m_copyback(struct mbuf *m0, int off, int len, const void *_cp)
{
int mlen;
struct mbuf *m = m0, *n;
int totlen = 0;
+ caddr_t cp = (caddr_t)_cp;
if (m0 == NULL)
return;
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index 6288fe1da0d..7f873996de4 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfs_subs.c,v 1.58 2006/11/01 00:12:35 thib Exp $ */
+/* $OpenBSD: nfs_subs.c,v 1.59 2006/12/29 13:04:37 pedro Exp $ */
/* $NetBSD: nfs_subs.c,v 1.27.4.3 1996/07/08 20:34:24 jtc Exp $ */
/*
@@ -778,7 +778,7 @@ nfsm_mbuftouio(mrep, uiop, siz, dpos)
uiop->uio_iovcnt--;
uiop->uio_iov++;
} else {
- uiop->uio_iov->iov_base += uiosiz;
+ (char *)uiop->uio_iov->iov_base += uiosiz;
uiop->uio_iov->iov_len -= uiosiz;
}
siz -= uiosiz;
@@ -857,7 +857,7 @@ nfsm_uiotombuf(uiop, mq, siz, bpos)
uiop->uio_offset += xfer;
uiop->uio_resid -= xfer;
}
- uiop->uio_iov->iov_base += uiosiz;
+ (char *)uiop->uio_iov->iov_base += uiosiz;
uiop->uio_iov->iov_len -= uiosiz;
siz -= uiosiz;
}
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index cf5a57cf63e..b85f0821420 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfs_vnops.c,v 1.68 2006/12/06 17:49:58 thib Exp $ */
+/* $OpenBSD: nfs_vnops.c,v 1.69 2006/12/29 13:04:37 pedro Exp $ */
/* $NetBSD: nfs_vnops.c,v 1.62.4.1 1996/07/08 20:26:52 jtc Exp $ */
/*
@@ -1086,7 +1086,7 @@ nfs_writerpc(vp, uiop, iomode, must_commit)
break;
} else if (rlen < len) {
backup = len - rlen;
- uiop->uio_iov->iov_base -= backup;
+ (char *)uiop->uio_iov->iov_base -= backup;
uiop->uio_iov->iov_len += backup;
uiop->uio_offset -= backup;
uiop->uio_resid += backup;
@@ -2183,7 +2183,7 @@ nfs_readdirrpc(struct vnode *vp,
if (blksiz == NFS_READDIRBLKSIZ)
blksiz = 0;
uiop->uio_resid -= NFS_DIRHDSIZ;
- uiop->uio_iov->iov_base += NFS_DIRHDSIZ;
+ (char *)uiop->uio_iov->iov_base += NFS_DIRHDSIZ;
uiop->uio_iov->iov_len -= NFS_DIRHDSIZ;
nfsm_mtouio(uiop, len);
cp = uiop->uio_iov->iov_base;
@@ -2231,7 +2231,7 @@ nfs_readdirrpc(struct vnode *vp,
if (blksiz > 0) {
left = NFS_READDIRBLKSIZ - blksiz;
dp->d_reclen += left;
- uiop->uio_iov->iov_base += left;
+ (char *)uiop->uio_iov->iov_base += left;
uiop->uio_iov->iov_len -= left;
uiop->uio_resid -= left;
}
@@ -2336,7 +2336,7 @@ nfs_readdirplusrpc(struct vnode *vp, struct uio *uiop, struct ucred *cred,
left = NFS_READDIRBLKSIZ - blksiz;
if ((tlen + NFS_DIRHDSIZ) > left) {
dp->d_reclen += left;
- uiop->uio_iov->iov_base += left;
+ (char *)uiop->uio_iov->iov_base += left;
uiop->uio_iov->iov_len -= left;
uiop->uio_resid -= left;
blksiz = 0;
@@ -2355,7 +2355,7 @@ nfs_readdirplusrpc(struct vnode *vp, struct uio *uiop, struct ucred *cred,
if (blksiz == NFS_READDIRBLKSIZ)
blksiz = 0;
uiop->uio_resid -= NFS_DIRHDSIZ;
- uiop->uio_iov->iov_base += NFS_DIRHDSIZ;
+ (char *)uiop->uio_iov->iov_base += NFS_DIRHDSIZ;
uiop->uio_iov->iov_len -= NFS_DIRHDSIZ;
cnp->cn_nameptr = uiop->uio_iov->iov_base;
cnp->cn_namelen = len;
@@ -2450,7 +2450,7 @@ nfs_readdirplusrpc(struct vnode *vp, struct uio *uiop, struct ucred *cred,
if (blksiz > 0) {
left = NFS_READDIRBLKSIZ - blksiz;
dp->d_reclen += left;
- uiop->uio_iov->iov_base += left;
+ (char *)uiop->uio_iov->iov_base += left;
uiop->uio_iov->iov_len -= left;
uiop->uio_resid -= left;
}
diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c
index 1e77ffda3d3..388bd1fa500 100644
--- a/sys/scsi/scsiconf.c
+++ b/sys/scsi/scsiconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsiconf.c,v 1.123 2006/11/28 23:59:45 dlg Exp $ */
+/* $OpenBSD: scsiconf.c,v 1.124 2006/12/29 13:04:37 pedro Exp $ */
/* $NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $ */
/*
@@ -869,12 +869,13 @@ bad:
* the patterns for the particular driver.
*/
const void *
-scsi_inqmatch(struct scsi_inquiry_data *inqbuf, const void *base, int nmatches,
- int matchsize, int *bestpriority)
+scsi_inqmatch(struct scsi_inquiry_data *inqbuf, const void *_base,
+ int nmatches, int matchsize, int *bestpriority)
{
u_int8_t type;
int removable;
const void *bestmatch;
+ const unsigned char *base = (const unsigned char *)_base;
/* Include the qualifier to catch vendor-unique types. */
type = inqbuf->device;
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index 0efa09d83e0..926a8f322b9 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ufs_vnops.c,v 1.72 2006/01/09 12:43:17 pedro Exp $ */
+/* $OpenBSD: ufs_vnops.c,v 1.73 2006/12/29 13:04:37 pedro Exp $ */
/* $NetBSD: ufs_vnops.c,v 1.18 1996/05/11 18:28:04 mycroft Exp $ */
/*
@@ -1556,7 +1556,8 @@ ufs_readdir(void *v)
panic("ufs_readdir: lost in space");
dpstart = (struct dirent *)
- (uio->uio_iov->iov_base - (uio->uio_offset - off));
+ ((char *)uio->uio_iov->iov_base -
+ (uio->uio_offset - off));
offstart = off;
for (dp = dpstart, ncookies = 0; off < uio->uio_offset; ) {
if (dp->d_reclen == 0)
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 05:20:39 +0000