diff options
Diffstat (limited to 'appl/charon')
| -rw-r--r-- | appl/charon/build.b | 4 | ||||
| -rw-r--r-- | appl/charon/ftp.b | 2 | ||||
| -rw-r--r-- | appl/charon/jscript.b | 6 | ||||
| -rw-r--r-- | appl/charon/lex.b | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/appl/charon/build.b b/appl/charon/build.b index 92ba90aa..cf195728 100644 --- a/appl/charon/build.b +++ b/appl/charon/build.b @@ -1726,7 +1726,7 @@ cell_pstate(oldps: ref Pstate, ishead: int) : ref Pstate trim_white(data: string): string { data = S->drop(data, whitespace); - (l,r) := S->splitr(data, notwhitespace); + (l,nil) := S->splitr(data, notwhitespace); return l; } @@ -2480,8 +2480,6 @@ makealign(tok: ref Token) : Align # Make a Dimen, based on value of attid attr makedimen(tok: ref Token, attid: int) : Dimen { - kind := Dnone; - spec := 0; (fnd, wd) := tok.aval(attid); if(fnd) return parsedim(wd); diff --git a/appl/charon/ftp.b b/appl/charon/ftp.b index 9e2f74e6..4f564a71 100644 --- a/appl/charon/ftp.b +++ b/appl/charon/ftp.b @@ -105,7 +105,7 @@ connect(nc: ref Netconn, bs: ref ByteSource) dialdata(nc: ref Netconn, ctlfd: ref sys->FD) : string { # put in passive mode - err := sendrequest(nc, ctlfd, "PASV"); + sendrequest(nc, ctlfd, "PASV"); (code, msg) := getreply(nc, ctlfd); if(code != Success) return "can't use passive mode: " + msg; diff --git a/appl/charon/jscript.b b/appl/charon/jscript.b index ad35f295..0742da31 100644 --- a/appl/charon/jscript.b +++ b/appl/charon/jscript.b @@ -1030,7 +1030,7 @@ do_on(e: ref ScriptEvent) E->SEscript => # TODO - handle document text from evalscript # need to determine if document is 'open' or not. - (err, nil, val) := evalscript(f, e.script); + (nil, nil, val) := evalscript(f, e.script); if (e.reply != nil) e.reply <- = val; e.reply = nil; @@ -2713,7 +2713,7 @@ fieldinstant(ex : ref Exec, field: ref Build->Formfield, oform: ref Obj) : ref V # Make an event handler named hname in o, with given body. puthandler(ex: ref Exec, o: ref Obj, hname: string, hbody: string) { - c := ES->eval(ex, "function PRIVhandler() {" + hbody + "}"); + ES->eval(ex, "function PRIVhandler() {" + hbody + "}"); hobj := getobj(ex, ex.global, "PRIVhandler"); if(hobj != nil) { ES->put(ex, o, hname, ES->objval(hobj)); @@ -3013,7 +3013,7 @@ newcharon(url: string, nm: string, sw: ref ScriptWin) continue; if(s == "E") exit; - (n, l) := sys->tokenize(s, " "); + (nil, l) := sys->tokenize(s, " "); case hd l{ "L" => sw.newloc = hd tl l; diff --git a/appl/charon/lex.b b/appl/charon/lex.b index 4b7274c0..3c298c6d 100644 --- a/appl/charon/lex.b +++ b/appl/charon/lex.b @@ -697,7 +697,7 @@ TokenSource.setchset(ts: self ref TokenSource, chset: Btos) if (nchars > 0 && nchars < len st.s) { # align bi to the current input char bs := ts.b; - (state, nil, n) := ts.chset->btos(st.prevcsstate, bs.data[st.prevbi:st.bi], nchars); + (nil, nil, n) := ts.chset->btos(st.prevcsstate, bs.data[st.prevbi:st.bi], nchars); st.bi = st.prevbi + n; st.prevbi = st.bi; } |