re
/
sjson
forked from mirror/sjson
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #28 from donatello/fix-err-shadow 

Fix error variable shadowing
This commit is contained in:
Josh Baker 2019-02-28 13:39:17 -07:00 committed by GitHub
parent c943cc8c8d d46b5fa72e
commit 25fb082a20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sjson_gae.go
View File

@ -116,9 +116,9 @@ func SetBytesOptions(json []byte, path string, value interface{},
var err error var err error
switch v := value.(type) { switch v := value.(type) {
default: default:
b, err := jsongo.Marshal(value) b, merr := jsongo.Marshal(value)
if err != nil { if merr != nil {
return nil, err return nil, merr
} }
// raw := *(*string)(unsafe.Pointer(&b)) // raw := *(*string)(unsafe.Pointer(&b))
raw := string(b) raw := string(b)

6
sjson_ngae.go
View File

@ -115,9 +115,9 @@ func SetBytesOptions(json []byte, path string, value interface{},
var err error var err error
switch v := value.(type) { switch v := value.(type) {
default: default:
b, err := jsongo.Marshal(value) b, merr := jsongo.Marshal(value)
if err != nil { if merr != nil {
return nil, err return nil, merr
} }
raw := *(*string)(unsafe.Pointer(&b)) raw := *(*string)(unsafe.Pointer(&b))
res, err = set(jstr, path, raw, false, false, optimistic, inplace) res, err = set(jstr, path, raw, false, false, optimistic, inplace)