Removed more defer cancels and removed edits from vendor files.

phoreproject · Dec 18, 2017 · a32d545 · a32d545
1 parent a5cddf3
commit a32d545
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git 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
diff --git 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)
 }