From 0c8968fb8df4ce302c928118cd81e75f5bef2861 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 30 Jan 2018 17:23:00 -0600 Subject: unnamed return (#8170) --- model/initial_load.go | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'model/initial_load.go') diff --git a/model/initial_load.go b/model/initial_load.go index 71ba17696..3be680446 100644 --- a/model/initial_load.go +++ b/model/initial_load.go @@ -19,21 +19,12 @@ type InitialLoad struct { } func (me *InitialLoad) ToJson() string { - b, err := json.Marshal(me) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(me) + return string(b) } func InitialLoadFromJson(data io.Reader) *InitialLoad { - decoder := json.NewDecoder(data) - var o InitialLoad - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *InitialLoad + json.NewDecoder(data).Decode(&o) + return o } -- cgit v1.2.3-1-g7c22