lib9p

commit b575a59b0b37a1d1087461bb631235dd69009fa2
parent 0932353181b89f41de720861bb3a28a398013fcd
Author: Matsuda Kenji <info@mtkn.jp>
Date:   Tue, 19 Dec 2023 07:47:58 +0900

delete unnecessary WaitGroup

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

1 file changed, 3 insertions(+), 17 deletions(-)
diff --git a/server.go b/server.go
@@ -558,17 +558,9 @@ func sRead(ctx context.Context, s *Server, r *Req) {
 	}
 	data := make([]byte, ifcall.Count)
 	errc := make(chan error)
-	var (
-		n   int
-		wg  sync.WaitGroup
-	)
-	wg.Add(1)
+	var n int
 	go func() {
-		go func() {
-			wg.Wait()
-			close(errc)
-		}()
-		defer wg.Done()
+		defer close(errc)
 		if fi.IsDir() {
 			if ifcall.Offset != 0 && ifcall.Offset != r.Fid.dirOffset {
 				errc <- fmt.Errorf("invalid dir offset")
@@ -655,15 +647,9 @@ func sWrite(ctx context.Context, s *Server, r *Req) {
 		return
 	}
 	ofcall := new(RWrite)
-	var wg sync.WaitGroup
 	errc := make(chan error)
-	wg.Add(1) // TODO: I think this is not needed. Same in sRead.
 	go func() {
-		go func() { // TODO: I think this goroutin is not needed
-			wg.Wait()
-			close(errc)
-		}()
-		defer wg.Done() // TODO: I think just "defer close(errc)" suffices...
+		defer close(errc)
 		switch file := r.Fid.File.(type) {
 		case io.WriterAt:
 			n, err := file.WriteAt(ifcall.Data, int64(ifcall.Offset))