From 7a6e889600c7ec30a7ce212ebb5435c895624e17 Mon Sep 17 00:00:00 2001 From: cgd Date: Wed, 30 Mar 1994 02:28:43 +0000 Subject: [PATCH] kill bad casts --- usr.sbin/edquota/edquota.c | 6 +++--- usr.sbin/kgmon/kgmon.c | 6 +++--- usr.sbin/rarpd/rarpd.c | 4 ++-- usr.sbin/rmt/rmt.c | 4 ++-- usr.sbin/rwhod/rwhod.c | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c index 0d5d6e9905c0..507d905145f1 100644 --- a/usr.sbin/edquota/edquota.c +++ b/usr.sbin/edquota/edquota.c @@ -42,7 +42,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)edquota.c 5.15 (Berkeley) 9/27/90";*/ -static char rcsid[] = "$Id: edquota.c,v 1.2 1993/08/01 17:59:53 mycroft Exp $"; +static char rcsid[] = "$Id: edquota.c,v 1.3 1994/03/30 02:28:43 cgd Exp $"; #endif /* not lint */ /* @@ -249,7 +249,7 @@ getprivs(id, quotatype) getentry(quotagroup, GRPQUOTA)); (void) fchmod(fd, 0640); } - lseek(fd, (long)(id * sizeof(struct dqblk)), L_SET); + lseek(fd, id * sizeof(struct dqblk), L_SET); switch (read(fd, &qup->dqblk, sizeof(struct dqblk))) { case 0: /* EOF */ /* @@ -303,7 +303,7 @@ putprivs(id, quotatype, quplist) if ((fd = open(qup->qfname, O_WRONLY)) < 0) { perror(qup->qfname); } else { - lseek(fd, (long)id * (long)sizeof (struct dqblk), 0); + lseek(fd, id * sizeof (struct dqblk), 0); if (write(fd, &qup->dqblk, sizeof (struct dqblk)) != sizeof (struct dqblk)) { fprintf(stderr, "edquota: "); diff --git a/usr.sbin/kgmon/kgmon.c b/usr.sbin/kgmon/kgmon.c index 2fe7fc4ac072..21f00c1956e0 100644 --- a/usr.sbin/kgmon/kgmon.c +++ b/usr.sbin/kgmon/kgmon.c @@ -39,7 +39,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)kgmon.c 5.12 (Berkeley) 7/1/91";*/ -static char rcsid[] = "$Id: kgmon.c,v 1.2 1993/08/01 17:59:25 mycroft Exp $"; +static char rcsid[] = "$Id: kgmon.c,v 1.3 1994/03/30 02:32:15 cgd Exp $"; #endif /* not lint */ #include @@ -61,7 +61,7 @@ static char rcsid[] = "$Id: kgmon.c,v 1.2 1993/08/01 17:59:25 mycroft Exp $"; #define PROFILING_OFF 3 u_long s_textsize; -off_t sbuf, klseek(), lseek(); +off_t sbuf, klseek __P((int, off_t, int)); int ssiz; struct nlist nl[] = { @@ -322,7 +322,7 @@ resetstate() turnonoff(onoff) int onoff; { - (void)klseek(kmem, (long)nl[N_PROFILING].n_value, L_SET); + (void)klseek(kmem, (off_t)nl[N_PROFILING].n_value, L_SET); (void)write(kmem, (char *)&onoff, sizeof (onoff)); } diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c index 7e166d98b127..b047c8377946 100644 --- a/usr.sbin/rarpd/rarpd.c +++ b/usr.sbin/rarpd/rarpd.c @@ -26,7 +26,7 @@ char copyright[] = #ifndef lint static char rcsid[] = -"@(#) $Id: rarpd.c,v 1.4 1994/03/01 06:46:42 cgd Exp $"; +"@(#) $Id: rarpd.c,v 1.5 1994/03/30 02:32:50 cgd Exp $"; #endif @@ -422,7 +422,7 @@ rarp_loop() * lseek() to 0 will fix things. */ if (cc < 0) { if (errno == EINVAL && - (long) (lseek(fd, 0L, SEEK_CUR) + bufsize) < 0) { + (lseek(fd, 0, SEEK_CUR) + bufsize) < 0) { (void) lseek(fd, 0, 0); goto again; } diff --git a/usr.sbin/rmt/rmt.c b/usr.sbin/rmt/rmt.c index 5d7e396a20b7..dbe409d8d5c2 100644 --- a/usr.sbin/rmt/rmt.c +++ b/usr.sbin/rmt/rmt.c @@ -39,7 +39,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)rmt.c 5.6 (Berkeley) 6/1/90";*/ -static char rcsid[] = "$Id: rmt.c,v 1.3 1994/03/28 07:08:56 cgd Exp $"; +static char rcsid[] = "$Id: rmt.c,v 1.4 1994/03/30 02:33:23 cgd Exp $"; #endif /* not lint */ /* @@ -113,7 +113,7 @@ top: case 'L': getstring(count); getstring(pos); DEBUG2("rmtd: L %s %s\n", count, pos); - rval = lseek(tape, (long) atoi(count), atoi(pos)); + rval = lseek(tape, atoi(count), atoi(pos)); if (rval < 0) goto ioerror; goto respond; diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c index 98174bbf2acb..07e4ac867e91 100644 --- a/usr.sbin/rwhod/rwhod.c +++ b/usr.sbin/rwhod/rwhod.c @@ -39,7 +39,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)rwhod.c 5.20 (Berkeley) 3/2/91";*/ -static char rcsid[] = "$Id: rwhod.c,v 1.5 1994/03/28 07:10:40 cgd Exp $"; +static char rcsid[] = "$Id: rwhod.c,v 1.6 1994/03/30 02:34:03 cgd Exp $"; #endif /* not lint */ #include @@ -281,7 +281,7 @@ onalrm() goto done; } } - (void) lseek(utmpf, (long)0, L_SET); + (void) lseek(utmpf, 0, L_SET); cc = read(utmpf, (char *)utmp, stb.st_size); if (cc < 0) { fprintf(stderr, "rwhod: %s: %s\n", @@ -366,7 +366,7 @@ loop: syslog(LOG_ERR, "%s: %m", _PATH_KMEM); exit(1); } - (void) lseek(kmemf, (long)nl[NL_BOOTTIME].n_value, L_SET); + (void) lseek(kmemf, nl[NL_BOOTTIME].n_value, L_SET); (void) read(kmemf, (char *)&mywd.wd_boottime, sizeof (mywd.wd_boottime)); mywd.wd_boottime = htonl(mywd.wd_boottime);