diff options
| author | Kevin Lo <kevlo@FreeBSD.org> | 2015-03-31 15:03:58 +0000 |
|---|---|---|
| committer | Kevin Lo <kevlo@FreeBSD.org> | 2015-03-31 15:03:58 +0000 |
| commit | 18463c7749ca34aa42acd955858bd37d6f428620 (patch) | |
| tree | 9b658964246de91e4d6a3e3d2ac8c646177dfd6c /usr.bin/column | |
| parent | bf55a0034d8a4f2eed9a91a49bb1fb51d43906c5 (diff) | |
| download | src-test2-18463c7749ca34aa42acd955858bd37d6f428620.tar.gz src-test2-18463c7749ca34aa42acd955858bd37d6f428620.zip | |
Notes
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 bc7aa3261c06..b092deb0d95b 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) |