From 532ff13fb4421d8054550cfb4ee3ca983d82c2e3 Mon Sep 17 00:00:00 2001 From: mmcc Date: Mon, 9 Nov 2015 14:44:24 +0000 Subject: Remove xfree(). From Michael W. Bombardieri. ok ratchov@ --- usr.bin/aucat/aucat.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'usr.bin/aucat/aucat.c') diff --git a/usr.bin/aucat/aucat.c b/usr.bin/aucat/aucat.c index 19b231a18c7..4f3f525ac5a 100644 --- a/usr.bin/aucat/aucat.c +++ b/usr.bin/aucat/aucat.c @@ -214,7 +214,7 @@ slot_new(char *path, int mode, struct aparams *par, int hdr, if (!afile_open(&s->afile, path, hdr, mode == SIO_PLAY ? AFILE_FREAD : AFILE_FWRITE, par, rate, cmax - cmin + 1)) { - xfree(s); + free(s); return 0; } s->cmin = cmin; @@ -413,15 +413,13 @@ slot_del(struct slot *s) } #endif abuf_done(&s->buf); - if (s->resampbuf) - xfree(s->resampbuf); - if (s->convbuf) - xfree(s->convbuf); + free(s->resampbuf); + free(s->convbuf); } for (ps = &slot_list; *ps != s; ps = &(*ps)->next) ; /* nothing */ *ps = s->next; - xfree(s); + free(s); } static int @@ -672,9 +670,9 @@ dev_close(void) if (dev_mh) mio_close(dev_mh); if (dev_mode & SIO_PLAY) - xfree(dev_pbuf); + free(dev_pbuf); if (dev_mode & SIO_REC) - xfree(dev_rbuf); + free(dev_rbuf); } static void @@ -999,7 +997,7 @@ offline(void) slot_list_copy(todo, dev_pchan, dev_pbuf); slot_list_iodo(); } - xfree(dev_pbuf); + free(dev_pbuf); while (slot_list) slot_del(slot_list); return 1; @@ -1148,7 +1146,7 @@ playrec(char *dev, int mode, int bufsz, char *port) if (dev_pstate == DEV_START) dev_mmcstop(); - xfree(pfds); + free(pfds); dev_close(); while (slot_list) slot_del(slot_list); -- cgit v1.2.3