diff options
author | Nicholas Marriott <nicm@openbsd.org> | 2012-07-10 11:53:01 +0000 |
---|---|---|
committer | Nicholas Marriott <nicm@openbsd.org> | 2012-07-10 11:53:01 +0000 |
commit | df912e3540968a2a0b266e523ecc08bb2dc0ca20 (patch) | |
tree | c2c59d025e08aab048b251d1711ed655cdf115f6 /grid.c | |
parent | a3391692ad5800ca034bbbdcd803924fc4e392ee (diff) | |
download | rtmux-df912e3540968a2a0b266e523ecc08bb2dc0ca20.tar.gz rtmux-df912e3540968a2a0b266e523ecc08bb2dc0ca20.tar.bz2 rtmux-df912e3540968a2a0b266e523ecc08bb2dc0ca20.zip |
xfree is not particularly helpful, remove it. From Thomas Adam.
Diffstat (limited to 'grid.c')
-rw-r--r-- | grid.c | 17 |
1 files changed, 7 insertions, 10 deletions
@@ -18,6 +18,7 @@ #include <sys/types.h> +#include <stdlib.h> #include <string.h> #include "tmux.h" @@ -98,15 +99,13 @@ grid_destroy(struct grid *gd) for (yy = 0; yy < gd->hsize + gd->sy; yy++) { gl = &gd->linedata[yy]; - if (gl->celldata != NULL) - xfree(gl->celldata); - if (gl->utf8data != NULL) - xfree(gl->utf8data); + free(gl->celldata); + free(gl->utf8data); } - xfree(gd->linedata); + free(gd->linedata); - xfree(gd); + free(gd); } /* Compare grids. */ @@ -373,10 +372,8 @@ grid_clear_lines(struct grid *gd, u_int py, u_int ny) for (yy = py; yy < py + ny; yy++) { gl = &gd->linedata[yy]; - if (gl->celldata != NULL) - xfree(gl->celldata); - if (gl->utf8data != NULL) - xfree(gl->utf8data); + free(gl->celldata); + free(gl->utf8data); memset(gl, 0, sizeof *gl); } } |