From 32a09581caf14cb5751f5921e7fc2267fb1e79aa Mon Sep 17 00:00:00 2001 From: Alexander Melentyev Date: Sun, 22 Aug 2021 21:19:49 +0300 Subject: [PATCH] Delete err return in func with named return --- context.go | 2 +- gin.go | 10 +++++----- render/json.go | 16 ++++++++-------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/context.go b/context.go index 56c20f2c..41d7bd07 100644 --- a/context.go +++ b/context.go @@ -716,7 +716,7 @@ func (c *Context) ShouldBindBodyWith(obj interface{}, bb binding.BindingBody) (e if body == nil { body, err = ioutil.ReadAll(c.Request.Body) if err != nil { - return err + return } c.Set(BodyBytesKey, body) } diff --git a/gin.go b/gin.go index 6ab2be66..ba01d77a 100644 --- a/gin.go +++ b/gin.go @@ -343,7 +343,7 @@ func (engine *Engine) Run(addr ...string) (err error) { err = engine.parseTrustedProxies() if err != nil { - return err + return } address := resolveAddress(addr) @@ -417,7 +417,7 @@ func (engine *Engine) RunTLS(addr, certFile, keyFile string) (err error) { err = engine.parseTrustedProxies() if err != nil { - return err + return } err = http.ListenAndServeTLS(addr, certFile, keyFile, engine) @@ -433,7 +433,7 @@ func (engine *Engine) RunUnix(file string) (err error) { err = engine.parseTrustedProxies() if err != nil { - return err + return } listener, err := net.Listen("unix", file) @@ -456,7 +456,7 @@ func (engine *Engine) RunFd(fd int) (err error) { err = engine.parseTrustedProxies() if err != nil { - return err + return } f := os.NewFile(uintptr(fd), fmt.Sprintf("fd@%d", fd)) @@ -477,7 +477,7 @@ func (engine *Engine) RunListener(listener net.Listener) (err error) { err = engine.parseTrustedProxies() if err != nil { - return err + return } err = http.Serve(listener, engine) diff --git a/render/json.go b/render/json.go index 3ebcee97..210c136c 100644 --- a/render/json.go +++ b/render/json.go @@ -120,29 +120,29 @@ func (r JsonpJSON) Render(w http.ResponseWriter) (err error) { r.WriteContentType(w) ret, err := json.Marshal(r.Data) if err != nil { - return err + return } if r.Callback == "" { _, err = w.Write(ret) - return err + return } callback := template.JSEscapeString(r.Callback) if _, err = w.Write(bytesconv.StringToBytes(callback)); err != nil { - return err + return } if _, err = w.Write(bytesconv.StringToBytes("(")); err != nil { - return err + return } if _, err = w.Write(ret); err != nil { - return err + return } if _, err = w.Write(bytesconv.StringToBytes(");")); err != nil { - return err + return } return nil @@ -158,7 +158,7 @@ func (r AsciiJSON) Render(w http.ResponseWriter) (err error) { r.WriteContentType(w) ret, err := json.Marshal(r.Data) if err != nil { - return err + return } var buffer bytes.Buffer @@ -171,7 +171,7 @@ func (r AsciiJSON) Render(w http.ResponseWriter) (err error) { } _, err = w.Write(buffer.Bytes()) - return err + return } // WriteContentType (AsciiJSON) writes JSON ContentType.