From a32d545a4e51d138afdf4fc5971aa9ce23636a49 Mon Sep 17 00:00:00 2001 From: Julian Meyer Date: Sun, 17 Dec 2017 21:13:26 -0800 Subject: [PATCH] Removed more defer cancels and removed edits from vendor files. --- api/jsonapi.go | 3 +-- vendor/github.com/jessevdk/go-flags/parser.go | 6 +++--- .../goupnp/soap/types.go | 6 +++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/api/jsonapi.go b/api/jsonapi.go index 97273bcae7..2391bf011f 100644 --- a/api/jsonapi.go +++ b/api/jsonapi.go @@ -3495,8 +3495,7 @@ func (i *jsonAPIHandler) GETPeerInfo(w http.ResponseWriter, r *http.Request) { ErrorResponse(w, http.StatusBadRequest, err.Error()) return } - ctx, cancel := context.WithTimeout(context.Background(), time.Second*30) - defer cancel() + ctx, _ := context.WithTimeout(context.Background(), time.Second*30) pi, err := i.node.IpfsNode.Routing.FindPeer(ctx, pid) if err != nil { ErrorResponse(w, http.StatusNotFound, err.Error()) diff --git a/vendor/github.com/jessevdk/go-flags/parser.go b/vendor/github.com/jessevdk/go-flags/parser.go index 372c1b2bfe..f9e07ee10e 100644 --- a/vendor/github.com/jessevdk/go-flags/parser.go +++ b/vendor/github.com/jessevdk/go-flags/parser.go @@ -257,10 +257,10 @@ func (p *Parser) ParseArgs(args []string) ([]string, error) { if err != nil { ignoreUnknown := (p.Options & IgnoreUnknown) != None - errParse := wrapError(err) + parseErr := wrapError(err) - if errParse.Type != ErrUnknownFlag || (!ignoreUnknown && p.UnknownOptionHandler == nil) { - s.err = errParse + if parseErr.Type != ErrUnknownFlag || (!ignoreUnknown && p.UnknownOptionHandler == nil) { + s.err = parseErr break } diff --git a/vendor/gx/ipfs/QmQtBcHtRy9BxjawZjWJBn8aSKbqraBnQiVsc3wt9w9TTn/goupnp/soap/types.go b/vendor/gx/ipfs/QmQtBcHtRy9BxjawZjWJBn8aSKbqraBnQiVsc3wt9w9TTn/goupnp/soap/types.go index 27e2694cd7..fdbeec8d42 100644 --- a/vendor/gx/ipfs/QmQtBcHtRy9BxjawZjWJBn8aSKbqraBnQiVsc3wt9w9TTn/goupnp/soap/types.go +++ b/vendor/gx/ipfs/QmQtBcHtRy9BxjawZjWJBn8aSKbqraBnQiVsc3wt9w9TTn/goupnp/soap/types.go @@ -149,9 +149,9 @@ func UnmarshalString(v string) (string, error) { } func parseInt(s string, err *error) int { - v, errParse := strconv.ParseInt(s, 10, 64) - if errParse != nil { - *err = errParse + v, parseErr := strconv.ParseInt(s, 10, 64) + if parseErr != nil { + *err = parseErr } return int(v) }