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/websocket_message.go | |
parent | ac2e42a480c5bba2e5128017218b0fa1bed8e836 (diff) | |
download | chat-0c8968fb8df4ce302c928118cd81e75f5bef2861.tar.gz chat-0c8968fb8df4ce302c928118cd81e75f5bef2861.tar.bz2 chat-0c8968fb8df4ce302c928118cd81e75f5bef2861.zip |
unnamed return (#8170)
Diffstat (limited to 'model/websocket_message.go')
-rw-r--r-- | model/websocket_message.go | 38 |
1 files changed, 10 insertions, 28 deletions
diff --git a/model/websocket_message.go b/model/websocket_message.go index bf2535dc3..0aab74865 100644 --- a/model/websocket_message.go +++ b/model/websocket_message.go @@ -82,23 +82,14 @@ func (o *WebSocketEvent) EventType() string { } func (o *WebSocketEvent) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func WebSocketEventFromJson(data io.Reader) *WebSocketEvent { - decoder := json.NewDecoder(data) - var o WebSocketEvent - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *WebSocketEvent + json.NewDecoder(data).Decode(&o) + return o } type WebSocketResponse struct { @@ -129,21 +120,12 @@ func (o *WebSocketResponse) EventType() string { } func (o *WebSocketResponse) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func WebSocketResponseFromJson(data io.Reader) *WebSocketResponse { - decoder := json.NewDecoder(data) - var o WebSocketResponse - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *WebSocketResponse + json.NewDecoder(data).Decode(&o) + return o } |