blackteay/gin
3
0
Fork 0
mirror of https://github.com/gin-gonic/gin.git synced 2025-10-16 21:32:11 +08:00
Code Issues Projects Releases Wiki Activity

Delete err return in func with named return

Browse Source
This commit is contained in:
Alexander Melentyev 2021-08-22 21:19:49 +03:00
parent 4e7584175d
commit 32a09581ca
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
context.go
View File

@ -716,7 +716,7 @@ func (c *Context) ShouldBindBodyWith(obj interface{}, bb binding.BindingBody) (e
if body == nil { if body == nil {
body, err = ioutil.ReadAll(c.Request.Body) body, err = ioutil.ReadAll(c.Request.Body)
if err != nil { if err != nil {
return err return
} }
c.Set(BodyBytesKey, body) c.Set(BodyBytesKey, body)
} }

10
gin.go
View File

@ -343,7 +343,7 @@ func (engine *Engine) Run(addr ...string) (err error) {
err = engine.parseTrustedProxies() err = engine.parseTrustedProxies()
if err != nil { if err != nil {
return err return
} }
address := resolveAddress(addr) address := resolveAddress(addr)
@ -417,7 +417,7 @@ func (engine *Engine) RunTLS(addr, certFile, keyFile string) (err error) {
err = engine.parseTrustedProxies() err = engine.parseTrustedProxies()
if err != nil { if err != nil {
return err return
} }
err = http.ListenAndServeTLS(addr, certFile, keyFile, engine) err = http.ListenAndServeTLS(addr, certFile, keyFile, engine)
@ -433,7 +433,7 @@ func (engine *Engine) RunUnix(file string) (err error) {
err = engine.parseTrustedProxies() err = engine.parseTrustedProxies()
if err != nil { if err != nil {
return err return
} }
listener, err := net.Listen("unix", file) listener, err := net.Listen("unix", file)
@ -456,7 +456,7 @@ func (engine *Engine) RunFd(fd int) (err error) {
err = engine.parseTrustedProxies() err = engine.parseTrustedProxies()
if err != nil { if err != nil {
return err return
} }
f := os.NewFile(uintptr(fd), fmt.Sprintf("fd@%d", fd)) 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() err = engine.parseTrustedProxies()
if err != nil { if err != nil {
return err return
} }
err = http.Serve(listener, engine) err = http.Serve(listener, engine)

16
render/json.go
View File

@ -120,29 +120,29 @@ func (r JsonpJSON) Render(w http.ResponseWriter) (err error) {
r.WriteContentType(w) r.WriteContentType(w)
ret, err := json.Marshal(r.Data) ret, err := json.Marshal(r.Data)
if err != nil { if err != nil {
return err return
} }
if r.Callback == "" { if r.Callback == "" {
_, err = w.Write(ret) _, err = w.Write(ret)
return err return
} }
callback := template.JSEscapeString(r.Callback) callback := template.JSEscapeString(r.Callback)
if _, err = w.Write(bytesconv.StringToBytes(callback)); err != nil { if _, err = w.Write(bytesconv.StringToBytes(callback)); err != nil {
return err return
} }
if _, err = w.Write(bytesconv.StringToBytes("(")); err != nil { if _, err = w.Write(bytesconv.StringToBytes("(")); err != nil {
return err return
} }
if _, err = w.Write(ret); err != nil { if _, err = w.Write(ret); err != nil {
return err return
} }
if _, err = w.Write(bytesconv.StringToBytes(");")); err != nil { if _, err = w.Write(bytesconv.StringToBytes(");")); err != nil {
return err return
} }
return nil return nil
@ -158,7 +158,7 @@ func (r AsciiJSON) Render(w http.ResponseWriter) (err error) {
r.WriteContentType(w) r.WriteContentType(w)
ret, err := json.Marshal(r.Data) ret, err := json.Marshal(r.Data)
if err != nil { if err != nil {
return err return
} }
var buffer bytes.Buffer var buffer bytes.Buffer
@ -171,7 +171,7 @@ func (r AsciiJSON) Render(w http.ResponseWriter) (err error) {
} }
_, err = w.Write(buffer.Bytes()) _, err = w.Write(buffer.Bytes())
return err return
} }
// WriteContentType (AsciiJSON) writes JSON ContentType. // WriteContentType (AsciiJSON) writes JSON ContentType.