cleanup code base: reformat some code based on staticcheck

Signed-off-by: Guangming Wang <[email protected]>

client/request.go

@@ -132,10 +132,8 @@ func (client *APIClient) newRequest(method, path string, query url.Values, body
 		return nil, err
 	}
 
-	if header != nil {
-		for k, v := range header {
-			req.Header[k] = v
-		}
+	for k, v := range header {
+		req.Header[k] = v
 	}
 
 	return req, err

dfget/core/core.go

@@ -303,5 +303,4 @@ func reportMetrics(cfg *config.Config, supernodeAPI api.SupernodeAPI, downloadTi
 			return
 		}
 	}
-	return
 }

dfget/core/uploader/peer_server.go

@@ -192,13 +192,13 @@ func (ps *peerServer) parseRateHandler(w http.ResponseWriter, r *http.Request) {
 
 	// no need to calculate rate when totalLimitRate less than or equals zero.
 	if ps.totalLimitRate <= 0 {
-		fmt.Fprintf(w, rateLimit)
+		fmt.Fprint(w, rateLimit)
 		return
 	}
 
 	clientRate = ps.calculateRateLimit(clientRate)
 
-	fmt.Fprintf(w, strconv.Itoa(clientRate))
+	fmt.Fprint(w, strconv.Itoa(clientRate))
 }
 
 // checkHandler use to check the server status.
@@ -234,7 +234,7 @@ func (ps *peerServer) checkHandler(w http.ResponseWriter, r *http.Request) {
 func (ps *peerServer) oneFinishHandler(w http.ResponseWriter, r *http.Request) {
 	if err := r.ParseForm(); err != nil {
 		sendHeader(w, http.StatusBadRequest)
-		fmt.Fprintf(w, err.Error())
+		fmt.Fprint(w, err.Error())
 		return
 	}
 

dfget/core/uploader/uploader.go

@@ -106,7 +106,7 @@ func launch(cfg *config.Config, p2pPtr *unsafe.Pointer) error {
 		tmp := newPeerServer(cfg, port)
 		storeSrvPtr(p2pPtr, tmp)
 		if err := tmp.ListenAndServe(); err != nil {
-			if strings.Index(err.Error(), "address already in use") < 0 {
+			if !strings.Contains(err.Error(), "address already in use") {
 				// start failed or shutdown
 				return err
 			} else if uploaderAPI.PingServer(tmp.host, tmp.port) {

supernode/server/router.go

@@ -102,7 +102,6 @@ func filter(handler Handler) http.HandlerFunc {
 			// Handle error if request handling fails.
 			HandleErrorResponse(w, err)
 		}
-		return
 	}
 }