src/usr.bin/column/column.c - diff

Return to column.c CVS log

Up to [local] / src / usr.bin / column

version 1.9, 2003/06/10 22:20:45

version 1.10, 2003/09/26 22:24:09

Line 212

TBL *t;

int coloff, cnt;

char *p, **lp;

int *lens, maxcols;

int *lens, *lens2, maxcols;

TBL *tbl;

char **cols;

char **cols, **cols2;

t = tbl = emalloc(entries * sizeof(TBL));

cols = emalloc((maxcols = DEFCOLS) * sizeof(char *));

Line 223

for (coloff = 0, p = *lp; (cols[coloff] = strtok(p, separator));

p = NULL)

if (++coloff == maxcols) {

if (!(cols = realloc(cols, (u_int)maxcols +

if (!(cols2 = realloc(cols, (u_int)maxcols +

DEFCOLS * sizeof(char *))) ||

!(lens = realloc(lens,

!(lens2 = realloc(lens,

(u_int)maxcols + DEFCOLS * sizeof(int))))

err(1, NULL);

cols = cols2;

lens = lens2;

memset((char *)lens + maxcols * sizeof(int),

0, DEFCOLS * sizeof(int));

maxcols += DEFCOLS;