Merge pull request #698 from buddhamagnet/master

Correct unused assignments

caddy/https/https_test.go

@@ -116,7 +116,7 @@ func TestRedirPlaintextHost(t *testing.T) {
 	// browsers can infer a default port from scheme, so make sure the port
 	// doesn't get added in explicitly for default ports like 443 for https.
 	cfg = redirPlaintextHost(server.Config{Host: "example.com", Port: "443"})
-	handler, ok = cfg.Middleware[0](nil).(redirect.Redirect)
+	handler, _ = cfg.Middleware[0](nil).(redirect.Redirect)
 	if actual, expected := handler.Rules[0].To, "https://{host}{uri}"; actual != expected {
 		t.Errorf("(Default Port) Expected redirect rule to be to URL '%s' but is actually to '%s'", expected, actual)
 	}

caddy/setup/errors_test.go

@@ -40,7 +40,7 @@ func TestErrors(t *testing.T) {
 	if len(c.Startup) == 0 {
 		t.Fatal("Expected 1 startup function, had 0")
 	}
-	err = c.Startup[0]()
+	c.Startup[0]()
 	if myHandler.Log == nil {
 		t.Error("Expected Log to be non-nil after startup because Debug is not enabled")
 	}

caddy/setup/websocket.go

@@ -62,7 +62,7 @@ func webSocketParse(c *Controller) ([]websocket.Config, error) {
 			}
 
 			// Okay, check again for optional block
-			hadBlock, err = optionalBlock()
+			_, err = optionalBlock()
 			if err != nil {
 				return nil, err
 			}

middleware/browse/browse_test.go

@@ -131,7 +131,7 @@ func TestBrowseTemplate(t *testing.T) {
 
 	rec := httptest.NewRecorder()
 
-	code, err := b.ServeHTTP(rec, req)
+	code, _ := b.ServeHTTP(rec, req)
 	if code != http.StatusOK {
 		t.Fatalf("Wrong status, expected %d, got %d", http.StatusOK, code)
 	}

middleware/commands.go

@@ -113,7 +113,6 @@ func parseWindowsCommand(cmd string) []string {
 
 	if len(part) > 0 {
 		parts = append(parts, part)
-		part = ""
 	}
 
 	return parts

middleware/context.go

@@ -153,7 +153,6 @@ func (c Context) StripHTML(s string) string {
 	if inTag {
 		// false start
 		buf.WriteString(s[tagStart:])
-		inTag = false
 	}
 	return buf.String()
 }

middleware/fastcgi/fcgiclient.go

@@ -149,7 +149,7 @@ func (rec *record) read(r io.Reader) (buf []byte, err error) {
 	if len(rec.rbuf) < n {
 		rec.rbuf = make([]byte, n)
 	}
-	if n, err = io.ReadFull(r, rec.rbuf[:n]); err != nil {
+	if _, err = io.ReadFull(r, rec.rbuf[:n]); err != nil {
 		return
 	}
 	buf = rec.rbuf[:int(rec.h.ContentLength)]

middleware/fastcgi/fcgiclient_test.go

@@ -149,7 +149,7 @@ func sendFcgi(reqType int, fcgiParams map[string]string, data []byte, posts map[
 	}
 
 	defer resp.Body.Close()
-	content, err = ioutil.ReadAll(resp.Body)
+	content, _ = ioutil.ReadAll(resp.Body)
 
 	log.Println("c: send data length ≈", length, string(content))
 	fcgi.Close()
@@ -226,16 +226,11 @@ func DisabledTest(t *testing.T) {
 
 	log.Println("test:", "post data (more than 60KB)")
 	data := ""
-	length := 0
 	for i := 0x00; i < 0xff; i++ {
 		v0 := strings.Repeat(string(i), 256)
 		h := md5.New()
 		io.WriteString(h, v0)
 		k0 := fmt.Sprintf("%x", h.Sum(nil))
-
-		length += len(k0)
-		length += len(v0)
-
 		data += k0 + "=" + url.QueryEscape(v0) + "&"
 	}
 	sendFcgi(0, fcgiParams, []byte(data), nil, nil)

middleware/inner/internal_test.go

@@ -37,7 +37,7 @@ func TestInternal(t *testing.T) {
 		}
 
 		rec := httptest.NewRecorder()
-		code, err := im.ServeHTTP(rec, req)
+		code, _ := im.ServeHTTP(rec, req)
 
 		if code != test.expectedCode {
 			t.Errorf("Test %d: Expected status code %d for %s, but got %d",

middleware/markdown/metadata_test.go

@@ -201,12 +201,12 @@ func TestParsers(t *testing.T) {
 		}
 
 		// invalid metadata
-		if md, err = v.parser.Parse([]byte(v.testData[3])); err == nil {
+		if _, err = v.parser.Parse([]byte(v.testData[3])); err == nil {
 			t.Fatalf("Expected error for invalid metadata for %v", v.name)
 		}
 
 		// front matter but no body
-		if md, err = v.parser.Parse([]byte(v.testData[4])); err != nil {
+		if _, err = v.parser.Parse([]byte(v.testData[4])); err != nil {
 			t.Fatalf("Unexpected error for valid metadata but no body for %v", v.name)
 		}
 	}