summaryrefslogtreecommitdiffstats
path: root/model/mfa_secret.go
diff options
context:
space:
mode:
authorChris <ccbrown112@gmail.com>2018-01-30 17:23:00 -0600
committerCorey Hulen <corey@hulen.com>2018-01-30 15:23:00 -0800
commit0c8968fb8df4ce302c928118cd81e75f5bef2861 (patch)
treeb17a2ae5afc98f7ce3daaea10a165d9d647c47c5 /model/mfa_secret.go
parentac2e42a480c5bba2e5128017218b0fa1bed8e836 (diff)
downloadchat-0c8968fb8df4ce302c928118cd81e75f5bef2861.tar.gz
chat-0c8968fb8df4ce302c928118cd81e75f5bef2861.tar.bz2
chat-0c8968fb8df4ce302c928118cd81e75f5bef2861.zip
unnamed return (#8170)
Diffstat (limited to 'model/mfa_secret.go')
-rw-r--r--model/mfa_secret.go19
1 files changed, 5 insertions, 14 deletions
diff --git a/model/mfa_secret.go b/model/mfa_secret.go
index 99580f5f3..23a903c89 100644
--- a/model/mfa_secret.go
+++ b/model/mfa_secret.go
@@ -14,21 +14,12 @@ type MfaSecret struct {
}
func (me *MfaSecret) ToJson() string {
- b, err := json.Marshal(me)
- if err != nil {
- return ""
- } else {
- return string(b)
- }
+ b, _ := json.Marshal(me)
+ return string(b)
}
func MfaSecretFromJson(data io.Reader) *MfaSecret {
- decoder := json.NewDecoder(data)
- var me MfaSecret
- err := decoder.Decode(&me)
- if err == nil {
- return &me
- } else {
- return nil
- }
+ var me *MfaSecret
+ json.NewDecoder(data).Decode(&me)
+ return me
}