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/cluster_info.go | |
| parent | ac2e42a480c5bba2e5128017218b0fa1bed8e836 (diff) | |
| download | chat-0c8968fb8df4ce302c928118cd81e75f5bef2861.tar.gz chat-0c8968fb8df4ce302c928118cd81e75f5bef2861.tar.bz2 chat-0c8968fb8df4ce302c928118cd81e75f5bef2861.zip | |
unnamed return (#8170)
Diffstat (limited to 'model/cluster_info.go')
| -rw-r--r-- | model/cluster_info.go | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/model/cluster_info.go b/model/cluster_info.go index c4f7e89a6..a8d63ec32 100644 --- a/model/cluster_info.go +++ b/model/cluster_info.go @@ -18,12 +18,8 @@ type ClusterInfo struct { } func (me *ClusterInfo) ToJson() string { - b, err := json.Marshal(me) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(me) + return string(b) } func (me *ClusterInfo) Copy() *ClusterInfo { @@ -32,22 +28,14 @@ func (me *ClusterInfo) Copy() *ClusterInfo { } func ClusterInfoFromJson(data io.Reader) *ClusterInfo { - decoder := json.NewDecoder(data) - var me ClusterInfo - err := decoder.Decode(&me) - if err == nil { - return &me - } else { - return nil - } + var me *ClusterInfo + json.NewDecoder(data).Decode(&me) + return me } func ClusterInfosToJson(objmap []*ClusterInfo) string { - if b, err := json.Marshal(objmap); err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(objmap) + return string(b) } func ClusterInfosFromJson(data io.Reader) []*ClusterInfo { |