From e78bad2371647f86416a7285ff4a0bcf7d9937ce Mon Sep 17 00:00:00 2001 From: Jeffrey Hsu Date: Tue, 20 Jun 1995 18:31:16 +0000 Subject: [PATCH] Don't cast void functions to void. Obtained from: NetBSD commit by jtc on June 16, 1995. --- lib/libc/gen/closedir.c | 4 ++-- lib/libc/gen/getcwd.c | 4 ++-- lib/libc/gen/getttyent.c | 2 +- lib/libc/gen/popen.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/libc/gen/closedir.c b/lib/libc/gen/closedir.c index 7e595e5c409e..3a4fc9de8bd2 100644 --- a/lib/libc/gen/closedir.c +++ b/lib/libc/gen/closedir.c @@ -53,8 +53,8 @@ closedir(dirp) fd = dirp->dd_fd; dirp->dd_fd = -1; dirp->dd_loc = 0; - (void)free((void *)dirp->dd_buf); - (void)free((void *)dirp); + free((void *)dirp->dd_buf); + free((void *)dirp); _reclaim_telldir(dirp); return(close(fd)); } diff --git a/lib/libc/gen/getcwd.c b/lib/libc/gen/getcwd.c index 2757d3b52b8e..fbd445d7dcca 100644 --- a/lib/libc/gen/getcwd.c +++ b/lib/libc/gen/getcwd.c @@ -128,7 +128,7 @@ getcwd(pt, size) * path to the beginning of the buffer, but it's always * been that way and stuff would probably break. */ - (void)bcopy(bpt, pt, ept - bpt); + bcopy(bpt, pt, ept - bpt); free(up); return (pt); } @@ -204,7 +204,7 @@ getcwd(pt, size) goto err; bpt = pt + off; ept = pt + ptsize; - (void)bcopy(bpt, ept - len, len); + bcopy(bpt, ept - len, len); bpt = ept - len; } if (!first) diff --git a/lib/libc/gen/getttyent.c b/lib/libc/gen/getttyent.c index f9b1e0d85477..83f97e8b96e5 100644 --- a/lib/libc/gen/getttyent.c +++ b/lib/libc/gen/getttyent.c @@ -178,7 +178,7 @@ setttyent() { if (tf) { - (void)rewind(tf); + rewind(tf); return (1); } else if (tf = fopen(_PATH_TTYS, "r")) return (1); diff --git a/lib/libc/gen/popen.c b/lib/libc/gen/popen.c index 4affdf4ae0a4..0b8bda554ca9 100644 --- a/lib/libc/gen/popen.c +++ b/lib/libc/gen/popen.c @@ -71,7 +71,7 @@ popen(program, type) return (NULL); if (pipe(pdes) < 0) { - (void)free(cur); + free(cur); return (NULL); } @@ -79,7 +79,7 @@ popen(program, type) case -1: /* Error. */ (void)close(pdes[0]); (void)close(pdes[1]); - (void)free(cur); + free(cur); return (NULL); /* NOTREACHED */ case 0: /* Child. */