plan9port

commit 44e41b1f3a2f9313b770cd6808e5ad8549aa7110
parent 55d360f653add52055c39d7989745bf72d6df27a
Author: rsc <devnull@localhost>
Date:   Wed, 13 Jul 2005 03:53:24 +0000

various needed casts

Diffstat:
M
src/cmd/acme/look.c
 | 
6
+++---
M
src/cmd/acme/wind.c
 | 
4
++--

2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/cmd/acme/look.c b/src/cmd/acme/look.c
@@ -456,7 +456,7 @@ dirname(Text *t, Rune *r, int n)
 	if(t==nil || t->w==nil)
 		goto Rescue;
 	if(dodollarsigns && n>=1 && r[0]=='$')
-		expandenv(&r, &n);
+		expandenv(&r, (uint*)&n);
 	nt = t->w->tag.file->b.nc;
 	if(nt == 0)
 		goto Rescue;
@@ -475,7 +475,7 @@ dirname(Text *t, Rune *r, int n)
 	if(slash < 0)
 		goto Rescue;
 	slash++;
-	if(dodollarsigns && expandenv(&b, &slash))
+	if(dodollarsigns && expandenv(&b, (uint*)&slash))
 		b = runerealloc(b, slash+n);
 	runemove(b+slash, r, n);
 	free(r);
@@ -577,7 +577,7 @@ expandfile(Text *t, uint q0, uint q1, Expand *e)
 		goto Isfile;
 	else{
 		if(dodollarsigns && r[0] == '$')
-			expandenv(&r, &nname);
+			expandenv(&r, (uint*)&nname);
 		else{
 			rs = dirname(t, r, nname);
 			r = rs.r;
diff --git a/src/cmd/acme/wind.c b/src/cmd/acme/wind.c
@@ -347,7 +347,7 @@ winsettag1(Window *w)
 	ntagname = w->body.file->nname;
 	tagname = runemalloc(ntagname);
 	runemove(tagname, w->body.file->name, ntagname);
-	abbrevenv(&tagname, &ntagname);
+	abbrevenv(&tagname, (uint*)&ntagname);
 
 	/*
 	 * XXX Why is this here instead of letting the code
@@ -490,7 +490,7 @@ wincommit(Window *w, Text *t)
 	for(i=0; i<w->tag.file->b.nc; i++)
 		if(r[i]==' ' || r[i]=='\t')
 			break;
-	expandenv(&r, &i);
+	expandenv(&r, (uint*)&i);
 	if(runeeq(r, i, w->body.file->name, w->body.file->nname) == FALSE){
 		seq++;
 		filemark(w->body.file);