From 0c8968fb8df4ce302c928118cd81e75f5bef2861 Mon Sep 17 00:00:00 2001
From: Chris <ccbrown112@gmail.com>
Date: Tue, 30 Jan 2018 17:23:00 -0600
Subject: unnamed return (#8170)

---
 model/access.go | 38 ++++++++++----------------------------
 1 file changed, 10 insertions(+), 28 deletions(-)

(limited to 'model/access.go')

diff --git a/model/access.go b/model/access.go
index 551ef930f..e9603c78e 100644
--- a/model/access.go
+++ b/model/access.go
@@ -74,41 +74,23 @@ func (me *AccessData) IsExpired() bool {
 }
 
 func (ad *AccessData) ToJson() string {
-	b, err := json.Marshal(ad)
-	if err != nil {
-		return ""
-	} else {
-		return string(b)
-	}
+	b, _ := json.Marshal(ad)
+	return string(b)
 }
 
 func AccessDataFromJson(data io.Reader) *AccessData {
-	decoder := json.NewDecoder(data)
-	var ad AccessData
-	err := decoder.Decode(&ad)
-	if err == nil {
-		return &ad
-	} else {
-		return nil
-	}
+	var ad *AccessData
+	json.NewDecoder(data).Decode(&ad)
+	return ad
 }
 
 func (ar *AccessResponse) ToJson() string {
-	b, err := json.Marshal(ar)
-	if err != nil {
-		return ""
-	} else {
-		return string(b)
-	}
+	b, _ := json.Marshal(ar)
+	return string(b)
 }
 
 func AccessResponseFromJson(data io.Reader) *AccessResponse {
-	decoder := json.NewDecoder(data)
-	var ar AccessResponse
-	err := decoder.Decode(&ar)
-	if err == nil {
-		return &ar
-	} else {
-		return nil
-	}
+	var ar *AccessResponse
+	json.NewDecoder(data).Decode(&ar)
+	return ar
 }
-- 
cgit v1.2.3-1-g7c22