summaryrefslogtreecommitdiff
path: root/sys/arch/aviion
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2014-07-12 19:01:51 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2014-07-12 19:01:51 +0000
commit6a095d5cb1bc22d35425aac5a4666242140bdb87 (patch)
tree4f69645f8ae09a3a77eeec544a7ca02700a019bf /sys/arch/aviion
parentd8d41b4a03c62b64b16e2e4fe3dd5f26408b790c (diff)
revert bogus free changes in not kernel files. got a little trigger happy.
Diffstat (limited to 'sys/arch/aviion')
-rw-r--r--sys/arch/aviion/stand/a2coff/a2coff.c4
-rw-r--r--sys/arch/aviion/stand/boot/oaic.c4
-rw-r--r--sys/arch/aviion/stand/boot/oosiop.c6
-rw-r--r--sys/arch/aviion/stand/boot/scsi.c4
-rw-r--r--sys/arch/aviion/stand/boot/sd.c4
-rw-r--r--sys/arch/aviion/stand/vdmtool/vdmtool.c8
6 files changed, 15 insertions, 15 deletions
diff --git a/sys/arch/aviion/stand/a2coff/a2coff.c b/sys/arch/aviion/stand/a2coff/a2coff.c
index 6a2a3095d05..aa7edeed061 100644
--- a/sys/arch/aviion/stand/a2coff/a2coff.c
+++ b/sys/arch/aviion/stand/a2coff/a2coff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a2coff.c,v 1.12 2014/07/12 18:44:41 tedu Exp $ */
+/* $OpenBSD: a2coff.c,v 1.13 2014/07/12 19:01:49 tedu Exp $ */
/*
* Copyright (c) 2006, 2013, Miodrag Vallat
*
@@ -324,7 +324,7 @@ convert_elf(const char *infile, int infd, int outfd, Elf_Ehdr *ehdr)
last = n;
}
- free(phdr, 0);
+ free(phdr);
/*
* Fill ``data'' section.
diff --git a/sys/arch/aviion/stand/boot/oaic.c b/sys/arch/aviion/stand/boot/oaic.c
index e166c12e1df..e52ceee204d 100644
--- a/sys/arch/aviion/stand/boot/oaic.c
+++ b/sys/arch/aviion/stand/boot/oaic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: oaic.c,v 1.2 2014/07/12 18:44:41 tedu Exp $ */
+/* $OpenBSD: oaic.c,v 1.3 2014/07/12 19:01:49 tedu Exp $ */
/*
* Copyright (c) 2010, 2013 Miodrag Vallat.
@@ -225,7 +225,7 @@ oaic_attach(uint32_t addr, int id, int lun)
void
oaic_detach(void *cookie)
{
- free(cookie, sizeof(struct aic6250_softc), 0);
+ free(cookie, sizeof(struct aic6250_softc));
}
/*
diff --git a/sys/arch/aviion/stand/boot/oosiop.c b/sys/arch/aviion/stand/boot/oosiop.c
index 0757704e068..34dc9ab90cc 100644
--- a/sys/arch/aviion/stand/boot/oosiop.c
+++ b/sys/arch/aviion/stand/boot/oosiop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: oosiop.c,v 1.5 2014/07/12 18:44:41 tedu Exp $ */
+/* $OpenBSD: oosiop.c,v 1.6 2014/07/12 19:01:49 tedu Exp $ */
/* OpenBSD: oosiop.c,v 1.20 2013/10/09 18:22:06 miod Exp */
/* OpenBSD: oosiopvar.h,v 1.5 2011/04/03 12:42:36 krw Exp */
/* $NetBSD: oosiop.c,v 1.4 2003/10/29 17:45:55 tsutsui Exp $ */
@@ -214,8 +214,8 @@ oosiop_detach(void *cookie)
{
struct oosiop_softc *sc = cookie;
- free(sc->sc_scr, sizeof(oosiop_script), 0);
- free(sc, sizeof *sc, 0);
+ free(sc->sc_scr, sizeof(oosiop_script));
+ free(sc, sizeof *sc);
}
static __inline void
diff --git a/sys/arch/aviion/stand/boot/scsi.c b/sys/arch/aviion/stand/boot/scsi.c
index bd00afef27e..5bce368030c 100644
--- a/sys/arch/aviion/stand/boot/scsi.c
+++ b/sys/arch/aviion/stand/boot/scsi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsi.c,v 1.3 2014/07/12 18:44:41 tedu Exp $ */
+/* $OpenBSD: scsi.c,v 1.4 2014/07/12 19:01:49 tedu Exp $ */
/*
* Copyright (c) 2013 Miodrag Vallat.
@@ -93,7 +93,7 @@ scsi_initialize(const char *ctrlname, int ctrl, int unit, int lun, int part)
done:
if (priv->scsicookie == NULL) {
- free(priv, sizeof(struct scsi_private), 0);
+ free(priv, sizeof(struct scsi_private));
priv = NULL;
}
diff --git a/sys/arch/aviion/stand/boot/sd.c b/sys/arch/aviion/stand/boot/sd.c
index 2e01fae35d2..76246753eee 100644
--- a/sys/arch/aviion/stand/boot/sd.c
+++ b/sys/arch/aviion/stand/boot/sd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sd.c,v 1.6 2014/07/12 18:44:41 tedu Exp $ */
+/* $OpenBSD: sd.c,v 1.7 2014/07/12 19:01:49 tedu Exp $ */
/*
* Copyright (c) 2013 Miodrag Vallat.
@@ -92,7 +92,7 @@ sdclose(struct open_file *f)
priv = (struct scsi_private *)f->f_devdata;
if (priv->scsicookie != NULL)
(*priv->scsidetach)(priv->scsicookie);
- free(priv, sizeof(struct scsi_private), 0);
+ free(priv, sizeof(struct scsi_private));
f->f_devdata = NULL;
}
diff --git a/sys/arch/aviion/stand/vdmtool/vdmtool.c b/sys/arch/aviion/stand/vdmtool/vdmtool.c
index 9a22b6136f8..d4edac3224a 100644
--- a/sys/arch/aviion/stand/vdmtool/vdmtool.c
+++ b/sys/arch/aviion/stand/vdmtool/vdmtool.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vdmtool.c,v 1.3 2014/07/12 18:44:41 tedu Exp $ */
+/* $OpenBSD: vdmtool.c,v 1.4 2014/07/12 19:01:49 tedu Exp $ */
/*
* Copyright (c) 2013 Miodrag Vallat.
@@ -534,7 +534,7 @@ read_vdit(int fd, uint32_t secno, size_t *vditsize)
curbuf = append_vdit_portion(fd, secno, curbuf, sector,
first ? VDIT_BLOCK_HEAD_BE : VDIT_PORTION_HEADER_BLOCK);
if (curbuf == NULL) {
- free(buf, 0);
+ free(buf);
return NULL;
}
first = 0;
@@ -606,10 +606,10 @@ report(int fd)
}
if (memcmp(vdit, vdit2, vditsize) != 0)
printf("VDIT and backup VDIT differ!\n");
- free(vdit2, 0);
+ free(vdit2);
}
- free(vdit, 0);
+ free(vdit);
}
}