aboutsummaryrefslogtreecommitdiff
path: root/grid.c
diff options
context:
space:
mode:
authorCraig Barnes <craigbarnes@protonmail.com>2020-08-08 19:34:30 +0000
committerCraig Barnes <craigbarnes@protonmail.com>2020-08-08 19:37:57 +0000
commit7a77958ba20c2b344be5e66e69e2f212a4bbf6b3 (patch)
treecdb8191177f5f9ca69ea7858f9543f36fcbcf616 /grid.c
parentchangelog: add birger to 'contributers' for the upcoming release (diff)
Convert most dynamic allocations to use functions from xmalloc.h
Diffstat (limited to 'grid.c')
-rw-r--r--grid.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/grid.c b/grid.c
index 4486393b..24a67903 100644
--- a/grid.c
+++ b/grid.c
@@ -8,6 +8,7 @@
#include "log.h"
#include "sixel.h"
#include "util.h"
+#include "xmalloc.h"
void
grid_swap_row(struct grid *grid, int row_a, int row_b)
@@ -28,16 +29,16 @@ grid_swap_row(struct grid *grid, int row_a, int row_b)
struct row *
grid_row_alloc(int cols, bool initialize)
{
- struct row *row = malloc(sizeof(*row));
+ struct row *row = xmalloc(sizeof(*row));
row->dirty = false;
row->linebreak = false;
if (initialize) {
- row->cells = calloc(cols, sizeof(row->cells[0]));
+ row->cells = xcalloc(cols, sizeof(row->cells[0]));
for (size_t c = 0; c < cols; c++)
row->cells[c].attrs.clean = 1;
} else
- row->cells = malloc(cols * sizeof(row->cells[0]));
+ row->cells = xmalloc(cols * sizeof(row->cells[0]));
return row;
}
@@ -65,7 +66,7 @@ grid_reflow(struct grid *grid, int new_rows, int new_cols,
int new_col_idx = 0;
int new_row_idx = 0;
- struct row **new_grid = calloc(new_rows, sizeof(new_grid[0]));
+ struct row **new_grid = xcalloc(new_rows, sizeof(new_grid[0]));
struct row *new_row = new_grid[new_row_idx];
assert(new_row == NULL);