From 96732b941d0f2168a9e5347d63ee63537222a12d Mon Sep 17 00:00:00 2001
From: Matthieu MOREL <matthieu.morel35@gmail.com>
Date: Sat, 21 Dec 2024 16:35:06 +0100
Subject: [PATCH] since Go 1.18 'interface{}' can be replaced by 'any'

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
---
 .golangci.yml                     | 3 +++
 internal/common/binary.go         | 8 ++++----
 internal/common/common.go         | 2 +-
 internal/common/common_windows.go | 2 +-
 net/net_windows.go                | 2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 00ceb01af..2e40b99b4 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -57,6 +57,9 @@ linters-settings:
             recommandations:
               - io
               - os
+  revive:
+    rules:
+      - name: use-any
   testifylint:
     disable:
       - expected-actual
diff --git a/internal/common/binary.go b/internal/common/binary.go
index 6e75e74b0..11a4fd410 100644
--- a/internal/common/binary.go
+++ b/internal/common/binary.go
@@ -137,7 +137,7 @@ func (bigEndian) GoString() string { return "binary.BigEndian" }
 // blank (_) field names is skipped; i.e., blank field names
 // may be used for padding.
 // When reading into a struct, all non-blank fields must be exported.
-func Read(r io.Reader, order ByteOrder, data interface{}) error {
+func Read(r io.Reader, order ByteOrder, data any) error {
 	// Fast path for basic types and slices.
 	if n := intDataSize(data); n != 0 {
 		var b [8]byte
@@ -229,7 +229,7 @@ func Read(r io.Reader, order ByteOrder, data interface{}) error {
 // and read from successive fields of the data.
 // When writing structs, zero values are written for fields
 // with blank (_) field names.
-func Write(w io.Writer, order ByteOrder, data interface{}) error {
+func Write(w io.Writer, order ByteOrder, data any) error {
 	// Fast path for basic types and slices.
 	if n := intDataSize(data); n != 0 {
 		var b [8]byte
@@ -339,7 +339,7 @@ func Write(w io.Writer, order ByteOrder, data interface{}) error {
 // Size returns how many bytes Write would generate to encode the value v, which
 // must be a fixed-size value or a slice of fixed-size values, or a pointer to such data.
 // If v is neither of these, Size returns -1.
-func Size(v interface{}) int {
+func Size(v any) int {
 	return dataSize(reflect.Indirect(reflect.ValueOf(v)))
 }
 
@@ -607,7 +607,7 @@ func (e *encoder) skip(v reflect.Value) {
 
 // intDataSize returns the size of the data required to represent the data when encoded.
 // It returns zero if the type cannot be implemented by the fast path in Read or Write.
-func intDataSize(data interface{}) int {
+func intDataSize(data any) int {
 	switch data := data.(type) {
 	case int8, *int8, *uint8:
 		return 1
diff --git a/internal/common/common.go b/internal/common/common.go
index 868ea4dae..39816031c 100644
--- a/internal/common/common.go
+++ b/internal/common/common.go
@@ -311,7 +311,7 @@ func IntContains(target []int, src int) bool {
 
 // get struct attributes.
 // This method is used only for debugging platform dependent code.
-func attributes(m interface{}) map[string]reflect.Type {
+func attributes(m any) map[string]reflect.Type {
 	typ := reflect.TypeOf(m)
 	if typ.Kind() == reflect.Ptr {
 		typ = typ.Elem()
diff --git a/internal/common/common_windows.go b/internal/common/common_windows.go
index 766ed2fcb..54ae73c86 100644
--- a/internal/common/common_windows.go
+++ b/internal/common/common_windows.go
@@ -197,7 +197,7 @@ func ProcessorQueueLengthCounter() (*Win32PerformanceCounter, error) {
 }
 
 // WMIQueryWithContext - wraps wmi.Query with a timed-out context to avoid hanging
-func WMIQueryWithContext(ctx context.Context, query string, dst interface{}, connectServerArgs ...interface{}) error {
+func WMIQueryWithContext(ctx context.Context, query string, dst any, connectServerArgs ...any) error {
 	if _, ok := ctx.Deadline(); !ok {
 		ctxTimeout, cancel := context.WithTimeout(ctx, Timeout)
 		defer cancel()
diff --git a/net/net_windows.go b/net/net_windows.go
index f1145feab..08aac856d 100644
--- a/net/net_windows.go
+++ b/net/net_windows.go
@@ -376,7 +376,7 @@ func getTableUintptr(family uint32, buf []byte) uintptr {
 	return p
 }
 
-func getTableInfo(filename string, table interface{}) (index, step, length int) {
+func getTableInfo(filename string, table any) (index, step, length int) {
 	switch filename {
 	case kindTCP4.filename:
 		index = int(unsafe.Sizeof(table.(pmibTCPTableOwnerPidAll).DwNumEntries))