o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

various needed casts

Browse source
This commit is contained in:
rsc 2005-07-13 03:53:24 +00:00
parent 55d360f653
commit 44e41b1f3a
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/cmd/acme/look.c
View file

@ -456,7 +456,7 @@ dirname(Text *t, Rune *r, int n)
if(t==nil || t->w==nil) if(t==nil || t->w==nil)
goto Rescue; goto Rescue;
if(dodollarsigns && n>=1 && r[0]=='$') if(dodollarsigns && n>=1 && r[0]=='$')
expandenv(&r, &n); expandenv(&r, (uint*)&n);
nt = t->w->tag.file->b.nc; nt = t->w->tag.file->b.nc;
if(nt == 0) if(nt == 0)
goto Rescue; goto Rescue;
@ -475,7 +475,7 @@ dirname(Text *t, Rune *r, int n)
if(slash < 0) if(slash < 0)
goto Rescue; goto Rescue;
slash++; slash++;
if(dodollarsigns && expandenv(&b, &slash)) if(dodollarsigns && expandenv(&b, (uint*)&slash))
b = runerealloc(b, slash+n); b = runerealloc(b, slash+n);
runemove(b+slash, r, n); runemove(b+slash, r, n);
free(r); free(r);
@ -577,7 +577,7 @@ expandfile(Text *t, uint q0, uint q1, Expand *e)
goto Isfile; goto Isfile;
else{ else{
if(dodollarsigns && r[0] == '$') if(dodollarsigns && r[0] == '$')
expandenv(&r, &nname); expandenv(&r, (uint*)&nname);
else{ else{
rs = dirname(t, r, nname); rs = dirname(t, r, nname);
r = rs.r; r = rs.r;

4
src/cmd/acme/wind.c
View file

@ -347,7 +347,7 @@ winsettag1(Window *w)
ntagname = w->body.file->nname; ntagname = w->body.file->nname;
tagname = runemalloc(ntagname); tagname = runemalloc(ntagname);
runemove(tagname, w->body.file->name, 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 * 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++) for(i=0; i<w->tag.file->b.nc; i++)
if(r[i]==' ' || r[i]=='\t') if(r[i]==' ' || r[i]=='\t')
break; break;
expandenv(&r, &i); expandenv(&r, (uint*)&i);
if(runeeq(r, i, w->body.file->name, w->body.file->nname) == FALSE){ if(runeeq(r, i, w->body.file->name, w->body.file->nname) == FALSE){
seq++; seq++;
filemark(w->body.file); filemark(w->body.file);