gee-rpc: gob.go use err = to replace err :=

geektutu · geektutu · commit e094f101914b · 2020-10-07T00:49:17.000+08:00
diff --git a/gee-rpc/day1-codec/codec/gob.go b/gee-rpc/day1-codec/codec/gob.go
@@ -41,15 +41,15 @@ func (c *GobCodec) Write(h *Header, body interface{}) (err error) {
 			_ = c.Close()
 		}
 	}()
-	if err := c.enc.Encode(h); err != nil {
-		log.Println("rpc codec: gob error encoding header:", err)
-		return err
+	if err = c.enc.Encode(h); err != nil {
+		log.Println("rpc: gob error encoding header:", err)
+		return
 	}
-	if err := c.enc.Encode(body); err != nil {
-		log.Println("rpc codec: gob error encoding body:", err)
-		return err
+	if err = c.enc.Encode(body); err != nil {
+		log.Println("rpc: gob error encoding body:", err)
+		return
 	}
-	return nil
+	return
 }
 
 func (c *GobCodec) Close() error {
diff --git a/gee-rpc/day2-client/codec/gob.go b/gee-rpc/day2-client/codec/gob.go
@@ -41,15 +41,15 @@ func (c *GobCodec) Write(h *Header, body interface{}) (err error) {
 			_ = c.Close()
 		}
 	}()
-	if err := c.enc.Encode(h); err != nil {
-		log.Println("rpc codec: gob error encoding header:", err)
-		return err
+	if err = c.enc.Encode(h); err != nil {
+		log.Println("rpc: gob error encoding header:", err)
+		return
 	}
-	if err := c.enc.Encode(body); err != nil {
-		log.Println("rpc codec: gob error encoding body:", err)
-		return err
+	if err = c.enc.Encode(body); err != nil {
+		log.Println("rpc: gob error encoding body:", err)
+		return
 	}
-	return nil
+	return
 }
 
 func (c *GobCodec) Close() error {
diff --git a/gee-rpc/day3-service/codec/gob.go b/gee-rpc/day3-service/codec/gob.go
@@ -41,15 +41,15 @@ func (c *GobCodec) Write(h *Header, body interface{}) (err error) {
 			_ = c.Close()
 		}
 	}()
-	if err := c.enc.Encode(h); err != nil {
+	if err = c.enc.Encode(h); err != nil {
 		log.Println("rpc: gob error encoding header:", err)
-		return err
+		return
 	}
-	if err := c.enc.Encode(body); err != nil {
+	if err = c.enc.Encode(body); err != nil {
 		log.Println("rpc: gob error encoding body:", err)
-		return err
+		return
 	}
-	return nil
+	return
 }
 
 func (c *GobCodec) Close() error {
diff --git a/gee-rpc/day4-timeout/codec/gob.go b/gee-rpc/day4-timeout/codec/gob.go
@@ -41,15 +41,15 @@ func (c *GobCodec) Write(h *Header, body interface{}) (err error) {
 			_ = c.Close()
 		}
 	}()
-	if err := c.enc.Encode(h); err != nil {
+	if err = c.enc.Encode(h); err != nil {
 		log.Println("rpc: gob error encoding header:", err)
-		return err
+		return
 	}
-	if err := c.enc.Encode(body); err != nil {
+	if err = c.enc.Encode(body); err != nil {
 		log.Println("rpc: gob error encoding body:", err)
-		return err
+		return
 	}
-	return nil
+	return
 }
 
 func (c *GobCodec) Close() error {
diff --git a/gee-rpc/day5-http-debug/codec/gob.go b/gee-rpc/day5-http-debug/codec/gob.go
@@ -41,15 +41,15 @@ func (c *GobCodec) Write(h *Header, body interface{}) (err error) {
 			_ = c.Close()
 		}
 	}()
-	if err := c.enc.Encode(h); err != nil {
+	if err = c.enc.Encode(h); err != nil {
 		log.Println("rpc: gob error encoding header:", err)
-		return err
+		return
 	}
-	if err := c.enc.Encode(body); err != nil {
+	if err = c.enc.Encode(body); err != nil {
 		log.Println("rpc: gob error encoding body:", err)
-		return err
+		return
 	}
-	return nil
+	return
 }
 
 func (c *GobCodec) Close() error {
diff --git a/gee-rpc/day6-load-balance/codec/gob.go b/gee-rpc/day6-load-balance/codec/gob.go
@@ -41,15 +41,15 @@ func (c *GobCodec) Write(h *Header, body interface{}) (err error) {
 			_ = c.Close()
 		}
 	}()
-	if err := c.enc.Encode(h); err != nil {
+	if err = c.enc.Encode(h); err != nil {
 		log.Println("rpc: gob error encoding header:", err)
-		return err
+		return
 	}
-	if err := c.enc.Encode(body); err != nil {
+	if err = c.enc.Encode(body); err != nil {
 		log.Println("rpc: gob error encoding body:", err)
-		return err
+		return
 	}
-	return nil
+	return
 }
 
 func (c *GobCodec) Close() error {
diff --git a/gee-rpc/day7-registry/codec/gob.go b/gee-rpc/day7-registry/codec/gob.go
@@ -41,15 +41,15 @@ func (c *GobCodec) Write(h *Header, body interface{}) (err error) {
 			_ = c.Close()
 		}
 	}()
-	if err := c.enc.Encode(h); err != nil {
+	if err = c.enc.Encode(h); err != nil {
 		log.Println("rpc: gob error encoding header:", err)
-		return err
+		return
 	}
-	if err := c.enc.Encode(body); err != nil {
+	if err = c.enc.Encode(body); err != nil {
 		log.Println("rpc: gob error encoding body:", err)
-		return err
+		return
 	}
-	return nil
+	return
 }
 
 func (c *GobCodec) Close() error {

Original file line number	Diff line number	Diff line change
`@@ -41,15 +41,15 @@ func (c GobCodec) Write(h Header, body interface{}) (err error) {`
`41`	`41`	`_ = c.Close()`
`42`	`42`	`}`
`43`	`43`	`}()`
`44`		`- if err := c.enc.Encode(h); err != nil {`
`45`		`- log.Println("rpc codec: gob error encoding header:", err)`
`46`		`- return err`
	`44`	`+ if err = c.enc.Encode(h); err != nil {`
	`45`	`+ log.Println("rpc: gob error encoding header:", err)`
	`46`	`+ return`
`47`	`47`	`}`
`48`		`- if err := c.enc.Encode(body); err != nil {`
`49`		`- log.Println("rpc codec: gob error encoding body:", err)`
`50`		`- return err`
	`48`	`+ if err = c.enc.Encode(body); err != nil {`
	`49`	`+ log.Println("rpc: gob error encoding body:", err)`
	`50`	`+ return`
`51`	`51`	`}`
`52`		`- return nil`
	`52`	`+ return`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`func (c *GobCodec) Close() error {`