Match bwrite()'s prototype with write()'s, zapping a lint comment

Delete casts to char* of arguments to bwrite() and free()

16 files changed, 80 insertions, 81 deletions

diff --git a/games/hack/hack.do.c b/games/hack/hack.do.c
index bade7dead09..e74f0747bc9 100644
--- a/games/hack/hack.do.c
+++ b/games/hack/hack.do.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hack.do.c,v 1.7 2009/10/27 23:59:25 deraadt Exp $	*/
+/*	$OpenBSD: hack.do.c,v 1.8 2014/03/11 08:05:15 guenther Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -94,7 +94,7 @@ drop(struct obj *obj)
 				amount, plur(amount));
 			if(Invisible) newsym(u.ux, u.uy);
 		}
-		free((char *) obj);
+		free(obj);
 		return(1);
 	}
 	if(obj->owornmask & (W_ARMOR | W_RING)){
diff --git a/games/hack/hack.do_name.c b/games/hack/hack.do_name.c
index 17decccd331..b4845d58c42 100644
--- a/games/hack/hack.do_name.c
+++ b/games/hack/hack.do_name.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hack.do_name.c,v 1.9 2009/10/27 23:59:25 deraadt Exp $	*/
+/*	$OpenBSD: hack.do_name.c,v 1.10 2014/03/11 08:05:15 guenther Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -201,7 +201,7 @@ do_oname(struct obj *obj)
 		}
 	}
 	/* obfree(obj, otmp2);*//* now unnecessary: no pointers on bill */
-	free((char *) obj);	/* let us hope nobody else saved a pointer */
+	free(obj);		/* let us hope nobody else saved a pointer */
 }
 
 int
diff --git a/games/hack/hack.end.c b/games/hack/hack.end.c
index 10a566384ee..680285a178e 100644
--- a/games/hack/hack.end.c
+++ b/games/hack/hack.end.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hack.end.c,v 1.11 2009/12/10 23:53:07 beck Exp $	*/
+/*	$OpenBSD: hack.end.c,v 1.12 2014/03/11 08:05:15 guenther Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -732,7 +732,7 @@ prscore(int argc, char **argv)
 				break;
 			}
 		}
-		free((char *) t1);
+		free(t1);
 	}
 #ifdef nonsense
 	totchars[totcharct] = 0;
diff --git a/games/hack/hack.engrave.c b/games/hack/hack.engrave.c
index 1692897e09c..fe64b7d5ce7 100644
--- a/games/hack/hack.engrave.c
+++ b/games/hack/hack.engrave.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hack.engrave.c,v 1.6 2009/10/27 23:59:25 deraadt Exp $	*/
+/*	$OpenBSD: hack.engrave.c,v 1.7 2014/03/11 08:05:15 guenther Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -344,11 +344,11 @@ save_engravings(int fd)
 			ep = ep->nxt_engr;
 			continue;
 		}
-		bwrite(fd, (char *) & (ep->engr_lth), sizeof(ep->engr_lth));
-		bwrite(fd, (char *) ep, sizeof(struct engr) + ep->engr_lth);
+		bwrite(fd,  &(ep->engr_lth), sizeof(ep->engr_lth));
+		bwrite(fd, ep, sizeof(struct engr) + ep->engr_lth);
 		ep = ep->nxt_engr;
 	}
-	bwrite(fd, (char *) nul, sizeof(unsigned));
+	bwrite(fd, nul, sizeof(unsigned));
 	head_engr = 0;
 }
 
@@ -388,5 +388,5 @@ del_engr(struct engr *ep)
 		return;
 	fnd:	;
 	}
-	free((char *) ep);
+	free(ep);
 }
diff --git a/games/hack/hack.h b/games/hack/hack.h
index 4ab2f2b0bdb..9c326e61921 100644
--- a/games/hack/hack.h
+++ b/games/hack/hack.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hack.h,v 1.9 2006/03/14 22:06:10 deraadt Exp $*/
+/*	$OpenBSD: hack.h,v 1.10 2014/03/11 08:05:15 guenther Exp $*/
 /*	$NetBSD: hack.h,v 1.3 1995/03/23 08:30:21 cgd Exp $*/
 
 /*
@@ -391,7 +391,7 @@ int  dosuspend(void);
 
 /* hack.lev.c */
 void savelev(int, xchar);
-void bwrite(int, char *, unsigned int);
+void bwrite(int, const void *, ssize_t);
 void saveobjchn(int, struct obj *);
 void savemonchn(int, struct monst *);
 void savegoldchn(int, struct gold *);
diff --git a/games/hack/hack.invent.c b/games/hack/hack.invent.c
index 5f0f9a09a5a..43befd4e0a8 100644
--- a/games/hack/hack.invent.c
+++ b/games/hack/hack.invent.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hack.invent.c,v 1.9 2009/10/27 23:59:25 deraadt Exp $	*/
+/*	$OpenBSD: hack.invent.c,v 1.10 2014/03/11 08:05:15 guenther Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -220,7 +220,7 @@ freegold(struct gold *gold)
 			if(!gtmp) panic("error in freegold");
 		gtmp->ngold = gold->ngold;
 	}
-	free((char *) gold);
+	free(gold);
 }
 
 void
@@ -234,7 +234,7 @@ deltrap(struct trap *trap)
 		for(ttmp = ftrap; ttmp->ntrap != trap; ttmp = ttmp->ntrap) ;
 		ttmp->ntrap = trap->ntrap;
 	}
-	free((char *) trap);
+	free(trap);
 }
 
 struct wseg *m_atseg;
diff --git a/games/hack/hack.lev.c b/games/hack/hack.lev.c
index 2c09b520956..6b7c59abd00 100644
--- a/games/hack/hack.lev.c
+++ b/games/hack/hack.lev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hack.lev.c,v 1.7 2009/10/27 23:59:25 deraadt Exp $	*/
+/*	$OpenBSD: hack.lev.c,v 1.8 2014/03/11 08:05:15 guenther Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -92,14 +92,14 @@ savelev(int fd, xchar lev)
 	if (lev >= 0 && lev <= MAXLEVEL)
 		level_exists[(int)lev] = TRUE;
 
-	bwrite(fd,(char *) &hackpid,sizeof(hackpid));
-	bwrite(fd,(char *) &lev,sizeof(lev));
-	bwrite(fd,(char *) levl,sizeof(levl));
-	bwrite(fd,(char *) &moves,sizeof(long));
-	bwrite(fd,(char *) &xupstair,sizeof(xupstair));
-	bwrite(fd,(char *) &yupstair,sizeof(yupstair));
-	bwrite(fd,(char *) &xdnstair,sizeof(xdnstair));
-	bwrite(fd,(char *) &ydnstair,sizeof(ydnstair));
+	bwrite(fd, &hackpid,sizeof(hackpid));
+	bwrite(fd, &lev,sizeof(lev));
+	bwrite(fd, levl,sizeof(levl));
+	bwrite(fd, &moves,sizeof(long));
+	bwrite(fd, &xupstair,sizeof(xupstair));
+	bwrite(fd, &yupstair,sizeof(yupstair));
+	bwrite(fd, &xdnstair,sizeof(xdnstair));
+	bwrite(fd, &ydnstair,sizeof(ydnstair));
 	savemonchn(fd, fmon);
 	savegoldchn(fd, fgold);
 	savetrapchn(fd, ftrap);
@@ -108,31 +108,30 @@ savelev(int fd, xchar lev)
 	billobjs = 0;
 	save_engravings(fd);
 #ifndef QUEST
-	bwrite(fd,(char *) rooms,sizeof(rooms));
-	bwrite(fd,(char *) doors,sizeof(doors));
+	bwrite(fd, rooms,sizeof(rooms));
+	bwrite(fd, doors,sizeof(doors));
 #endif /* QUEST */
 	fgold = 0;
 	ftrap = 0;
 	fmon = 0;
 	fobj = 0;
 #ifndef NOWORM
-	bwrite(fd,(char *) wsegs,sizeof(wsegs));
+	bwrite(fd, wsegs,sizeof(wsegs));
 	for(tmp=1; tmp<32; tmp++){
 		for(wtmp = wsegs[tmp]; wtmp; wtmp = wtmp2){
 			wtmp2 = wtmp->nseg;
-			bwrite(fd,(char *) wtmp,sizeof(struct wseg));
+			bwrite(fd, wtmp,sizeof(struct wseg));
 		}
 		wsegs[tmp] = 0;
 	}
-	bwrite(fd,(char *) wgrowtime,sizeof(wgrowtime));
+	bwrite(fd, wgrowtime,sizeof(wgrowtime));
 #endif /* NOWORM */
 }
 
 void
-bwrite(int fd, char *loc, unsigned int num)
+bwrite(int fd, const void *loc, ssize_t num)
 {
-/* lint wants the 3rd arg of write to be an int; lint -p an unsigned */
-	if(write(fd, loc, (int) num) != num)
+	if(write(fd, loc, num) != num)
 		panic("cannot write %u bytes to file #%d", num, fd);
 }
 
@@ -146,12 +145,12 @@ saveobjchn(int fd, struct obj *otmp)
 	while(otmp) {
 		otmp2 = otmp->nobj;
 		xl = otmp->onamelth;
-		bwrite(fd, (char *) &xl, sizeof(int));
-		bwrite(fd, (char *) otmp, xl + sizeof(struct obj));
-		free((char *) otmp);
+		bwrite(fd, &xl, sizeof(int));
+		bwrite(fd, otmp, xl + sizeof(struct obj));
+		free(otmp);
 		otmp = otmp2;
 	}
-	bwrite(fd, (char *) &minusone, sizeof(int));
+	bwrite(fd, &minusone, sizeof(int));
 }
 
 void
@@ -162,18 +161,18 @@ savemonchn(int fd, struct monst *mtmp)
 	int minusone = -1;
 	struct permonst *monbegin = &mons[0];
 
-	bwrite(fd, (char *) &monbegin, sizeof(monbegin));
+	bwrite(fd, &monbegin, sizeof(monbegin));
 
 	while(mtmp) {
 		mtmp2 = mtmp->nmon;
 		xl = mtmp->mxlth + mtmp->mnamelth;
-		bwrite(fd, (char *) &xl, sizeof(int));
-		bwrite(fd, (char *) mtmp, xl + sizeof(struct monst));
+		bwrite(fd, &xl, sizeof(int));
+		bwrite(fd, mtmp, xl + sizeof(struct monst));
 		if(mtmp->minvent) saveobjchn(fd,mtmp->minvent);
-		free((char *) mtmp);
+		free(mtmp);
 		mtmp = mtmp2;
 	}
-	bwrite(fd, (char *) &minusone, sizeof(int));
+	bwrite(fd, &minusone, sizeof(int));
 }
 
 void
@@ -182,8 +181,8 @@ savegoldchn(int fd, struct gold *gold)
 	struct gold *gold2;
 	while(gold) {
 		gold2 = gold->ngold;
-		bwrite(fd, (char *) gold, sizeof(struct gold));
-		free((char *) gold);
+		bwrite(fd, gold, sizeof(struct gold));
+		free(gold);
 		gold = gold2;
 	}
 	bwrite(fd, nul, sizeof(struct gold));
@@ -195,8 +194,8 @@ savetrapchn(int fd, struct trap *trap)
 	struct trap *trap2;
 	while(trap) {
 		trap2 = trap->ntrap;
-		bwrite(fd, (char *) trap, sizeof(struct trap));
-		free((char *) trap);
+		bwrite(fd, trap, sizeof(struct trap));
+		free(trap);
 		trap = trap2;
 	}
 	bwrite(fd, nul, sizeof(struct trap));
@@ -273,7 +272,7 @@ getlev(int fd, int pid, xchar lev)
 		gold = newgold();
 		mread(fd, (char *)gold, sizeof(struct gold));
 	}
-	free((char *) gold);
+	free(gold);
 	trap = newtrap();
 	mread(fd, (char *)trap, sizeof(struct trap));
 	while(trap->tx) {
@@ -282,7 +281,7 @@ getlev(int fd, int pid, xchar lev)
 		trap = newtrap();
 		mread(fd, (char *)trap, sizeof(struct trap));
 	}
-	free((char *) trap);
+	free(trap);
 	fobj = restobjchn(fd);
 	billobjs = restobjchn(fd);
 	rest_engravings(fd);
diff --git a/games/hack/hack.mon.c b/games/hack/hack.mon.c
index 4ecc68e20cf..12d1aab6e28 100644
--- a/games/hack/hack.mon.c
+++ b/games/hack/hack.mon.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hack.mon.c,v 1.9 2014/03/11 07:41:10 guenther Exp $	*/
+/*	$OpenBSD: hack.mon.c,v 1.10 2014/03/11 08:05:15 guenther Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -704,7 +704,7 @@ dmonsfree()
 
 	while ((mtmp = fdmon)) {
 		fdmon = mtmp->nmon;
-		free((char *) mtmp);
+		free(mtmp);
 	}
 }
 
diff --git a/games/hack/hack.o_init.c b/games/hack/hack.o_init.c
index ee4c0c27e04..814576f10be 100644
--- a/games/hack/hack.o_init.c
+++ b/games/hack/hack.o_init.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hack.o_init.c,v 1.5 2009/10/27 23:59:25 deraadt Exp $	*/
+/*	$OpenBSD: hack.o_init.c,v 1.6 2014/03/11 08:05:15 guenther Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -175,15 +175,15 @@ savenames(int fd)
 	int i;
 	unsigned len;
 
-	bwrite(fd, (char *) bases, sizeof bases);
-	bwrite(fd, (char *) objects, sizeof objects);
+	bwrite(fd, bases, sizeof bases);
+	bwrite(fd, objects, sizeof objects);
 	/* as long as we use only one version of Hack/Quest we
 	   need not save oc_name and oc_descr, but we must save
 	   oc_uname for all objects */
 	for(i=0; i < SIZE(objects); i++) {
 		if(objects[i].oc_uname) {
 			len = strlen(objects[i].oc_uname)+1;
-			bwrite(fd, (char *) &len, sizeof len);
+			bwrite(fd, &len, sizeof len);
 			bwrite(fd, objects[i].oc_uname, len);
 		}
 	}
diff --git a/games/hack/hack.pager.c b/games/hack/hack.pager.c
index a19d2bf0bb9..0646c55aeb2 100644
--- a/games/hack/hack.pager.c
+++ b/games/hack/hack.pager.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hack.pager.c,v 1.19 2011/03/16 18:11:37 deraadt Exp $	*/
+/*	$OpenBSD: hack.pager.c,v 1.20 2014/03/11 08:05:15 guenther Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -341,7 +341,7 @@ cornline(int mode, char *text)
 cleanup:
 	while ((tl = texthead)) {
 		texthead = tl->next_line;
-		free((char *) tl);
+		free(tl);
 	}
 }
 
diff --git a/games/hack/hack.read.c b/games/hack/hack.read.c
index a4ac8bc6cb6..bdda6e31a70 100644
--- a/games/hack/hack.read.c
+++ b/games/hack/hack.read.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hack.read.c,v 1.7 2009/10/27 23:59:25 deraadt Exp $	*/
+/*	$OpenBSD: hack.read.c,v 1.8 2014/03/11 08:05:15 guenther Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -192,7 +192,7 @@ doread()
 			Punished = 0;
 			freeobj(uchain);
 			unpobj(uchain);
-			free((char *) uchain);
+			free(uchain);
 			uball->spe = 0;
 			uball->owornmask &= ~W_BALL;
 			uchain = uball = (struct obj *) 0;
diff --git a/games/hack/hack.save.c b/games/hack/hack.save.c
index 204bfee6da0..e31b2b2d1f4 100644
--- a/games/hack/hack.save.c
+++ b/games/hack/hack.save.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hack.save.c,v 1.10 2014/03/11 07:41:10 guenther Exp $	*/
+/*	$OpenBSD: hack.save.c,v 1.11 2014/03/11 08:05:15 guenther Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -112,17 +112,17 @@ dosave0(int hu)
 	saveobjchn(fd, fcobj);
 	savemonchn(fd, fallen_down);
 	tmp = getuid();
-	bwrite(fd, (char *) &tmp, sizeof tmp);
-	bwrite(fd, (char *) &flags, sizeof(struct flag));
-	bwrite(fd, (char *) &dlevel, sizeof dlevel);
-	bwrite(fd, (char *) &maxdlevel, sizeof maxdlevel);
-	bwrite(fd, (char *) &moves, sizeof moves);
-	bwrite(fd, (char *) &u, sizeof(struct you));
+	bwrite(fd, &tmp, sizeof tmp);
+	bwrite(fd, &flags, sizeof(struct flag));
+	bwrite(fd, &dlevel, sizeof dlevel);
+	bwrite(fd, &maxdlevel, sizeof maxdlevel);
+	bwrite(fd, &moves, sizeof moves);
+	bwrite(fd, &u, sizeof(struct you));
 	if(u.ustuck)
-		bwrite(fd, (char *) &(u.ustuck->m_id), sizeof u.ustuck->m_id);
-	bwrite(fd, (char *) pl_character, sizeof pl_character);
-	bwrite(fd, (char *) genocided, sizeof genocided);
-	bwrite(fd, (char *) fut_geno, sizeof fut_geno);
+		bwrite(fd, &(u.ustuck->m_id), sizeof u.ustuck->m_id);
+	bwrite(fd, pl_character, sizeof pl_character);
+	bwrite(fd, genocided, sizeof genocided);
+	bwrite(fd, fut_geno, sizeof fut_geno);
 	savenames(fd);
 	for(tmp = 1; tmp <= maxdlevel; tmp++) {
 		extern int hackpid;
@@ -139,7 +139,7 @@ dosave0(int hu)
 		}
 		getlev(ofd, hackpid, tmp);
 		(void) close(ofd);
-		bwrite(fd, (char *) &tmp, sizeof tmp);	/* level number */
+		bwrite(fd, &tmp, sizeof tmp);		/* level number */
 		savelev(fd,tmp);			/* actual level */
 		(void) unlink(lock);
 	}
diff --git a/games/hack/hack.shk.c b/games/hack/hack.shk.c
index 9d314e91923..25d555441b7 100644
--- a/games/hack/hack.shk.c
+++ b/games/hack/hack.shk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hack.shk.c,v 1.11 2009/10/27 23:59:25 deraadt Exp $	*/
+/*	$OpenBSD: hack.shk.c,v 1.12 2014/03/11 08:05:15 guenther Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -73,7 +73,7 @@ struct obj *billobjs = 0;
 void
 obfree(struct obj *obj, struct obj *merge)
 {
-	free((char *) obj);
+	free(obj);
 }
 
 int
@@ -240,7 +240,7 @@ setpaid()
 			obj->unpaid = 0;
 	while ((obj = billobjs)) {
 		billobjs = obj->nobj;
-		free((char *) obj);
+		free(obj);
 	}
 	ESHK(shopkeeper)->billct = 0;
 }
@@ -422,7 +422,7 @@ obfree(struct obj *obj, struct obj *merge)
 			*bp = bill[ESHK(shopkeeper)->billct];
 		}
 	}
-	free((char *) obj);
+	free(obj);
 }
 
 static void
@@ -598,7 +598,7 @@ dopayobj(struct bill_x *bp)
 			if(otmp) otmp->nobj = obj->nobj;
 			else pline("Error in shopkeeper administration.");
 		}
-		free((char *) obj);
+		free(obj);
 	}
 	return(1);
 }
diff --git a/games/hack/hack.steal.c b/games/hack/hack.steal.c
index 7107f59a11e..1d9c979dca8 100644
--- a/games/hack/hack.steal.c
+++ b/games/hack/hack.steal.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hack.steal.c,v 1.5 2009/10/27 23:59:25 deraadt Exp $	*/
+/*	$OpenBSD: hack.steal.c,v 1.6 2014/03/11 08:05:15 guenther Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -201,7 +201,7 @@ steal(struct monst *mtmp)
 	if(Punished && otmp == uball){
 		Punished = 0;
 		freeobj(uchain);
-		free((char *) uchain);
+		free(uchain);
 		uchain = (struct obj *) 0;
 		uball->spe = 0;
 		uball = (struct obj *) 0;	/* superfluous */
diff --git a/games/hack/hack.topl.c b/games/hack/hack.topl.c
index baabb08304c..481475ed3b2 100644
--- a/games/hack/hack.topl.c
+++ b/games/hack/hack.topl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hack.topl.c,v 1.9 2009/10/27 23:59:25 deraadt Exp $	*/
+/*	$OpenBSD: hack.topl.c,v 1.10 2014/03/11 08:05:15 guenther Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -133,7 +133,7 @@ remember_topl()
 		tl = tl->next_topl;
 	}
 	if(tl && tl->next_topl){
-		free((char *) tl->next_topl);
+		free(tl->next_topl);
 		tl->next_topl = 0;
 	}
 }
diff --git a/games/hack/hack.worm.c b/games/hack/hack.worm.c
index 7b03b536d03..79130d66947 100644
--- a/games/hack/hack.worm.c
+++ b/games/hack/hack.worm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hack.worm.c,v 1.6 2009/10/27 23:59:25 deraadt Exp $	*/
+/*	$OpenBSD: hack.worm.c,v 1.7 2014/03/11 08:05:15 guenther Exp $	*/
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -263,6 +263,6 @@ remseg(struct wseg *wtmp)
 {
 	if(wtmp->wdispl)
 		newsym(wtmp->wx, wtmp->wy);
-	free((char *) wtmp);
+	free(wtmp);
 }
 #endif /* NOWORM */