Oops. Forgot to do FREE -> free when I did MALLOC -> malloc.

11 files changed, 44 insertions, 44 deletions

diff --git a/sys/arch/mvme68k/dev/vs.c b/sys/arch/mvme68k/dev/vs.c
index e61f6050f74..00089708651 100644
--- a/sys/arch/mvme68k/dev/vs.c
+++ b/sys/arch/mvme68k/dev/vs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vs.c,v 1.21 2007/10/03 10:52:11 krw Exp $ */
+/*	$OpenBSD: vs.c,v 1.22 2007/10/06 02:18:38 krw Exp $ */
 
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
@@ -838,7 +838,7 @@ vs_dealloc_scatter_gather(sg)
 			vs_dealloc_scatter_gather(sg->down[i]);
 		}
 	}
-	FREE(sg, M_DEVBUF);
+	free(sg, M_DEVBUF);
 }
 
 void
diff --git a/sys/arch/mvme88k/dev/vs.c b/sys/arch/mvme88k/dev/vs.c
index 16b32a16720..21f511d1ef8 100644
--- a/sys/arch/mvme88k/dev/vs.c
+++ b/sys/arch/mvme88k/dev/vs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vs.c,v 1.65 2007/10/03 10:52:11 krw Exp $	*/
+/*	$OpenBSD: vs.c,v 1.66 2007/10/06 02:18:38 krw Exp $	*/
 
 /*
  * Copyright (c) 2004, Miodrag Vallat.
@@ -973,7 +973,7 @@ vs_dealloc_scatter_gather(M328_SG sg)
 			vs_dealloc_scatter_gather(sg->down[i]);
 		}
 	}
-	FREE(sg, M_DEVBUF);
+	free(sg, M_DEVBUF);
 }
 
 void
diff --git a/sys/arch/zaurus/dev/zaurus_flash.c b/sys/arch/zaurus/dev/zaurus_flash.c
index 0568ad4b720..a6b4ec29cd4 100644
--- a/sys/arch/zaurus/dev/zaurus_flash.c
+++ b/sys/arch/zaurus/dev/zaurus_flash.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: zaurus_flash.c,v 1.5 2007/10/03 10:52:11 krw Exp $	*/
+/*	$OpenBSD: zaurus_flash.c,v 1.6 2007/10/06 02:18:38 krw Exp $	*/
 
 /*
  * Copyright (c) 2005 Uwe Stuehler <uwe@openbsd.org>
@@ -749,7 +749,7 @@ zflash_safe_stop(struct zflash_softc *sc, dev_t dev)
 	sp = sc->sc_safe[part];
 	free(sp->sp_phyuse, M_DEVBUF);
 	free(sp->sp_logmap, M_DEVBUF);
-	FREE(sp, M_DEVBUF);
+	free(sp, M_DEVBUF);
 	sc->sc_safe[part] = NULL;
 }
 
diff --git a/sys/dev/ic/if_wi_hostap.c b/sys/dev/ic/if_wi_hostap.c
index 29e6412bafd..d0be03501ed 100644
--- a/sys/dev/ic/if_wi_hostap.c
+++ b/sys/dev/ic/if_wi_hostap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi_hostap.c,v 1.38 2007/10/03 10:52:11 krw Exp $	*/
+/*	$OpenBSD: if_wi_hostap.c,v 1.39 2007/10/06 02:18:38 krw Exp $	*/
 
 /*
  * Copyright (c) 2002
@@ -294,11 +294,11 @@ wihap_shutdown(struct wi_softc *sc)
 	    sta != TAILQ_END(&whi->sta_list); sta = next) {
 		timeout_del(&sta->tmo);
 		if (sc->sc_ic.ic_if.if_flags & IFF_DEBUG)
-			printf("wihap_shutdown: FREE(sta=%p)\n", sta);
+			printf("wihap_shutdown: free(sta=%p)\n", sta);
 		next = TAILQ_NEXT(sta, list);
 		if (sta->challenge)
 			FREE(sta->challenge, M_TEMP);
-		FREE(sta, M_DEVBUF);
+		free(sta, M_DEVBUF);
 	}
 	TAILQ_INIT(&whi->sta_list);
 
@@ -444,7 +444,7 @@ wihap_sta_delete(struct wihap_sta_info *sta)
 	LIST_REMOVE(sta, hash);
 	if (sta->challenge)
 		FREE(sta->challenge, M_TEMP);
-	FREE(sta, M_DEVBUF);
+	free(sta, M_DEVBUF);
 	whi->n_stations--;
 }
 
diff --git a/sys/isofs/udf/udf_vfsops.c b/sys/isofs/udf/udf_vfsops.c
index 3159d53f55b..c21bb9dedfb 100644
--- a/sys/isofs/udf/udf_vfsops.c
+++ b/sys/isofs/udf/udf_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udf_vfsops.c,v 1.24 2007/10/03 10:52:11 krw Exp $	*/
+/*	$OpenBSD: udf_vfsops.c,v 1.25 2007/10/06 02:18:38 krw Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Scott Long <scottl@freebsd.org>
@@ -393,7 +393,7 @@ bail:
 		free(ump->um_hashtbl, M_UDFMOUNT);
 
 	if (ump != NULL) {
-		FREE(ump, M_UDFMOUNT);
+		free(ump, M_UDFMOUNT);
 		mp->mnt_data = NULL;
 		mp->mnt_flag &= ~MNT_LOCAL;
 	}
@@ -439,7 +439,7 @@ udf_unmount(struct mount *mp, int mntflags, struct proc *p)
 	if (ump->um_hashtbl != NULL)
 		free(ump->um_hashtbl, M_UDFMOUNT);
 
-	FREE(ump, M_UDFMOUNT);
+	free(ump, M_UDFMOUNT);
 
 	mp->mnt_data = (qaddr_t)0;
 	mp->mnt_flag &= ~MNT_LOCAL;
diff --git a/sys/msdosfs/msdosfs_denode.c b/sys/msdosfs/msdosfs_denode.c
index 9b663546c82..5a43b4ccec5 100644
--- a/sys/msdosfs/msdosfs_denode.c
+++ b/sys/msdosfs/msdosfs_denode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_denode.c,v 1.33 2007/10/03 10:52:11 krw Exp $	*/
+/*	$OpenBSD: msdosfs_denode.c,v 1.34 2007/10/06 02:18:38 krw Exp $	*/
 /*	$NetBSD: msdosfs_denode.c,v 1.23 1997/10/17 11:23:58 ws Exp $	*/
 
 /*-
@@ -615,7 +615,7 @@ msdosfs_reclaim(v)
 #if 0 /* XXX */
 	dep->de_flag = 0;
 #endif
-	FREE(dep, M_MSDOSFSNODE);
+	free(dep, M_MSDOSFSNODE);
 	vp->v_data = NULL;
 	return (0);
 }
diff --git a/sys/netatalk/ddp_usrreq.c b/sys/netatalk/ddp_usrreq.c
index 284e03e9df4..6137596c059 100644
--- a/sys/netatalk/ddp_usrreq.c
+++ b/sys/netatalk/ddp_usrreq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ddp_usrreq.c,v 1.9 2007/10/03 10:52:11 krw Exp $	*/
+/*	$OpenBSD: ddp_usrreq.c,v 1.10 2007/10/06 02:18:38 krw Exp $	*/
 
 /*
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
@@ -525,7 +525,7 @@ at_pcbdetach( so, ddp )
 	ddp->ddp_next->ddp_prev = ddp->ddp_prev;
     }
 
-    FREE( ddp, M_PCB );
+    free( ddp, M_PCB );
 }
 
 /*
diff --git a/sys/netinet/ip_esp.c b/sys/netinet/ip_esp.c
index cfd1148b1d5..d4607b9e65d 100644
--- a/sys/netinet/ip_esp.c
+++ b/sys/netinet/ip_esp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_esp.c,v 1.101 2007/10/03 10:52:11 krw Exp $ */
+/*	$OpenBSD: ip_esp.c,v 1.102 2007/10/06 02:18:38 krw Exp $ */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -511,7 +511,7 @@ esp_input_cb(void *op)
 	m = (struct mbuf *) crp->crp_buf;
 	if (m == NULL) {
 		/* Shouldn't happen... */
-		FREE(tc, M_XDATA);
+		free(tc, M_XDATA);
 		crypto_freereq(crp);
 		espstat.esps_crypto++;
 		DPRINTF(("esp_input_cb(): bogus returned buffer from crypto\n"));
@@ -522,7 +522,7 @@ esp_input_cb(void *op)
 
 	tdb = gettdb(tc->tc_spi, &tc->tc_dst, tc->tc_proto);
 	if (tdb == NULL) {
-		FREE(tc, M_XDATA);
+		free(tc, M_XDATA);
 		espstat.esps_notdb++;
 		DPRINTF(("esp_input_cb(): TDB is expired while in crypto"));
 		error = EPERM;
@@ -540,7 +540,7 @@ esp_input_cb(void *op)
 			splx(s);
 			return crypto_dispatch(crp);
 		}
-		FREE(tc, M_XDATA);
+		free(tc, M_XDATA);
 		espstat.esps_noxform++;
 		DPRINTF(("esp_input_cb(): crypto error %d\n", crp->crp_etype));
 		error = crp->crp_etype;
@@ -562,7 +562,7 @@ esp_input_cb(void *op)
 
 			/* Verify authenticator */
 			if (bcmp(ptr, aalg, esph->authsize)) {
-				FREE(tc, M_XDATA);
+				free(tc, M_XDATA);
 				DPRINTF(("esp_input_cb(): authentication failed for packet in SA %s/%08x\n", ipsp_address(tdb->tdb_dst), ntohl(tdb->tdb_spi)));
 				espstat.esps_badauth++;
 				error = EACCES;
@@ -573,7 +573,7 @@ esp_input_cb(void *op)
 		/* Remove trailing authenticator */
 		m_adj(m, -(esph->authsize));
 	}
-	FREE(tc, M_XDATA);
+	free(tc, M_XDATA);
 
 	/* Replay window checking, if appropriate */
 	if ((tdb->tdb_wnd > 0) && (!(tdb->tdb_flags & TDBF_NOREPLAY))) {
@@ -1014,7 +1014,7 @@ esp_output_cb(void *op)
 	m = (struct mbuf *) crp->crp_buf;
 	if (m == NULL) {
 		/* Shouldn't happen... */
-		FREE(tc, M_XDATA);
+		free(tc, M_XDATA);
 		crypto_freereq(crp);
 		espstat.esps_crypto++;
 		DPRINTF(("esp_output_cb(): bogus returned buffer from "
@@ -1027,7 +1027,7 @@ esp_output_cb(void *op)
 
 	tdb = gettdb(tc->tc_spi, &tc->tc_dst, tc->tc_proto);
 	if (tdb == NULL) {
-		FREE(tc, M_XDATA);
+		free(tc, M_XDATA);
 		espstat.esps_notdb++;
 		DPRINTF(("esp_output_cb(): TDB is expired while in crypto\n"));
 		error = EPERM;
@@ -1043,14 +1043,14 @@ esp_output_cb(void *op)
 			splx(s);
 			return crypto_dispatch(crp);
 		}
-		FREE(tc, M_XDATA);
+		free(tc, M_XDATA);
 		espstat.esps_noxform++;
 		DPRINTF(("esp_output_cb(): crypto error %d\n",
 		    crp->crp_etype));
 		error = crp->crp_etype;
 		goto baddone;
 	}
-	FREE(tc, M_XDATA);
+	free(tc, M_XDATA);
 
 	/* Release crypto descriptors. */
 	crypto_freereq(crp);
diff --git a/sys/netinet/ip_ipcomp.c b/sys/netinet/ip_ipcomp.c
index 8f23dc0a906..2af0d22e61f 100644
--- a/sys/netinet/ip_ipcomp.c
+++ b/sys/netinet/ip_ipcomp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_ipcomp.c,v 1.21 2007/10/03 10:52:11 krw Exp $ */
+/* $OpenBSD: ip_ipcomp.c,v 1.22 2007/10/06 02:18:38 krw Exp $ */
 
 /*
  * Copyright (c) 2001 Jean-Jacques Bernard-Gundol (jj@wabbitt.org)
@@ -228,7 +228,7 @@ ipcomp_input_cb(op)
 	m = (struct mbuf *) crp->crp_buf;
 	if (m == NULL) {
 		/* Shouldn't happen... */
-		FREE(tc, M_XDATA);
+		free(tc, M_XDATA);
 		crypto_freereq(crp);
 		ipcompstat.ipcomps_crypto++;
 		DPRINTF(("ipcomp_input_cb(): bogus returned buffer from crypto\n"));
@@ -239,7 +239,7 @@ ipcomp_input_cb(op)
 
 	tdb = gettdb(tc->tc_spi, &tc->tc_dst, tc->tc_proto);
 	if (tdb == NULL) {
-		FREE(tc, M_XDATA);
+		free(tc, M_XDATA);
 		ipcompstat.ipcomps_notdb++;
 		DPRINTF(("ipcomp_input_cb(): TDB expired while in crypto"));
 		error = EPERM;
@@ -254,7 +254,7 @@ ipcomp_input_cb(op)
 	/* Hard expiration */
 	if ((tdb->tdb_flags & TDBF_BYTES) &&
 	    (tdb->tdb_cur_bytes >= tdb->tdb_exp_bytes)) {
-		FREE(tc, M_XDATA);
+		free(tc, M_XDATA);
 		pfkeyv2_expire(tdb, SADB_EXT_LIFETIME_HARD);
 		tdb_delete(tdb);
 		error = ENXIO;
@@ -276,14 +276,14 @@ ipcomp_input_cb(op)
 			splx(s);
 			return crypto_dispatch(crp);
 		}
-		FREE(tc, M_XDATA);
+		free(tc, M_XDATA);
 		ipcompstat.ipcomps_noxform++;
 		DPRINTF(("ipcomp_input_cb(): crypto error %d\n",
 		    crp->crp_etype));
 		error = crp->crp_etype;
 		goto baddone;
 	}
-	FREE(tc, M_XDATA);
+	free(tc, M_XDATA);
 
 	/* Length of data after processing */
 	clen = crp->crp_olen;
@@ -566,7 +566,7 @@ ipcomp_output_cb(cp)
 	m = (struct mbuf *) crp->crp_buf;
 	if (m == NULL) {
 		/* Shouldn't happen... */
-		FREE(tc, M_XDATA);
+		free(tc, M_XDATA);
 		crypto_freereq(crp);
 		ipcompstat.ipcomps_crypto++;
 		DPRINTF(("ipcomp_output_cb(): bogus returned buffer from "
@@ -578,7 +578,7 @@ ipcomp_output_cb(cp)
 
 	tdb = gettdb(tc->tc_spi, &tc->tc_dst, tc->tc_proto);
 	if (tdb == NULL) {
-		FREE(tc, M_XDATA);
+		free(tc, M_XDATA);
 		ipcompstat.ipcomps_notdb++;
 		DPRINTF(("ipcomp_output_cb(): TDB expired while in crypto\n"));
 		error = EPERM;
@@ -594,14 +594,14 @@ ipcomp_output_cb(cp)
 			splx(s);
 			return crypto_dispatch(crp);
 		}
-		FREE(tc, M_XDATA);
+		free(tc, M_XDATA);
 		ipcompstat.ipcomps_noxform++;
 		DPRINTF(("ipcomp_output_cb(): crypto error %d\n",
 		    crp->crp_etype));
 		error = crp->crp_etype;
 		goto baddone;
 	}
-	FREE(tc, M_XDATA);
+	free(tc, M_XDATA);
 
 	/* Check sizes. */
 	if (rlen < crp->crp_olen) {
diff --git a/sys/netnatm/natm_pcb.c b/sys/netnatm/natm_pcb.c
index e5f14669551..c054a78a63b 100644
--- a/sys/netnatm/natm_pcb.c
+++ b/sys/netnatm/natm_pcb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: natm_pcb.c,v 1.8 2007/10/03 10:52:11 krw Exp $	*/
+/*	$OpenBSD: natm_pcb.c,v 1.9 2007/10/06 02:18:39 krw Exp $	*/
 
 /*
  *
@@ -94,7 +94,7 @@ int op;
     if (npcb->npcb_inq) {
       npcb->npcb_flags = NPCB_DRAIN;	/* flag for distruction */
     } else {
-      FREE(npcb, M_PCB);		/* kill it! */
+      free(npcb, M_PCB);		/* kill it! */
     }
   }
 
diff --git a/sys/ntfs/ntfs_subr.c b/sys/ntfs/ntfs_subr.c
index bd2a5b8682d..3195769af7f 100644
--- a/sys/ntfs/ntfs_subr.c
+++ b/sys/ntfs/ntfs_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntfs_subr.c,v 1.12 2007/10/03 10:52:11 krw Exp $	*/
+/*	$OpenBSD: ntfs_subr.c,v 1.13 2007/10/06 02:18:39 krw Exp $	*/
 /*	$NetBSD: ntfs_subr.c,v 1.4 2003/04/10 21:37:32 jdolecek Exp $	*/
 
 /*-
@@ -513,7 +513,7 @@ ntfs_ntput(
 	}
 
 	vrele(ip->i_devvp);
-	FREE(ip, M_NTFSNTNODE);
+	free(ip, M_NTFSNTNODE);
 }
 
 /*
@@ -563,7 +563,7 @@ ntfs_freentvattr(vap)
 		if (vap->va_datap)
 			free(vap->va_datap, M_NTFSRDATA);
 	}
-	FREE(vap, M_NTFSNTVATTR);
+	free(vap, M_NTFSNTVATTR);
 }
 
 /*
@@ -626,7 +626,7 @@ ntfs_attrtontvattr(
 	ddprintf((", len: %d", vap->va_datalen));
 
 	if (error)
-		FREE(vap, M_NTFSNTVATTR);
+		free(vap, M_NTFSNTVATTR);
 	else
 		*rvapp = vap;
 
@@ -826,7 +826,7 @@ ntfs_frele(
 		FREE(fp->f_attrname, M_TEMP);
 	if (fp->f_dirblbuf)
 		FREE(fp->f_dirblbuf, M_NTFSDIR);
-	FREE(fp, M_NTFSFNODE);
+	free(fp, M_NTFSFNODE);
 	ntfs_ntrele(ip);
 }