From 5442fab97de453927c667581d1d5125f490b69fd Mon Sep 17 00:00:00 2001
From: "Sascha L. Teichmann" <sascha.teichmann@intevation.de>
Date: Sat, 6 Jan 2024 10:34:37 +0100
Subject: [PATCH] Fix issues found by staticcheck

---
 cmd/mtredisalize/main.go        |  3 ++-
 cmd/mtseeder/pyramid.go         | 16 ++++++++--------
 cmd/mtwebmapper/tilesupdater.go |  4 +---
 common/basetilecreator.go       |  4 ++--
 common/image.go                 |  2 +-
 common/renderer.go              |  3 ---
 6 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/cmd/mtredisalize/main.go b/cmd/mtredisalize/main.go
index a052b25..37c3d43 100644
--- a/cmd/mtredisalize/main.go
+++ b/cmd/mtredisalize/main.go
@@ -13,6 +13,7 @@ import (
 	"os/signal"
 	"runtime"
 	"strings"
+	"syscall"
 	"time"
 
 	"bitbucket.org/s_l_teichmann/mtsatellite/common"
@@ -135,7 +136,7 @@ func main() {
 	connChan := make(chan net.Conn)
 	defer close(connChan)
 	sigChan := make(chan os.Signal, 1)
-	signal.Notify(sigChan, os.Interrupt, os.Kill)
+	signal.Notify(sigChan, os.Interrupt, syscall.SIGTERM)
 
 	go func() {
 		for {
diff --git a/cmd/mtseeder/pyramid.go b/cmd/mtseeder/pyramid.go
index 2426ec1..f3a2039 100644
--- a/cmd/mtseeder/pyramid.go
+++ b/cmd/mtseeder/pyramid.go
@@ -8,7 +8,7 @@ import (
 	"image"
 	"image/color"
 	"image/draw"
-	"io/ioutil"
+	"io/fs"
 	"log"
 	"math"
 	"os"
@@ -28,10 +28,10 @@ type pyramidCreator struct {
 	bg         color.RGBA
 }
 
-func findMaxDir(files []os.FileInfo) (min, max int) {
+func findMaxDir(files []os.DirEntry) (min, max int) {
 	min, max = math.MaxInt32, math.MinInt32
 	for _, file := range files {
-		if !file.Mode().IsDir() {
+		if !file.IsDir() {
 			continue
 		}
 		if x, err := strconv.Atoi(file.Name()); err == nil {
@@ -46,10 +46,10 @@ func findMaxDir(files []os.FileInfo) (min, max int) {
 	return
 }
 
-func findMaxFile(files []os.FileInfo) (min, max int) {
+func findMaxFile(files []os.DirEntry) (min, max int) {
 	min, max = math.MaxInt32, math.MinInt32
 	for _, file := range files {
-		if !file.Mode().IsRegular() {
+		if !file.Type().IsRegular() {
 			continue
 		}
 		name := file.Name()
@@ -86,8 +86,8 @@ func (pc *pyramidCreator) createParentLevel(
 		return
 	}
 
-	var files []os.FileInfo
-	if files, err = ioutil.ReadDir(oldDir); err != nil {
+	var files []fs.DirEntry
+	if files, err = os.ReadDir(oldDir); err != nil {
 		return
 	}
 
@@ -112,7 +112,7 @@ func (pc *pyramidCreator) createParentLevel(
 		ox1Dir := filepath.Join(oldDir, strconv.Itoa(ox))
 		ox2Dir := filepath.Join(oldDir, strconv.Itoa(ox+1))
 
-		if files, err = ioutil.ReadDir(ox1Dir); err != nil {
+		if files, err = os.ReadDir(ox1Dir); err != nil {
 			return
 		}
 		zMin, zMax := findMaxFile(files)
diff --git a/cmd/mtwebmapper/tilesupdater.go b/cmd/mtwebmapper/tilesupdater.go
index a59b8b9..236ca83 100644
--- a/cmd/mtwebmapper/tilesupdater.go
+++ b/cmd/mtwebmapper/tilesupdater.go
@@ -22,8 +22,6 @@ import (
 	"github.com/bamiaux/rez"
 	"github.com/jackc/pgx/v4"
 
-	"bytes"
-
 	"bitbucket.org/s_l_teichmann/mtsatellite/common"
 )
 
@@ -126,7 +124,7 @@ func (tu *tileUpdater) checkIP(r *http.Request) bool {
 	}
 
 	for i := range tu.ips {
-		if bytes.Compare(tu.ips[i], ip) == 0 {
+		if tu.ips[i].Equal(ip) {
 			return true
 		}
 	}
diff --git a/common/basetilecreator.go b/common/basetilecreator.go
index c3fb367..27bec48 100644
--- a/common/basetilecreator.go
+++ b/common/basetilecreator.go
@@ -6,8 +6,8 @@ package common
 
 import (
 	"image/color"
-	"io/ioutil"
 	"log"
+	"os"
 	"path/filepath"
 	"strconv"
 )
@@ -177,7 +177,7 @@ func (btc *BaseTileCreator) WriteFunc(i, j int, update BaseTileUpdateFunc) func(
 	if update == nil && btc.renderer.IsEmpty() {
 		return func() (bool, error) {
 			//log.Printf("Writing empty (%d, %d) to file %s\n", x, z, path)
-			return true, ioutil.WriteFile(path, btc.blankImage(), 0666)
+			return true, os.WriteFile(path, btc.blankImage(), 0666)
 		}
 	}
 
diff --git a/common/image.go b/common/image.go
index f2fbc50..8d6f54f 100644
--- a/common/image.go
+++ b/common/image.go
@@ -131,6 +131,6 @@ func HashImage(img *image.RGBA) []byte {
 
 func BackgroundImage(width, height int, bg color.RGBA) *image.RGBA {
 	m := image.NewRGBA(image.Rect(0, 0, width, height))
-	draw.Draw(m, m.Bounds(), &image.Uniform{bg}, image.ZP, draw.Src)
+	draw.Draw(m, m.Bounds(), &image.Uniform{bg}, image.Point{}, draw.Src)
 	return m
 }
diff --git a/common/renderer.go b/common/renderer.go
index 7dd834a..1c6aea2 100644
--- a/common/renderer.go
+++ b/common/renderer.go
@@ -64,19 +64,16 @@ func (r *Renderer) GetPos() (int16, int16) {
 
 func (r *Renderer) initBuffers() {
 	yb := r.yBuffer
-	yb = yb[:len(yb)]
 	for i := range yb {
 		yb[i] = math.MinInt32
 	}
 
 	cb := r.cBuffer
-	cb = cb[:len(cb)]
 	for i := range cb {
 		cb[i] = -1
 	}
 
 	ym := r.yMin
-	ym = ym[:len(ym)]
 	for i := range ym {
 		ym[i] = math.MinInt32
 	}