diff options
Diffstat (limited to 'src/pkg/rpc')
| -rw-r--r-- | src/pkg/rpc/client.go | 2 | ||||
| -rw-r--r-- | src/pkg/rpc/server.go | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/pkg/rpc/client.go b/src/pkg/rpc/client.go index 8663ad442..4c6dd89ed 100644 --- a/src/pkg/rpc/client.go +++ b/src/pkg/rpc/client.go @@ -92,7 +92,7 @@ func (client *Client) input() { // Terminate pending calls. client.mutex.Lock(); client.shutdown = err; - for seq, call := range client.pending { + for _, call := range client.pending { call.Error = err; _ = call.Done <- call; // do not block } diff --git a/src/pkg/rpc/server.go b/src/pkg/rpc/server.go index c7335a687..e895162d0 100644 --- a/src/pkg/rpc/server.go +++ b/src/pkg/rpc/server.go @@ -170,7 +170,7 @@ var server = &serverType{ serviceMap: make(map[string] *service) } // Is this a publicly vislble - upper case - name? func isPublic(name string) bool { - rune, wid_ := utf8.DecodeRuneInString(name); + rune, _ := utf8.DecodeRuneInString(name); return unicode.IsUpper(rune) } @@ -354,7 +354,7 @@ func (server *serverType) input(conn io.ReadWriteCloser) { func (server *serverType) accept(lis net.Listener) { for { - conn, addr, err := lis.Accept(); + conn, _, err := lis.Accept(); if err != nil { log.Exit("rpc.Serve: accept:", err.String()); // TODO(r): exit? } @@ -399,7 +399,7 @@ func serveHTTP(c *http.Conn, req *http.Request) { io.WriteString(c, "405 must CONNECT to " + rpcPath + "\n"); return; } - conn, buf, err := c.Hijack(); + conn, _, err := c.Hijack(); if err != nil { log.Stderr("rpc hijacking ", c.RemoteAddr, ": ", err.String()); return; |