diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-09-26 14:39:45 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-09-26 14:39:45 -0700 |
commit | 1c2ea2cdc0e8c4e5af942c51b234c5af527944f6 (patch) | |
tree | 26554b52f6dcd97e2194c4b0c32106b6a2b72f92 /column.c | |
parent | b33000878a88b52816b97aeb88ba3677902ad277 (diff) | |
parent | 2756ca4347cbda05b16954cd7f445c216b935e76 (diff) | |
download | git-1c2ea2cdc0e8c4e5af942c51b234c5af527944f6.tar.gz git-1c2ea2cdc0e8c4e5af942c51b234c5af527944f6.tar.xz |
Merge branch 'rs/realloc-array'
Code cleanup.
* rs/realloc-array:
use REALLOC_ARRAY for changing the allocation size of arrays
add macro REALLOC_ARRAY
Diffstat (limited to 'column.c')
-rw-r--r-- | column.c | 6 |
1 files changed, 2 insertions, 4 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); |