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/manifest.go | |
parent | ac2e42a480c5bba2e5128017218b0fa1bed8e836 (diff) | |
download | chat-0c8968fb8df4ce302c928118cd81e75f5bef2861.tar.gz chat-0c8968fb8df4ce302c928118cd81e75f5bef2861.tar.bz2 chat-0c8968fb8df4ce302c928118cd81e75f5bef2861.zip |
unnamed return (#8170)
Diffstat (limited to 'model/manifest.go')
-rw-r--r-- | model/manifest.go | 36 |
1 files changed, 9 insertions, 27 deletions
diff --git a/model/manifest.go b/model/manifest.go index 03d78f84e..5ba4854b6 100644 --- a/model/manifest.go +++ b/model/manifest.go @@ -142,43 +142,25 @@ type ManifestWebapp struct { } func (m *Manifest) ToJson() string { - b, err := json.Marshal(m) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(m) + return string(b) } func ManifestListToJson(m []*Manifest) string { - b, err := json.Marshal(m) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(m) + return string(b) } func ManifestFromJson(data io.Reader) *Manifest { - decoder := json.NewDecoder(data) - var m Manifest - err := decoder.Decode(&m) - if err == nil { - return &m - } else { - return nil - } + var m *Manifest + json.NewDecoder(data).Decode(&m) + return m } func ManifestListFromJson(data io.Reader) []*Manifest { - decoder := json.NewDecoder(data) var manifests []*Manifest - err := decoder.Decode(&manifests) - if err == nil { - return manifests - } else { - return nil - } + json.NewDecoder(data).Decode(&manifests) + return manifests } func (m *Manifest) HasClient() bool { |