diff options
| -rw-r--r-- | sys/arch/alpha/stand/boot/disk.c | 6 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/libsa/lf.c | 4 | ||||
| -rw-r--r-- | sys/arch/hppa64/stand/libsa/lf.c | 4 | ||||
| -rw-r--r-- | sys/arch/loongson/stand/boot/dev.c | 4 | ||||
| -rw-r--r-- | sys/arch/luna88k/stand/boot/sd.c | 4 | ||||
| -rw-r--r-- | sys/arch/sgi/stand/boot/diskio.c | 4 | ||||
| -rw-r--r-- | sys/arch/sparc/stand/common/dvma.c | 6 | ||||
| -rw-r--r-- | sys/arch/sparc64/stand/ofwboot/elf64_exec.c | 4 | ||||
| -rw-r--r-- | sys/arch/zaurus/stand/zboot/diskprobe.c | 4 |
9 files changed, 20 insertions, 20 deletions
diff --git a/sys/arch/alpha/stand/boot/disk.c b/sys/arch/alpha/stand/boot/disk.c index 2ad6b590749..5cc4a3dbb1b 100644 --- a/sys/arch/alpha/stand/boot/disk.c +++ b/sys/arch/alpha/stand/boot/disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disk.c,v 1.14 2014/07/12 18:44:41 tedu Exp $ */ +/* $OpenBSD: disk.c,v 1.15 2014/07/12 21:03:38 tedu Exp $ */ /* $NetBSD: disk.c,v 1.6 1997/04/06 08:40:33 cgd Exp $ */ /* @@ -156,7 +156,7 @@ diskopen(f, ctlr, unit, part) if (part >= lp->d_npartitions || DL_GETPSIZE(&lp->d_partitions[part]) == 0) { -bad: free(sc, sizeof(struct disk_softc), 0); +bad: free(sc, sizeof(struct disk_softc)); return (ENXIO); } return (0); @@ -170,7 +170,7 @@ diskclose(f) sc = f->f_devdata; (void)prom_close(sc->sc_fd); - free(sc, sizeof(struct disk_softc), 0); + free(sc, sizeof(struct disk_softc)); f->f_devdata = NULL; return (0); } diff --git a/sys/arch/hppa/stand/libsa/lf.c b/sys/arch/hppa/stand/libsa/lf.c index e70b005d80d..e23d9886c75 100644 --- a/sys/arch/hppa/stand/libsa/lf.c +++ b/sys/arch/hppa/stand/libsa/lf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lf.c,v 1.9 2014/07/12 18:44:41 tedu Exp $ */ +/* $OpenBSD: lf.c,v 1.10 2014/07/12 21:03:38 tedu Exp $ */ /* * Copyright (c) 1998-2004 Michael Shalayeff @@ -47,7 +47,7 @@ lfopen(struct open_file *f, ...) int lfclose(struct open_file *f) { - free(f->f_devdata, sizeof(struct hppa_dev), 0); + free(f->f_devdata, sizeof(struct hppa_dev)); f->f_devdata = NULL; return 0; } diff --git a/sys/arch/hppa64/stand/libsa/lf.c b/sys/arch/hppa64/stand/libsa/lf.c index 39050d9d1bf..f9ed65ea066 100644 --- a/sys/arch/hppa64/stand/libsa/lf.c +++ b/sys/arch/hppa64/stand/libsa/lf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lf.c,v 1.3 2014/07/12 18:44:41 tedu Exp $ */ +/* $OpenBSD: lf.c,v 1.4 2014/07/12 21:03:38 tedu Exp $ */ /* * Copyright (c) 2005 Michael Shalayeff @@ -38,7 +38,7 @@ lfopen(struct open_file *f, ...) int lfclose(struct open_file *f) { - free(f->f_devdata, sizeof(struct hppa_dev), 0); + free(f->f_devdata, sizeof(struct hppa_dev)); f->f_devdata = NULL; return 0; } diff --git a/sys/arch/loongson/stand/boot/dev.c b/sys/arch/loongson/stand/boot/dev.c index 1d92808e753..5cd6f192b53 100644 --- a/sys/arch/loongson/stand/boot/dev.c +++ b/sys/arch/loongson/stand/boot/dev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dev.c,v 1.6 2014/07/12 18:44:42 tedu Exp $ */ +/* $OpenBSD: dev.c,v 1.7 2014/07/12 21:03:38 tedu Exp $ */ /* * Copyright (c) 2010 Miodrag Vallat. @@ -160,7 +160,7 @@ pmon_ioclose(struct open_file *f) if (f->f_devdata != NULL) { pi = (struct pmon_iodata *)f->f_devdata; rc = pmon_close(pi->fd); - free(pi, sizeof *pi, 0); + free(pi, sizeof *pi); f->f_devdata = NULL; } else rc = 0; diff --git a/sys/arch/luna88k/stand/boot/sd.c b/sys/arch/luna88k/stand/boot/sd.c index 097188e7306..890fc7706da 100644 --- a/sys/arch/luna88k/stand/boot/sd.c +++ b/sys/arch/luna88k/stand/boot/sd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sd.c,v 1.4 2014/07/12 18:44:42 tedu Exp $ */ +/* $OpenBSD: sd.c,v 1.5 2014/07/12 21:03:38 tedu Exp $ */ /* $NetBSD: sd.c,v 1.5 2013/01/22 15:48:40 tsutsui Exp $ */ /* @@ -281,7 +281,7 @@ sdclose(struct open_file *f) { struct sd_softc *sc = f->f_devdata; - free(sc, sizeof *sc, 0); + free(sc, sizeof *sc); f->f_devdata = NULL; return 0; diff --git a/sys/arch/sgi/stand/boot/diskio.c b/sys/arch/sgi/stand/boot/diskio.c index 63b76cc35ea..0df8cf46f97 100644 --- a/sys/arch/sgi/stand/boot/diskio.c +++ b/sys/arch/sgi/stand/boot/diskio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diskio.c,v 1.8 2014/07/12 18:44:42 tedu Exp $ */ +/* $OpenBSD: diskio.c,v 1.9 2014/07/12 21:03:38 tedu Exp $ */ /* * Copyright (c) 2000 Opsycon AB (www.opsycon.se) @@ -125,7 +125,7 @@ int dioclose(struct open_file *f) { Bios_Close(((struct dio_softc *)f->f_devdata)->sc_fd); - free(f->f_devdata, sizeof(struct dio_softc), 0); + free(f->f_devdata, sizeof(struct dio_softc)); f->f_devdata = NULL; return (0); } diff --git a/sys/arch/sparc/stand/common/dvma.c b/sys/arch/sparc/stand/common/dvma.c index 0703791b693..bcdb33f944a 100644 --- a/sys/arch/sparc/stand/common/dvma.c +++ b/sys/arch/sparc/stand/common/dvma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dvma.c,v 1.6 2014/07/12 18:44:43 tedu Exp $ */ +/* $OpenBSD: dvma.c,v 1.7 2014/07/12 21:03:38 tedu Exp $ */ /* $NetBSD: dvma.c,v 1.2 1995/09/17 00:50:56 pk Exp $ */ /* * Copyright (c) 1995 Gordon W. Ross @@ -135,7 +135,7 @@ dvma_alloc(int len) return (dvma_mapin(mem, len)); } -extern void free(void *ptr, int len, 0); +extern void free(void *ptr, int len); void dvma_free(char *dvma, int len) { @@ -143,5 +143,5 @@ dvma_free(char *dvma, int len) mem = dvma_mapout(dvma, len); if (mem) - free(mem, len, 0); + free(mem, len); } diff --git a/sys/arch/sparc64/stand/ofwboot/elf64_exec.c b/sys/arch/sparc64/stand/ofwboot/elf64_exec.c index 647cfa9bb86..029249ce121 100644 --- a/sys/arch/sparc64/stand/ofwboot/elf64_exec.c +++ b/sys/arch/sparc64/stand/ofwboot/elf64_exec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: elf64_exec.c,v 1.5 2014/07/12 18:44:43 tedu Exp $ */ +/* $OpenBSD: elf64_exec.c,v 1.6 2014/07/12 21:03:38 tedu Exp $ */ /* $NetBSD: elfXX_exec.c,v 1.2 2001/08/15 20:08:15 eeh Exp $ */ /* @@ -171,7 +171,7 @@ elf64_exec(int fd, Elf_Ehdr *elf, u_int64_t *entryp, void **ssymp, void **esymp) elf->e_phnum = 0; bcopy(elf, addr, sizeof(Elf_Ehdr)); bcopy(shp, addr + sizeof(Elf_Ehdr), elf->e_shnum * sizeof(Elf_Shdr)); - free(shp, elf->e_shnum * sizeof(Elf_Shdr), 0); + free(shp, elf->e_shnum * sizeof(Elf_Shdr)); *ssymp = addr; /* diff --git a/sys/arch/zaurus/stand/zboot/diskprobe.c b/sys/arch/zaurus/stand/zboot/diskprobe.c index 9f04963575e..8abd24f805e 100644 --- a/sys/arch/zaurus/stand/zboot/diskprobe.c +++ b/sys/arch/zaurus/stand/zboot/diskprobe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diskprobe.c,v 1.4 2014/07/12 18:44:43 tedu Exp $ */ +/* $OpenBSD: diskprobe.c,v 1.5 2014/07/12 21:03:38 tedu Exp $ */ /* * Copyright (c) 1997 Tobias Weingartner @@ -74,7 +74,7 @@ hardprobe(void) bzero(dip, sizeof(*dip)); if (bios_getdiskinfo(order[i], &dip->bios_info) != NULL) { - free(dip, 0, 0); + free(dip, 0); continue; } |