diff options
Diffstat (limited to 'column.c')
| -rw-r--r-- | column.c | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -81,8 +81,7 @@ static void compute_column_width(struct column_data *data) */ static void shrink_columns(struct column_data *data) { - data->width = xrealloc(data->width, - sizeof(*data->width) * data->cols); + REALLOC_ARRAY(data->width, data->cols); while (data->rows > 1) { int x, total_width, cols, rows; rows = data->rows; @@ -91,8 +90,7 @@ static void shrink_columns(struct column_data *data) data->rows--; data->cols = DIV_ROUND_UP(data->list->nr, data->rows); if (data->cols != cols) - data->width = xrealloc(data->width, - sizeof(*data->width) * data->cols); + REALLOC_ARRAY(data->width, data->cols); compute_column_width(data); total_width = strlen(data->opts.indent); @@ -367,7 +365,7 @@ int parseopt_column_callback(const struct option *opt, } static int fd_out = -1; -static struct child_process column_process; +static struct child_process column_process = CHILD_PROCESS_INIT; int run_column_filter(int colopts, const struct column_options *opts) { @@ -376,7 +374,7 @@ int run_column_filter(int colopts, const struct column_options *opts) if (fd_out != -1) return -1; - memset(&column_process, 0, sizeof(column_process)); + child_process_init(&column_process); argv = &column_process.args; argv_array_push(argv, "column"); |