From 4ac7e99c6af6571e3ac88f086d9b945e49e1a355 Mon Sep 17 00:00:00 2001
From: shirou <shirou.faw@gmail.com>
Date: Sat, 19 Nov 2022 11:37:38 +0000
Subject: [PATCH] [disk][host]: move back Warnings from internal to disk and
 host.

fix #1377
---
 disk/disk_windows.go        |  2 +-
 disk/warnings.go            | 30 ++++++++++++++++++++++++++++++
 host/host_linux.go          |  2 +-
 host/warnings.go            | 30 ++++++++++++++++++++++++++++++
 internal/common/warnings.go | 30 ------------------------------
 5 files changed, 62 insertions(+), 32 deletions(-)
 create mode 100644 disk/warnings.go
 create mode 100644 host/warnings.go
 delete mode 100644 internal/common/warnings.go

diff --git a/disk/disk_windows.go b/disk/disk_windows.go
index b7f0c51..3e3d991 100644
--- a/disk/disk_windows.go
+++ b/disk/disk_windows.go
@@ -80,7 +80,7 @@ func UsageWithContext(ctx context.Context, path string) (*UsageStat, error) {
 }
 
 func PartitionsWithContext(ctx context.Context, all bool) ([]PartitionStat, error) {
-	warnings := common.Warnings{
+	warnings := Warnings{
 		Verbose: true,
 	}
 	var ret []PartitionStat
diff --git a/disk/warnings.go b/disk/warnings.go
new file mode 100644
index 0000000..ce13aa9
--- /dev/null
+++ b/disk/warnings.go
@@ -0,0 +1,30 @@
+package disk
+
+import "fmt"
+
+type Warnings struct {
+	List    []error
+	Verbose bool
+}
+
+func (w *Warnings) Add(err error) {
+	w.List = append(w.List, err)
+}
+
+func (w *Warnings) Reference() error {
+	if len(w.List) > 0 {
+		return w
+	}
+	return nil
+}
+
+func (w *Warnings) Error() string {
+	if w.Verbose {
+		str := ""
+		for i, e := range w.List {
+			str += fmt.Sprintf("\tError %d: %s\n", i, e.Error())
+		}
+		return str
+	}
+	return fmt.Sprintf("Number of warnings: %v", len(w.List))
+}
diff --git a/host/host_linux.go b/host/host_linux.go
index a6bb3fc..940415c 100644
--- a/host/host_linux.go
+++ b/host/host_linux.go
@@ -395,7 +395,7 @@ func SensorsTemperaturesWithContext(ctx context.Context) ([]TemperatureStat, err
 		}
 	}
 
-	var warns common.Warnings
+	var warns Warnings
 
 	if len(files) == 0 { // handle distributions without hwmon, like raspbian #391, parse legacy thermal_zone files
 		files, err = filepath.Glob(common.HostSys("/class/thermal/thermal_zone*/"))
diff --git a/host/warnings.go b/host/warnings.go
new file mode 100644
index 0000000..182a293
--- /dev/null
+++ b/host/warnings.go
@@ -0,0 +1,30 @@
+package host
+
+import "fmt"
+
+type Warnings struct {
+	List    []error
+	Verbose bool
+}
+
+func (w *Warnings) Add(err error) {
+	w.List = append(w.List, err)
+}
+
+func (w *Warnings) Reference() error {
+	if len(w.List) > 0 {
+		return w
+	}
+	return nil
+}
+
+func (w *Warnings) Error() string {
+	if w.Verbose {
+		str := ""
+		for i, e := range w.List {
+			str += fmt.Sprintf("\tError %d: %s\n", i, e.Error())
+		}
+		return str
+	}
+	return fmt.Sprintf("Number of warnings: %v", len(w.List))
+}
diff --git a/internal/common/warnings.go b/internal/common/warnings.go
deleted file mode 100644
index a4aaada..0000000
--- a/internal/common/warnings.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package common
-
-import "fmt"
-
-type Warnings struct {
-	List    []error
-	Verbose bool
-}
-
-func (w *Warnings) Add(err error) {
-	w.List = append(w.List, err)
-}
-
-func (w *Warnings) Reference() error {
-	if len(w.List) > 0 {
-		return w
-	}
-	return nil
-}
-
-func (w *Warnings) Error() string {
-	if w.Verbose {
-		str := ""
-		for i, e := range w.List {
-			str += fmt.Sprintf("\tError %d: %s\n", i, e.Error())
-		}
-		return str
-	}
-	return fmt.Sprintf("Number of warnings: %v", len(w.List))
-}