mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-10 06:47:55 -08:00
Code

Simpliest memset(,0,) -> M_ZERO changes. One (caddr *) cast removal,

Browse Source 
otherwise just adding M_ZERO to malloc() and removing the immediately
adjacent memset(,0,).
This commit is contained in:
krw 2007-10-06 23:50:54 +00:00
parent 70d6abdc79
commit 184c547848
14 changed files with 36 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/arch/alpha/tc/tc_dma_3000_500.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: tc_dma_3000_500.c,v 1.2 2006/04/04 21:20:40 brad Exp $ */
/* $OpenBSD: tc_dma_3000_500.c,v 1.3 2007/10/06 23:50:54 krw Exp $ */
/* $NetBSD: tc_dma_3000_500.c,v 1.13 2001/07/19 06:40:03 thorpej Exp $ */
/*-
@ -94,10 +94,9 @@ tc_dma_init_3000_500(nslots)
/* Allocate per-slot DMA info. */
sisize = nslots * sizeof(struct tc_dma_slot_info);
tc_dma_slot_info = malloc(sisize, M_DEVBUF, M_NOWAIT);
tc_dma_slot_info = malloc(sisize, M_DEVBUF, M_NOWAIT | M_ZERO);
if (tc_dma_slot_info == NULL)
panic("tc_dma_init: can't allocate per-slot DMA info");
memset(tc_dma_slot_info, 0, sisize);
/* Default all slots to direct-mapped. */
for (i = 0; i < nslots; i++)

10
sys/arch/arm/arm/mem.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: mem.c,v 1.6 2006/11/29 13:28:45 miod Exp $ */
/* $OpenBSD: mem.c,v 1.7 2007/10/06 23:50:54 krw Exp $ */
/* $NetBSD: mem.c,v 1.11 2003/10/16 12:02:58 jdolecek Exp $ */
/*
@ -215,11 +215,9 @@ mmrw(dev, uio, flags)
uio->uio_resid = 0;
return (0);
}
if (zeropage == NULL) {
zeropage = (caddr_t)
malloc(PAGE_SIZE, M_TEMP, M_WAITOK);
memset(zeropage, 0, PAGE_SIZE);
}
if (zeropage == NULL)
zeropage = malloc(PAGE_SIZE, M_TEMP,
M_WAITOK | M_ZERO);
c = min(iov->iov_len, PAGE_SIZE);
error = uiomove(zeropage, c, uio);
break;

6
sys/arch/hppa/dev/apic.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: apic.c,v 1.6 2007/07/01 14:20:50 kettenis Exp $ */
/* $OpenBSD: apic.c,v 1.7 2007/10/06 23:50:54 krw Exp $ */
/*
* Copyright (c) 2005 Michael Shalayeff
@ -103,10 +103,10 @@ apic_attach(struct elroy_softc *sc)
printf(" APIC ver %x, %d pins",
data & APIC_VERSION_MASK, sc->sc_nints);
sc->sc_irq = malloc(sc->sc_nints * sizeof(int), M_DEVBUF, M_NOWAIT);
sc->sc_irq = malloc(sc->sc_nints * sizeof(int), M_DEVBUF,
M_NOWAIT | M_ZERO);
if (sc->sc_irq == NULL)
panic("apic_attach: cannot allocate irq table\n");
memset(sc->sc_irq, 0, sc->sc_nints * sizeof(int));
apic_get_int_tbl(sc);

6
sys/arch/hppa/dev/astro.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: astro.c,v 1.7 2007/07/01 12:53:52 kettenis Exp $ */
/* $OpenBSD: astro.c,v 1.8 2007/10/06 23:50:54 krw Exp $ */
/*
* Copyright (c) 2007 Mark Kettenis
@ -589,12 +589,10 @@ iommu_iomap_create(int n)
n = 16;
ims = malloc(sizeof(*ims) + (n - 1) * sizeof(ims->ims_map.ipm_map[0]),
M_DEVBUF, M_NOWAIT);
M_DEVBUF, M_NOWAIT | M_ZERO);
if (ims == NULL)
return (NULL);
memset(ims, 0, sizeof *ims);
/* Initialize the map. */
ims->ims_map.ipm_maxpage = n;
SPLAY_INIT(&ims->ims_map.ipm_tree);

9
sys/arch/sh/sh/mem.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: mem.c,v 1.2 2006/12/05 19:55:43 drahn Exp $ */
/* $OpenBSD: mem.c,v 1.3 2007/10/06 23:50:54 krw Exp $ */
/* $NetBSD: mem.c,v 1.21 2006/07/23 22:06:07 ad Exp $ */
/*
@ -193,10 +193,9 @@ mmrw(dev_t dev, struct uio *uio, int flags)
uio->uio_resid = 0;
return (0);
}
if (zeropage == NULL) {
zeropage = malloc(PAGE_SIZE, M_TEMP, M_WAITOK);
memset(zeropage, 0, PAGE_SIZE);
}
if (zeropage == NULL)
zeropage = malloc(PAGE_SIZE, M_TEMP,
M_WAITOK | M_ZERO);
c = min(iov->iov_len, PAGE_SIZE);
error = uiomove(zeropage, c, uio);
break;

5
sys/dev/pci/agp_amd.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: agp_amd.c,v 1.3 2007/08/04 19:40:25 reyk Exp $ */
/* $OpenBSD: agp_amd.c,v 1.4 2007/10/06 23:50:54 krw Exp $ */
/* $NetBSD: agp_amd.c,v 1.6 2001/10/06 02:48:50 thorpej Exp $ */
@ -162,13 +162,12 @@ agp_amd_attach(struct vga_pci_softc *sc, struct pci_attach_args *pa, struct pci_
pcireg_t reg;
int error;
asc = malloc(sizeof *asc, M_DEVBUF, M_NOWAIT);
asc = malloc(sizeof *asc, M_DEVBUF, M_NOWAIT | M_ZERO);
if (asc == NULL) {
printf(": can't allocate softc\n");
/* agp_generic_detach(sc) */
return (ENOMEM);
}
memset(asc, 0, sizeof *asc);
error = pci_mapreg_map(pchb_pa, AGP_AMD751_REGISTERS,
PCI_MAPREG_TYPE_MEM,0, &asc->iot, &asc->ioh, NULL, NULL, 0);

5
sys/dev/pci/agp_i810.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: agp_i810.c,v 1.16 2007/09/17 01:33:33 krw Exp $ */
/* $OpenBSD: agp_i810.c,v 1.17 2007/10/06 23:50:54 krw Exp $ */
/* $NetBSD: agp_i810.c,v 1.15 2003/01/31 00:07:39 thorpej Exp $ */
/*-
@ -116,12 +116,11 @@ agp_i810_attach(struct vga_pci_softc *sc, struct pci_attach_args *pa,
int error;
u_int memtype = 0;
isc = malloc(sizeof *isc, M_DEVBUF, M_NOWAIT);
isc = malloc(sizeof *isc, M_DEVBUF, M_NOWAIT | M_ZERO);
if (isc == NULL) {
printf(": can't allocate chipset-specific softc\n");
return (ENOMEM);
}
memset(isc, 0, sizeof *isc);
sc->sc_chipc = isc;
sc->sc_methods = &agp_i810_methods;
memcpy(&isc->bridge_pa, pchb_pa, sizeof *pchb_pa);

5
sys/dev/pci/agp_intel.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: agp_intel.c,v 1.4 2007/08/04 19:40:25 reyk Exp $ */
/* $OpenBSD: agp_intel.c,v 1.5 2007/10/06 23:50:54 krw Exp $ */
/* $NetBSD: agp_intel.c,v 1.3 2001/09/15 00:25:00 thorpej Exp $ */
/*-
@ -82,12 +82,11 @@ agp_intel_attach(struct vga_pci_softc *sc, struct pci_attach_args *pa,
struct agp_gatt *gatt;
pcireg_t reg;
isc = malloc(sizeof *isc, M_DEVBUF, M_NOWAIT);
isc = malloc(sizeof *isc, M_DEVBUF, M_NOWAIT | M_ZERO);
if (isc == NULL) {
printf(": can't allocate chipset-specific softc\n");
return (ENOMEM);
}
memset(isc, 0, sizeof *isc);
sc->sc_methods = &agp_intel_methods;
sc->sc_chipc = isc;

5
sys/dev/pci/agp_via.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: agp_via.c,v 1.3 2007/08/04 19:40:25 reyk Exp $ */
/* $OpenBSD: agp_via.c,v 1.4 2007/10/06 23:50:54 krw Exp $ */
/* $NetBSD: agp_via.c,v 1.2 2001/09/15 00:25:00 thorpej Exp $ */
/*-
@ -80,12 +80,11 @@ agp_via_attach(struct vga_pci_softc *sc, struct pci_attach_args *pa,
struct agp_via_softc *asc;
struct agp_gatt *gatt;
asc = malloc(sizeof *asc, M_DEVBUF, M_NOWAIT);
asc = malloc(sizeof *asc, M_DEVBUF, M_NOWAIT | M_ZERO);
if (asc == NULL) {
printf(": can't allocate chipset-specific softc\n");
return (ENOMEM);
}
memset(asc, 0, sizeof *asc);
sc->sc_chipc = asc;
sc->sc_methods = &agp_via_methods;

6
sys/dev/pci/cz.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: cz.c,v 1.9 2003/10/03 16:44:51 miod Exp $ */
/* $OpenBSD: cz.c,v 1.10 2007/10/06 23:50:54 krw Exp $ */
/* $NetBSD: cz.c,v 1.15 2001/01/20 19:10:36 thorpej Exp $ */
/*-
@ -389,10 +389,8 @@ cz_attach(parent, self, aux)
}
cz->cz_ports = malloc(sizeof(struct cztty_softc) * cz->cz_nchannels,
M_DEVBUF, M_WAITOK);
M_DEVBUF, M_WAITOK | M_ZERO);
cztty_attached_ttys += cz->cz_nchannels;
memset(cz->cz_ports, 0,
sizeof(struct cztty_softc) * cz->cz_nchannels);
for (i = 0; i < cz->cz_nchannels; i++) {
sc = &cz->cz_ports[i];

5
sys/dev/sequencer.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sequencer.c,v 1.14 2007/09/05 23:36:12 jakemsr Exp $ */
/* $OpenBSD: sequencer.c,v 1.15 2007/10/06 23:50:54 krw Exp $ */
/* $NetBSD: sequencer.c,v 1.13 1998/11/25 22:17:07 augustss Exp $ */
/*
@ -1041,9 +1041,8 @@ midiseq_open(int unit, int flags)
return (0);
sc = midi_cd.cd_devs[unit];
sc->seqopen = 1;
md = malloc(sizeof *md, M_DEVBUF, M_WAITOK);
md = malloc(sizeof *md, M_DEVBUF, M_WAITOK | M_ZERO);
sc->seq_md = md;
memset(md, 0, sizeof *md);
md->msc = sc;
midi_getinfo(makedev(0, unit), &mi);
md->unit = unit;

7
sys/dev/usb/umidi.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: umidi.c,v 1.22 2007/06/14 10:11:16 mbalmer Exp $ */
/* $OpenBSD: umidi.c,v 1.23 2007/10/06 23:50:55 krw Exp $ */
/* $NetBSD: umidi.c,v 1.16 2002/07/11 21:14:32 augustss Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -993,11 +993,10 @@ static usbd_status
alloc_all_mididevs(struct umidi_softc *sc, int nmidi)
{
sc->sc_num_mididevs = nmidi;
sc->sc_mididevs = malloc(sizeof(*sc->sc_mididevs)*nmidi,
M_USBDEV, M_WAITOK);
sc->sc_mididevs = malloc(sizeof(*sc->sc_mididevs)*nmidi, M_USBDEV,
M_WAITOK | M_ZERO);
if (!sc->sc_mididevs)
return USBD_NOMEM;
memset(sc->sc_mididevs, 0, sizeof(*sc->sc_mididevs)*nmidi);
return USBD_NORMAL_COMPLETION;
}

5
sys/dev/usb/usb_subr.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: usb_subr.c,v 1.60 2007/09/11 13:39:34 gilles Exp $ */
/* $OpenBSD: usb_subr.c,v 1.61 2007/10/06 23:50:55 krw Exp $ */
/* $NetBSD: usb_subr.c,v 1.103 2003/01/10 11:19:13 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
@ -976,10 +976,9 @@ usbd_new_device(struct device *parent, usbd_bus_handle bus, int depth,
return (USBD_NO_ADDR);
}
dev = malloc(sizeof *dev, M_USB, M_NOWAIT);
dev = malloc(sizeof *dev, M_USB, M_NOWAIT | M_ZERO);
if (dev == NULL)
return (USBD_NOMEM);
memset(dev, 0, sizeof *dev);
dev->bus = bus;

9
sys/ufs/ext2fs/ext2fs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ext2fs_vfsops.c,v 1.48 2007/06/17 20:15:25 jasper Exp $ */
/* $OpenBSD: ext2fs_vfsops.c,v 1.49 2007/10/06 23:50:55 krw Exp $ */
/* $NetBSD: ext2fs_vfsops.c,v 1.1 1997/06/11 09:34:07 bouyer Exp $ */
/*
@ -522,10 +522,9 @@ ext2fs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p)
error = ext2fs_checksb(fs, ronly);
if (error)
goto out;
ump = malloc(sizeof *ump, M_UFSMNT, M_WAITOK);
memset((caddr_t)ump, 0, sizeof *ump);
ump->um_e2fs = malloc(sizeof(struct m_ext2fs), M_UFSMNT, M_WAITOK);
memset((caddr_t)ump->um_e2fs, 0, sizeof(struct m_ext2fs));
ump = malloc(sizeof *ump, M_UFSMNT, M_WAITOK | M_ZERO);
ump->um_e2fs = malloc(sizeof(struct m_ext2fs), M_UFSMNT,
M_WAITOK | M_ZERO);
e2fs_sbload((struct ext2fs*)bp->b_data, &ump->um_e2fs->e2fs);
brelse(bp);
bp = NULL;