delete many more ptr_t casts

9 files changed, 68 insertions, 68 deletions

diff --git a/bin/csh/csh.c b/bin/csh/csh.c
index c1d88b80c3a..52fdbfcbcfd 100644
--- a/bin/csh/csh.c
+++ b/bin/csh/csh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: csh.c,v 1.27 2015/01/16 06:39:31 deraadt Exp $	*/
+/*	$OpenBSD: csh.c,v 1.28 2015/02/08 05:51:37 tedu Exp $	*/
 /*	$NetBSD: csh.c,v 1.14 1995/04/29 23:21:28 mycroft Exp $	*/
 
 /*-
@@ -625,7 +625,7 @@ srccat(Char *cp, Char *dp)
     Char *ep = Strspl(cp, dp);
     char   *ptr = short2str(ep);
 
-    xfree((ptr_t) ep);
+    xfree(ep);
     return srcfile(ptr, mflag ? 0 : 1, 0);
 }
 
@@ -734,8 +734,8 @@ srcunit(int unit, bool onlyown, bool hflg)
 	/* We made it to the new state... free up its storage */
 	/* This code could get run twice but xfree doesn't care */
 	for (i = 0; i < fblocks; i++)
-	    xfree((ptr_t) fbuf[i]);
-	xfree((ptr_t) fbuf);
+	    xfree(fbuf[i]);
+	xfree(fbuf);
 
 	/* Reset input arena */
 	memcpy(&B, &saveB, sizeof(B));
@@ -1035,7 +1035,7 @@ process(bool catch)
 	    (void) fflush(cshout);
 	}
 	if (seterr) {
-	    xfree((ptr_t) seterr);
+	    xfree(seterr);
 	    seterr = NULL;
 	}
 
@@ -1115,7 +1115,7 @@ dosource(Char **v, struct command *t)
     (void) Strlcpy(buf, *v, sizeof buf/sizeof(Char));
     f = globone(buf, G_ERROR);
     (void) strlcpy(sbuf, short2str(f), sizeof sbuf);
-    xfree((ptr_t) f);
+    xfree(f);
     if (!srcfile(sbuf, 0, hflg) && !hflg)
 	stderror(ERR_SYSTEM, sbuf, strerror(errno));
 }
diff --git a/bin/csh/dir.c b/bin/csh/dir.c
index ce9eb6e0fc3..bdf299c8bdc 100644
--- a/bin/csh/dir.c
+++ b/bin/csh/dir.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dir.c,v 1.18 2015/01/16 06:39:31 deraadt Exp $	*/
+/*	$OpenBSD: dir.c,v 1.19 2015/02/08 05:51:37 tedu Exp $	*/
 /*	$NetBSD: dir.c,v 1.9 1995/03/21 09:02:42 cgd Exp $	*/
 
 /*-
@@ -299,7 +299,7 @@ dnormalize(Char *cp)
 	    cwd[dotdot = Strlen(cwd)] = '/';
 	    cwd[dotdot + 1] = '\0';
 	    dp = Strspl(cwd, cp);
-	    xfree((ptr_t) cwd);
+	    xfree(cwd);
 	    return dp;
 	}
 	else {
@@ -386,7 +386,7 @@ dgoto(Char *cp)
 	    p--;		/* don't add a / after root */
 	for (q = cp; (*p++ = *q++) != '\0';)
 	    continue;
-	xfree((ptr_t) cp);
+	xfree(cp);
 	cp = dp;
 	dp += cwdlen;
     }
@@ -414,11 +414,11 @@ dfollow(Char *cp)
      */
     dp = dnormalize(cp);
     if (chdir(short2str(dp)) >= 0) {
-	xfree((ptr_t) cp);
+	xfree(cp);
 	return dgoto(dp);
     }
     else {
-	xfree((ptr_t) dp);
+	xfree(dp);
 	if (chdir(short2str(cp)) >= 0)
 	    return dgoto(cp);
 	serrno = errno;
@@ -438,7 +438,7 @@ dfollow(Char *cp)
 		continue;
 	    if (chdir(short2str(buf)) >= 0) {
 		printd = 1;
-		xfree((ptr_t) cp);
+		xfree(cp);
 		cp = Strsave(buf);
 		return dgoto(cp);
 	    }
@@ -446,13 +446,13 @@ dfollow(Char *cp)
     }
     dp = value(cp);
     if ((dp[0] == '/' || dp[0] == '.') && chdir(short2str(dp)) >= 0) {
-	xfree((ptr_t) cp);
+	xfree(cp);
 	cp = Strsave(dp);
 	printd = 1;
 	return dgoto(cp);
     }
     (void) strlcpy(ebuf, short2str(cp), sizeof ebuf);
-    xfree((ptr_t) cp);
+    xfree(cp);
     stderror(ERR_SYSTEM, ebuf, strerror(serrno));
     return (NULL);
 }
@@ -594,7 +594,7 @@ dfree(struct directory *dp)
     }
     else {
 	xfree((char *) dp->di_name);
-	xfree((ptr_t) dp);
+	xfree(dp);
     }
 }
 
@@ -630,7 +630,7 @@ dcanon(Char *cp, Char *p)
 	(void) Strlcpy(tmpdir, p1, sizeof tmpdir/sizeof(Char));
 	(void) Strlcat(tmpdir, STRslash, sizeof tmpdir/sizeof(Char));
 	(void) Strlcat(tmpdir, cp, sizeof tmpdir/sizeof(Char));
-	xfree((ptr_t) cp);
+	xfree(cp);
 	cp = p = Strsave(tmpdir);
     }
 
@@ -735,7 +735,7 @@ dcanon(Char *cp, Char *p)
 		     */
 		    p = newcp;
 		}
-		xfree((ptr_t) cp);
+		xfree(cp);
 		cp = newcp;
 		continue;	/* canonicalize the link */
 	    }
@@ -824,7 +824,7 @@ dcanon(Char *cp, Char *p)
 		     */
 		    p = newcp;
 		}
-		xfree((ptr_t) cp);
+		xfree(cp);
 		cp = newcp;
 		continue;	/* canonicalize the link */
 	    }
@@ -879,7 +879,7 @@ dcanon(Char *cp, Char *p)
 	     * Use STRhome to make '~' work
 	     */
 	    newcp = Strspl(p1, cp + Strlen(p2));
-	    xfree((ptr_t) cp);
+	    xfree(cp);
 	    cp = newcp;
 	}
     }
diff --git a/bin/csh/dol.c b/bin/csh/dol.c
index a53c2dc764c..8a5fe14f4ea 100644
--- a/bin/csh/dol.c
+++ b/bin/csh/dol.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dol.c,v 1.18 2014/10/16 19:43:31 deraadt Exp $	*/
+/*	$OpenBSD: dol.c,v 1.19 2015/02/08 05:51:37 tedu Exp $	*/
 /*	$NetBSD: dol.c,v 1.8 1995/09/27 00:38:38 jtc Exp $	*/
 
 /*-
@@ -409,7 +409,7 @@ Dgetdol(void)
 	    stderror(ERR_SYNTAX);
 	if (backpid != 0) {
 	    if (dolbang)
-		xfree((ptr_t) dolbang);
+		xfree(dolbang);
 	    setDolp(dolbang = putn(backpid));
 	}
 	goto eatbrac;
@@ -595,7 +595,7 @@ Dgetdol(void)
 	Char   *cp = putn(upb - lwb + 1);
 
 	addla(cp);
-	xfree((ptr_t) cp);
+	xfree(cp);
     }
     else {
 eatmod:
@@ -718,7 +718,7 @@ setDolp(Char *cp)
 		    (void) Strlcat(np, rhsub, len);
 		    (void) Strlcat(np, dp + lhlen, len);
 
-		    xfree((ptr_t) cp);
+		    xfree(cp);
 		    dp = cp = np;
 		    didmod = 1;
 		} else {
@@ -742,12 +742,12 @@ setDolp(Char *cp)
 		if ((dp = domod(cp, dolmod[i]))) {
 		    didmod = 1;
 		    if (Strcmp(cp, dp) == 0) {
-			xfree((ptr_t) cp);
+			xfree(cp);
 			cp = dp;
 			break;
 		    }
 		    else {
-			xfree((ptr_t) cp);
+			xfree(cp);
 			cp = dp;
 		    }
 		}
@@ -765,7 +765,7 @@ setDolp(Char *cp)
 
     if (dp) {
 	addla(dp);
-	xfree((ptr_t) dp);
+	xfree(dp);
     }
     else
 	addla(cp);
diff --git a/bin/csh/error.c b/bin/csh/error.c
index fe21b4935a0..e72030a5f37 100644
--- a/bin/csh/error.c
+++ b/bin/csh/error.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: error.c,v 1.10 2009/11/11 16:15:06 deraadt Exp $	*/
+/*	$OpenBSD: error.c,v 1.11 2015/02/08 05:51:37 tedu Exp $	*/
 /*	$NetBSD: err.c,v 1.6 1995/03/21 09:02:47 cgd Exp $	*/
 
 /*-
@@ -347,7 +347,7 @@ stderror(int id, ...)
     }
 
     if (seterr) {
-	xfree((ptr_t) seterr);
+	xfree(seterr);
 	seterr = NULL;
     }
 
diff --git a/bin/csh/exec.c b/bin/csh/exec.c
index ea0bf3f26b8..37074e099e5 100644
--- a/bin/csh/exec.c
+++ b/bin/csh/exec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec.c,v 1.16 2015/01/16 06:39:31 deraadt Exp $	*/
+/*	$OpenBSD: exec.c,v 1.17 2015/02/08 05:51:37 tedu Exp $	*/
 /*	$NetBSD: exec.c,v 1.9 1996/09/30 20:03:54 christos Exp $	*/
 
 /*-
@@ -159,8 +159,8 @@ doexec(Char **v, struct command *t)
 
     blkfree(t->t_dcom);
     t->t_dcom = blkspl(pv, av);
-    xfree((ptr_t) pv);
-    xfree((ptr_t) av);
+    xfree(pv);
+    xfree(av);
     av = t->t_dcom;
     trim(av);
 
@@ -216,7 +216,7 @@ doexec(Char **v, struct command *t)
 	    Vdp = dp;
 	    texec(dp, av);
 	    Vdp = 0;
-	    xfree((ptr_t) dp);
+	    xfree(dp);
 	}
 	misses++;
 cont:
@@ -225,7 +225,7 @@ cont:
     } while (*pv);
     hits--;
     Vsav = 0;
-    xfree((ptr_t) sav);
+    xfree(sav);
     pexerr();
 }
 
@@ -236,7 +236,7 @@ pexerr(void)
     if (expath) {
 	setname(vis_str(expath));
 	Vexpath = 0;
-	xfree((ptr_t) expath);
+	xfree(expath);
 	expath = 0;
     }
     else
@@ -320,7 +320,7 @@ texec(Char *sf, Char **st)
 	/* The order for the conversions is significant */
 	t = short2blk(st);
 	f = short2str(sf);
-	xfree((ptr_t) st);
+	xfree(st);
 	Vt = t;
 	(void) execve(f, t, environ);
 	Vt = 0;
@@ -337,7 +337,7 @@ texec(Char *sf, Char **st)
 	if (exerr == 0) {
 	    exerr = strerror(errno);
 	    if (expath)
-		xfree((ptr_t) expath);
+		xfree(expath);
 	    expath = Strsave(sf);
 	    Vexpath = expath;
 	}
@@ -516,13 +516,13 @@ iscommand(Char *name)
 	}
 	if (pv[0][0] == 0 || eq(pv[0], STRdot)) {	/* don't make ./xxx */
 	    if (executable(NULL, name, 0)) {
-		xfree((ptr_t) sav);
+		xfree(sav);
 		return i + 1;
 	    }
 	}
 	else {
 	    if (executable(*pv, sav, 0)) {
-		xfree((ptr_t) sav);
+		xfree(sav);
 		return i + 1;
 	    }
 	}
@@ -530,7 +530,7 @@ cont:
 	pv++;
 	i++;
     } while (*pv);
-    xfree((ptr_t) sav);
+    xfree(sav);
     return 0;
 }
 
@@ -698,7 +698,7 @@ tellmewhat(struct wordent *lexp, Char *str, int len)
 	    if (!slash) {
 		sp->word = Strspl(STRdotsl, sp->word);
 		prlex(cshout, lexp);
-		xfree((ptr_t) sp->word);
+		xfree(sp->word);
 	    }
 	    else
 		prlex(cshout, lexp);
@@ -706,12 +706,12 @@ tellmewhat(struct wordent *lexp, Char *str, int len)
 	else {
 	    s1 = Strspl(*pv, STRslash);
 	    sp->word = Strspl(s1, sp->word);
-	    xfree((ptr_t) s1);
+	    xfree(s1);
 	    if (str == NULL)
 		prlex(cshout, lexp);
 	    else
 		(void) Strlcpy(str, sp->word, len/sizeof(Char));
-	    xfree((ptr_t) sp->word);
+	    xfree(sp->word);
         }
 	found = 1;
     }
@@ -727,6 +727,6 @@ tellmewhat(struct wordent *lexp, Char *str, int len)
 	found = 0;
     }
     sp->word = s0;		/* we save and then restore this */
-    xfree((ptr_t) cmd);
+    xfree(cmd);
     return found;
 }
diff --git a/bin/csh/exp.c b/bin/csh/exp.c
index ded90d6593b..36e926db879 100644
--- a/bin/csh/exp.c
+++ b/bin/csh/exp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exp.c,v 1.10 2013/03/28 08:39:54 nicm Exp $	*/
+/*	$OpenBSD: exp.c,v 1.11 2015/02/08 05:51:37 tedu Exp $	*/
 /*	$NetBSD: exp.c,v 1.6 1995/03/21 09:02:51 cgd Exp $	*/
 
 /*-
@@ -227,12 +227,12 @@ exp2c(Char ***vp, bool ignore)
 		i = !Gmatch(p1, p2);
 		break;
 	    }
-	xfree((ptr_t) p1);
-	xfree((ptr_t) p2);
+	xfree(p1);
+	xfree(p2);
 	return (i);
     }
     i = egetn(p1);
-    xfree((ptr_t) p1);
+    xfree(p1);
     return (i);
 }
 
@@ -273,8 +273,8 @@ exp3(Char ***vp, bool ignore)
 		i = egetn(p1) <= egetn(p2);
 		break;
 	    }
-	xfree((ptr_t) p1);
-	xfree((ptr_t) p2);
+	xfree(p1);
+	xfree(p2);
 	return (putn(i));
     }
     return (p1);
@@ -301,8 +301,8 @@ exp3a(Char ***vp, bool ignore)
 	    i = egetn(p1) << egetn(p2);
 	else
 	    i = egetn(p1) >> egetn(p2);
-	xfree((ptr_t) p1);
-	xfree((ptr_t) p2);
+	xfree(p1);
+	xfree(p2);
 	return (putn(i));
     }
     return (p1);
@@ -336,8 +336,8 @@ exp4(Char ***vp, bool ignore)
 		i = egetn(p1) - egetn(p2);
 		break;
 	    }
-	xfree((ptr_t) p1);
-	xfree((ptr_t) p2);
+	xfree(p1);
+	xfree(p2);
 	return (putn(i));
     }
     return (p1);
@@ -389,8 +389,8 @@ exp5(Char ***vp, bool ignore)
 			i = l % i;
 		break;
 	    }
-	xfree((ptr_t) p1);
-	xfree((ptr_t) p2);
+	xfree(p1);
+	xfree(p2);
 	return (putn(i));
     }
     return (p1);
@@ -411,7 +411,7 @@ exp6(Char ***vp, bool ignore)
 	etracc("exp6 ! cp", cp, vp);
 #endif
 	i = egetn(cp);
-	xfree((ptr_t) cp);
+	xfree(cp);
 	return (putn(!i));
     }
     if (eq(**vp, STRtilde)) {
@@ -421,7 +421,7 @@ exp6(Char ***vp, bool ignore)
 	etracc("exp6 ~ cp", cp, vp);
 #endif
 	i = egetn(cp);
-	xfree((ptr_t) cp);
+	xfree(cp);
 	return (putn(~i));
     }
     if (eq(**vp, STRLparen)) {
@@ -511,7 +511,7 @@ exp6(Char ***vp, bool ignore)
 		cp[1] == 'l' ? lstat(short2str(ep), &stb) :
 #endif
 		stat(short2str(ep), &stb)) {
-		xfree((ptr_t) ep);
+		xfree(ep);
 		return (Strsave(STR0));
 	    }
 	    switch (cp[1]) {
@@ -564,7 +564,7 @@ exp6(Char ***vp, bool ignore)
 #ifdef EDEBUG
 	etraci("exp6 -? i", i, vp);
 #endif
-	xfree((ptr_t) ep);
+	xfree(ep);
 	return (putn(i));
     }
 #ifdef EDEBUG
diff --git a/bin/csh/hist.c b/bin/csh/hist.c
index bdfcaf5511c..d1052fea160 100644
--- a/bin/csh/hist.c
+++ b/bin/csh/hist.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hist.c,v 1.8 2009/10/27 23:59:21 deraadt Exp $	*/
+/*	$OpenBSD: hist.c,v 1.9 2015/02/08 05:51:37 tedu Exp $	*/
 /*	$NetBSD: hist.c,v 1.7 1995/03/21 18:35:44 mycroft Exp $	*/
 
 /*-
@@ -97,7 +97,7 @@ hfree(struct Hist *hp)
 {
 
     freelex(&hp->Hlex);
-    xfree((ptr_t) hp);
+    xfree(hp);
 }
 
 void
diff --git a/bin/csh/misc.c b/bin/csh/misc.c
index 89b1e016a0a..86fbf4d1e25 100644
--- a/bin/csh/misc.c
+++ b/bin/csh/misc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: misc.c,v 1.13 2014/10/16 19:43:31 deraadt Exp $	*/
+/*	$OpenBSD: misc.c,v 1.14 2015/02/08 05:51:37 tedu Exp $	*/
 /*	$NetBSD: misc.c,v 1.6 1995/03/21 09:03:09 cgd Exp $	*/
 
 /*-
@@ -124,8 +124,8 @@ blkfree(Char **av0)
     if (!av0)
 	return;
     for (; *av; av++)
-	xfree((ptr_t) * av);
-    xfree((ptr_t) av0);
+	xfree(* av);
+    xfree(av0);
 }
 
 Char  **
@@ -297,7 +297,7 @@ lshift(Char **v, int c)
     Char **u;
 
     for (u = v; *u && --c >= 0; u++)
-	xfree((ptr_t) *u);
+	xfree(*u);
     (void) blkcpy(v, u);
 }
 
diff --git a/bin/csh/proc.c b/bin/csh/proc.c
index 318573e434c..0be398c2e9c 100644
--- a/bin/csh/proc.c
+++ b/bin/csh/proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.c,v 1.24 2014/10/13 20:55:16 chl Exp $	*/
+/*	$OpenBSD: proc.c,v 1.25 2015/02/08 05:51:37 tedu Exp $	*/
 /*	$NetBSD: proc.c,v 1.9 1995/04/29 23:21:33 mycroft Exp $	*/
 
 /*-
@@ -229,11 +229,11 @@ pwait(void)
     for (pp = (fp = &proclist)->p_next; pp != NULL; pp = (fp = pp)->p_next)
 	if (pp->p_pid == 0) {
 	    fp->p_next = pp->p_next;
-	    xfree((ptr_t) pp->p_command);
+	    xfree(pp->p_command);
 	    if (pp->p_cwd && --pp->p_cwd->di_count == 0)
 		if (pp->p_cwd->di_next == 0)
 		    dfree(pp->p_cwd);
-	    xfree((ptr_t) pp);
+	    xfree(pp);
 	    pp = fp;
 	}
     sigprocmask(SIG_SETMASK, &osigset, NULL);