diff options
| author | jmallett <jmallett@FreeBSD.org> | 2002-05-17 05:11:07 +0000 |
|---|---|---|
| committer | jmallett <jmallett@FreeBSD.org> | 2002-05-17 05:11:07 +0000 |
| commit | 0109c305458dc8e85d6497c140a58a9fce7df4f3 (patch) | |
| tree | cf78d7652b64bccf0e61a4cef6f041a454a5bc4c /usr.bin/paste | |
| parent | 17aec9648900d65e6dc437b556bfd7a2789ad9b9 (diff) | |
| download | FreeBSD-src-0109c305458dc8e85d6497c140a58a9fce7df4f3.zip FreeBSD-src-0109c305458dc8e85d6497c140a58a9fce7df4f3.tar.gz | |
Clean up malloc(3)'s argument. Remove casts which do nothing when we're
using sizeof() anyway. Use slightly more consistent (per-file) error
reporting for malloc(3) returning NULL. If "malloc failed" was being printed,
don't use err(3). If a NULL format is being used, use err(3). In one case
errx(3) was being used with strerror(3), so just use err(3).
Diffstat (limited to 'usr.bin/paste')
| -rw-r--r-- | usr.bin/paste/paste.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/paste/paste.c b/usr.bin/paste/paste.c index a910a36..ea75288 100644 --- a/usr.bin/paste/paste.c +++ b/usr.bin/paste/paste.c @@ -122,8 +122,8 @@ parallel(char **argv) char buf[_POSIX2_LINE_MAX + 1]; for (cnt = 0, head = NULL; (p = *argv); ++argv, ++cnt) { - if (!(lp = (LIST *)malloc((u_int)sizeof(LIST)))) - errx(1, "%s", strerror(ENOMEM)); + if ((lp = malloc(sizeof(LIST))) == NULL) + err(1, NULL); if (p[0] == '-' && !p[1]) lp->fp = stdin; else if (!(lp->fp = fopen(p, "r"))) |
