From 80ca168cbedcb6955fb52e4ff96e89ed6bc714bf Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Mon, 27 Oct 2014 09:44:41 -0700 Subject: [PATCH] client: simplify MembersAPI response parsing --- client/members.go | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/client/members.go b/client/members.go index 7d60455c9..3e7616cbb 100644 --- a/client/members.go +++ b/client/members.go @@ -68,15 +68,14 @@ func (m *httpMembersAPI) List() ([]httptypes.Member, error) { mResponse := httpMembersAPIResponse{ code: httpresp.StatusCode, - body: body, } - if err = mResponse.err(); err != nil { + if err := mResponse.err(); err != nil { return nil, err } var mCollection httptypes.MemberCollection - if err = mResponse.unmarshalBody(&mCollection); err != nil { + if err := json.Unmarshal(body, &mCollection); err != nil { return nil, err } @@ -85,7 +84,6 @@ func (m *httpMembersAPI) List() ([]httptypes.Member, error) { type httpMembersAPIResponse struct { code int - body []byte } func (r *httpMembersAPIResponse) err() (err error) { @@ -95,10 +93,6 @@ func (r *httpMembersAPIResponse) err() (err error) { return } -func (r *httpMembersAPIResponse) unmarshalBody(dst interface{}) (err error) { - return json.Unmarshal(r.body, dst) -} - type membersAPIActionList struct{} func (l *membersAPIActionList) httpRequest(ep url.URL) *http.Request {