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/status.go | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) (limited to 'model/status.go') diff --git a/model/status.go b/model/status.go index 6da6161eb..cd9e32ed3 100644 --- a/model/status.go +++ b/model/status.go @@ -27,43 +27,25 @@ type Status struct { } func (o *Status) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func StatusFromJson(data io.Reader) *Status { - decoder := json.NewDecoder(data) - var o Status - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *Status + json.NewDecoder(data).Decode(&o) + return o } func StatusListToJson(u []*Status) string { - b, err := json.Marshal(u) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(u) + return string(b) } func StatusListFromJson(data io.Reader) []*Status { - decoder := json.NewDecoder(data) var statuses []*Status - err := decoder.Decode(&statuses) - if err == nil { - return statuses - } else { - return nil - } + json.NewDecoder(data).Decode(&statuses) + return statuses } func StatusMapToInterfaceMap(statusMap map[string]*Status) map[string]interface{} { -- cgit v1.2.3-1-g7c22