summaryrefslogtreecommitdiff
path: root/vendor/github.com/gin-gonic/gin/render/json.go
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/github.com/gin-gonic/gin/render/json.go')
-rw-r--r--vendor/github.com/gin-gonic/gin/render/json.go22
1 files changed, 10 insertions, 12 deletions
diff --git a/vendor/github.com/gin-gonic/gin/render/json.go b/vendor/github.com/gin-gonic/gin/render/json.go
index e25415b00..3ebcee970 100644
--- a/vendor/github.com/gin-gonic/gin/render/json.go
+++ b/vendor/github.com/gin-gonic/gin/render/json.go
@@ -49,7 +49,7 @@ type PureJSON struct {
var (
jsonContentType = []string{"application/json; charset=utf-8"}
jsonpContentType = []string{"application/javascript; charset=utf-8"}
- jsonAsciiContentType = []string{"application/json"}
+ jsonASCIIContentType = []string{"application/json"}
)
// Render (JSON) writes data with custom ContentType.
@@ -102,8 +102,7 @@ func (r SecureJSON) Render(w http.ResponseWriter) error {
// if the jsonBytes is array values
if bytes.HasPrefix(jsonBytes, bytesconv.StringToBytes("[")) && bytes.HasSuffix(jsonBytes,
bytesconv.StringToBytes("]")) {
- _, err = w.Write(bytesconv.StringToBytes(r.Prefix))
- if err != nil {
+ if _, err = w.Write(bytesconv.StringToBytes(r.Prefix)); err != nil {
return err
}
}
@@ -130,20 +129,19 @@ func (r JsonpJSON) Render(w http.ResponseWriter) (err error) {
}
callback := template.JSEscapeString(r.Callback)
- _, err = w.Write(bytesconv.StringToBytes(callback))
- if err != nil {
+ if _, err = w.Write(bytesconv.StringToBytes(callback)); err != nil {
return err
}
- _, err = w.Write(bytesconv.StringToBytes("("))
- if err != nil {
+
+ if _, err = w.Write(bytesconv.StringToBytes("(")); err != nil {
return err
}
- _, err = w.Write(ret)
- if err != nil {
+
+ if _, err = w.Write(ret); err != nil {
return err
}
- _, err = w.Write(bytesconv.StringToBytes(");"))
- if err != nil {
+
+ if _, err = w.Write(bytesconv.StringToBytes(");")); err != nil {
return err
}
@@ -178,7 +176,7 @@ func (r AsciiJSON) Render(w http.ResponseWriter) (err error) {
// WriteContentType (AsciiJSON) writes JSON ContentType.
func (r AsciiJSON) WriteContentType(w http.ResponseWriter) {
- writeContentType(w, jsonAsciiContentType)
+ writeContentType(w, jsonASCIIContentType)
}
// Render (PureJSON) writes custom ContentType and encodes the given interface object.