Fix various issues to make newer golangci-lint happy.

.golangci.yml

@@ -16,8 +16,7 @@ linters:
   enable:
     - asciicheck
     - bodyclose
-    - deadcode
-    - depguard
+    # - depguard
     - errcheck
     - errorlint
     - exhaustive
@@ -42,11 +41,10 @@ linters:
     - rowserrcheck
     - sqlclosecheck
     - staticcheck
-    - structcheck
     - tparallel
     - typecheck
     - unconvert
-    - varcheck
+    - unused
     - wastedassign
 
   fast: false

cmd/fotomat/handle_test.go

@@ -3,13 +3,14 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"net"
 	"net/http"
 	"os"
 	"runtime"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/assert"
 
@@ -34,7 +35,13 @@ func TestMain(m *testing.M) {
 	// Record that address.
 	localhost = listen.Addr().String()
 
-	go func() { _ = http.Serve(listen, handleInit()) }()
+	go func() {
+		srv := &http.Server{
+			Handler:     handleInit(),
+			ReadTimeout: 10 * time.Second,
+		}
+		_ = srv.Serve(listen)
+	}()
 
 	vips.Initialize()
 	vips.LeakSet(true)
@@ -133,7 +140,7 @@ func fetch(filename string) ([]byte, int) {
 
 	defer resp.Body.Close()
 
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		panic(err)
 	}

cmd/fotomat/main.go

@@ -34,8 +34,16 @@ func main() {
 	}
 
 	if *debugListen != "" {
-		http.Handle("/metrics", promhttp.Handler())
-		go func() { log.Fatal(http.ListenAndServe(*debugListen, nil)) }()
+		go func() {
+			ps := &http.Server{
+				Addr:         *debugListen,
+				Handler:      promhttp.Handler(),
+				ReadTimeout:  10 * time.Second,
+				WriteTimeout: 10 * time.Second,
+				IdleTimeout:  5 * time.Minute,
+			}
+			log.Fatal(ps.ListenAndServe())
+		}()
 	}
 
 	handler := handleInit()

format/format_test.go

@@ -2,7 +2,6 @@ package format
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strconv"
 	"testing"
@@ -48,7 +47,7 @@ func metadataError(filename string) error {
 }
 
 func image(filename string) []byte {
-	bytes, err := ioutil.ReadFile(TestdataPath + filename)
+	bytes, err := os.ReadFile(TestdataPath + filename)
 	if err != nil {
 		panic(err)
 	}

thumbnail/icc.go

@@ -43,7 +43,7 @@ var (
 func init() {
 	d := path.Join(os.TempDir(), "fotomat_temp-"+strconv.Itoa(os.Getuid()), "icc")
 
-	if err := os.MkdirAll(d, 0700); err != nil {
+	if err := os.MkdirAll(d, 0o700); err != nil {
 		log.Fatalln("Can't create directory", d, err)
 	}
 

thumbnail/proxy.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net"
 	"net/http"
 	"strconv"
@@ -122,7 +122,7 @@ func (p *Proxy) ServeHTTP(w http.ResponseWriter, or *http.Request) {
 }
 
 func (p *Proxy) get(ctx context.Context, url string, header http.Header) ([]byte, http.Header, int, error) {
-	r, err := http.NewRequest("GET", url, nil)
+	r, err := http.NewRequest("GET", url, http.NoBody)
 	if err != nil {
 		return nil, nil, 0, err
 	}
@@ -139,7 +139,7 @@ func (p *Proxy) get(ctx context.Context, url string, header http.Header) ([]byte
 		return nil, nil, 0, err
 	}
 
-	orig, err := ioutil.ReadAll(resp.Body)
+	orig, err := io.ReadAll(resp.Body)
 	_ = resp.Body.Close()
 
 	return orig, resp.Header, resp.StatusCode, err
@@ -204,7 +204,7 @@ func proxyError(w http.ResponseWriter, err error, status int) {
 	}
 
 	if err == nil {
-		err = fmt.Errorf(http.StatusText(status))
+		err = errors.New(http.StatusText(status))
 	}
 
 	http.Error(w, err.Error(), status)

thumbnail/proxy_test.go

@@ -2,7 +2,7 @@ package thumbnail
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -115,7 +115,7 @@ func (ps *proxyServer) get(filename string) ([]byte, int) {
 		panic(err)
 	}
 
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	resp.Body.Close()
 	if err != nil {
 		panic(err)

thumbnail/thumbnail_test.go

@@ -2,7 +2,6 @@ package thumbnail
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strconv"
 	"testing"
@@ -424,7 +423,7 @@ func isSize(image []byte, f format.Format, width, height int, alpha bool) error
 }
 
 func image(filename string) []byte {
-	bytes, err := ioutil.ReadFile("../testdata/" + filename)
+	bytes, err := os.ReadFile("../testdata/" + filename)
 	if err != nil {
 		panic(err)
 	}

vips/convolution.go

@@ -16,7 +16,7 @@ func (in *Image) Gaussblur(sigma float64) error {
 
 // PhotoMetric takes a histogram of a Sobel edge detect of our image.
 // Returns the highest number of histogram values in a row that are more
-// than the maximum value * threshhold.  With a threshold of 0.01, more than
+// than the maximum value * threshold.  With a threshold of 0.01, more than
 // 16 indicates a photo.
 func (in *Image) PhotoMetric(threshold float64) (int, error) {
 	var out C.int

vips/resample.go

@@ -36,8 +36,10 @@ func (i *Interpolate) Close() {
 
 // Affine performs this affine transform on the input image using the
 // supplied interpolate:
-//   X = a * (x + idx ) + b * (y + idy ) + odx
-//   Y = c * (x + idx ) + d * (y + idy ) + doy
+//
+//	X = a * (x + idx ) + b * (y + idy ) + odx
+//	Y = c * (x + idx ) + d * (y + idy ) + doy
+//
 // x and y are the coordinates in input image. X and Y are the coordinates
 // in output image.  (0,0) is the upper left corner.
 func (in *Image) Affine(a, b, c, d float64, interpolate *Interpolate) error {

vips/vips_static.go

@@ -2,6 +2,7 @@
 // "-tags vips_static" build flag is used.  Configure VIPS with:
 // CFLAGS="-fPIE" CXXFLAGS="-fPIE" LDFLAGS="-lstdc++"
 
+//go:build vips_static
 // +build vips_static
 
 package vips