lib9p

commit 2a696ba0fa97355469abb4f35e521b76ce5b9918
parent 8985476eda283200d261c750abbe2919d40cf729
Author: Matsuda Kenji <info@mtkn.jp>
Date:   Thu, 28 Dec 2023 11:58:20 +0900

use s, not r.Srv

Diffstat:
M
server.go
 | 
10
+++++-----

1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/server.go b/server.go
@@ -439,13 +439,13 @@ func sWalk(ctx context.Context, s *Server, c <-chan *Req) {
 					panic("err and r.Ofcall are both nil")
 				}
 				setError(r, r.err)
-				r.Srv.respChan <- r
+				s.respChan <- r
 				continue
 			}
 			ofcall := r.Ofcall.(*RWalk)
 			if r.err != nil || len(ofcall.Qids) < len(ifcall.Wnames) {
 				if ifcall.Fid != ifcall.Newfid {
-					r.Srv.fPool.delete(ifcall.Newfid)
+					s.fPool.delete(ifcall.Newfid)
 				}
 				if len(ofcall.Qids) == 0 {
 					if r.err == nil && len(ifcall.Wnames) != 0 {
@@ -570,7 +570,7 @@ func sOpen(ctx context.Context, s *Server, c <-chan *Req) {
 				}
 				continue
 			}
-			f, err := r.Srv.fs.OpenFile(r.Fid.path, r.Fid.OMode)
+			f, err := s.fs.OpenFile(r.Fid.path, r.Fid.OMode)
 			if err != nil {
 				setError(r, err)
 				select {
@@ -1264,8 +1264,8 @@ func respond(ctx context.Context, s *Server) {
 				r.pool.delete(r.Tag)
 			}
 			select {
-			case r.Srv.speakChan <- r:
-				if r.Srv.chatty9P {
+			case s.speakChan <- r:
+				if s.chatty9P {
 					fmt.Fprintf(os.Stderr, "--> %s\n", r.Ofcall)
 				}
 			case <-ctx.Done():