commit 44e41b1f3a2f9313b770cd6808e5ad8549aa7110 from: rsc date: Wed Jul 13 03:53:24 2005 UTC various needed casts commit - 55d360f653add52055c39d7989745bf72d6df27a commit + 44e41b1f3a2f9313b770cd6808e5ad8549aa7110 blob - 790e6c26636a2f0407fc98d5a70deeb6bb2e51bd blob + 000b34042a495854b832b2139a89643073d9eadf --- src/cmd/acme/look.c +++ 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; blob - 802a38dbb5697ab5161e333db8b76962038298ec blob + 5d409a98d6db05e5852f37c0defd910350342c4e --- src/cmd/acme/wind.c +++ 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; itag.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);