diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2020-08-09 08:54:39 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2020-08-09 08:54:39 +0000 |
| commit | 828a57c2011eb797a9a257d124d48c641b3cac89 (patch) | |
| tree | cb2539f90c8a1be1ae330c807997dfc2a98e9481 /grid.c | |
| parent | changelog: add birger to 'contributers' for the upcoming release (diff) | |
| parent | Handle allocation failures explicitly in *_init() functions (diff) | |
Merge branch 'xmalloc-conversion' into master
Diffstat (limited to 'grid.c')
| -rw-r--r-- | grid.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -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); |
