lib9p

commit 6549bb4eefff5ee14c051fe3931d0167d4bf0ea8
parent 6302288d883eea3f956acdcc3ff65d7244767bce
Author: Matsuda Kenji <info@mtkn.jp>
Date:   Mon, 30 Oct 2023 08:15:17 +0900

rename Req.err to Req.listenErr

Diffstat:
M
req.go
 | 
5
++++-
M
server.go
 | 
12
++++++------

2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/req.go b/req.go
@@ -16,7 +16,10 @@ type Req struct {
 	Oldreq     *Req
 	pool       *ReqPool
 	Cancel     context.CancelFunc
-	err        error
+	// listenErr is any error encountered while waiting for new 9P message.
+	listenErr  error
+	// speakErrChan is used to report any error encountered while sending
+	// the response message.
 	speakErrChan chan error
 }
 
diff --git a/server.go b/server.go
@@ -158,9 +158,9 @@ func getReq(r io.Reader, s *Server) *Req {
 	ifcall, err := RecvMsg(r)
 	if err != nil {
 		if err == io.EOF {
-			return &Req{err: err}
+			return &Req{listenErr: err}
 		}
-		return &Req{err: fmt.Errorf("readMsg: %v", err)}
+		return &Req{listenErr: fmt.Errorf("readMsg: %v", err)}
 	}
 	req, err := s.rPool.add(ifcall.GetTag())
 	if err != nil {
@@ -168,7 +168,7 @@ func getReq(r io.Reader, s *Server) *Req {
 		req := new(Req)
 		req.Srv = s
 		req.Ifcall = ifcall
-		req.err = ErrDupTag
+		req.listenErr = ErrDupTag
 		if s.chatty9P {
 			fmt.Fprintf(os.Stderr, "<-- %v\n", req.Ifcall)
 		}
@@ -911,9 +911,9 @@ L:
 	for {
 		select {
 		case r := <-s.listenChan:
-			if r.err != nil {
-				log.Printf("listen: %v", r.err)
-				if r.err == io.EOF {
+			if r.listenErr != nil {
+				log.Printf("listen: %v", r.listenErr)
+				if r.listenErr == io.EOF {
 					break L
 				}
 				continue L