diff options
| author | sjg <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
| commit | 65145fa4c81da358fcbc3b650156dab705dfa34e (patch) | |
| tree | 55c065b6730aaac2afb6c29933ee6ec5fa4c4249 /usr.bin/column | |
| parent | 60ff4eb0dff94a04d75d0d52a3957aaaf5f8c693 (diff) | |
| parent | e6b664c390af88d4a87208bc042ce503da664c3b (diff) | |
| download | FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.zip FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.tar.gz | |
Merge sync of head
Diffstat (limited to 'usr.bin/column')
| -rw-r--r-- | usr.bin/column/column.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/column/column.c b/usr.bin/column/column.c index bc7aa32..b092deb 100644 --- a/usr.bin/column/column.c +++ b/usr.bin/column/column.c @@ -233,11 +233,11 @@ maketbl(void) wchar_t *last; if ((t = tbl = calloc(entries, sizeof(TBL))) == NULL) - err(1, (char *)NULL); + err(1, NULL); if ((cols = calloc((maxcols = DEFCOLS), sizeof(*cols))) == NULL) - err(1, (char *)NULL); + err(1, NULL); if ((lens = calloc(maxcols, sizeof(int))) == NULL) - err(1, (char *)NULL); + err(1, NULL); for (cnt = 0, lp = list; cnt < entries; ++cnt, ++lp, ++t) { for (coloff = 0, p = *lp; (cols[coloff] = wcstok(p, separator, &last)); @@ -253,9 +253,9 @@ maketbl(void) maxcols += DEFCOLS; } if ((t->list = calloc(coloff, sizeof(*t->list))) == NULL) - err(1, (char *)NULL); + err(1, NULL); if ((t->len = calloc(coloff, sizeof(int))) == NULL) - err(1, (char *)NULL); + err(1, NULL); for (t->cols = coloff; --coloff >= 0;) { t->list[coloff] = cols[coloff]; t->len[coloff] = width(cols[coloff]); @@ -284,7 +284,7 @@ input(FILE *fp) if (!list) if ((list = calloc((maxentry = DEFNUM), sizeof(*list))) == NULL) - err(1, (char *)NULL); + err(1, NULL); while (fgetws(buf, MAXLINELEN, fp)) { for (p = buf; *p && iswspace(*p); ++p); if (!*p) |
