diff options
author | Chris <ccbrown112@gmail.com> | 2018-01-30 17:23:00 -0600 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2018-01-30 15:23:00 -0800 |
commit | 0c8968fb8df4ce302c928118cd81e75f5bef2861 (patch) | |
tree | b17a2ae5afc98f7ce3daaea10a165d9d647c47c5 /model/session.go | |
parent | ac2e42a480c5bba2e5128017218b0fa1bed8e836 (diff) | |
download | chat-0c8968fb8df4ce302c928118cd81e75f5bef2861.tar.gz chat-0c8968fb8df4ce302c928118cd81e75f5bef2861.tar.bz2 chat-0c8968fb8df4ce302c928118cd81e75f5bef2861.zip |
unnamed return (#8170)
Diffstat (limited to 'model/session.go')
-rw-r--r-- | model/session.go | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/model/session.go b/model/session.go index 704af067c..a407af26a 100644 --- a/model/session.go +++ b/model/session.go @@ -43,23 +43,14 @@ func (me *Session) DeepCopy() *Session { } func (me *Session) ToJson() string { - b, err := json.Marshal(me) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(me) + return string(b) } func SessionFromJson(data io.Reader) *Session { - decoder := json.NewDecoder(data) - var me Session - err := decoder.Decode(&me) - if err == nil { - return &me - } else { - return nil - } + var me *Session + json.NewDecoder(data).Decode(&me) + return me } func (me *Session) PreSave() { @@ -140,12 +131,7 @@ func SessionsToJson(o []*Session) string { } func SessionsFromJson(data io.Reader) []*Session { - decoder := json.NewDecoder(data) var o []*Session - err := decoder.Decode(&o) - if err == nil { - return o - } else { - return nil - } + json.NewDecoder(data).Decode(&o) + return o } |