Merge pull request #1379 from shirou/feature/revert_errors_from_internal

[disk][host]: move back Warnings from internal to disk and host.
shirou · Nov 30, 2022 · 9fc4d70 · 9fc4d70
2 parents ea7607e + 5473fd1
commit 9fc4d70
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/disk/disk_windows.go b/disk/disk_windows.go
@@ -15,6 +15,8 @@ import (
 	"golang.org/x/sys/windows/registry"
 )
 
+type Warnings = common.Warnings
+
 var (
 	procGetDiskFreeSpaceExW     = common.Modkernel32.NewProc("GetDiskFreeSpaceExW")
 	procGetLogicalDriveStringsW = common.Modkernel32.NewProc("GetLogicalDriveStringsW")
@@ -80,7 +82,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/host/host_linux.go b/host/host_linux.go
@@ -19,6 +19,8 @@ import (
 	"golang.org/x/sys/unix"
 )
 
+type Warnings = common.Warnings
+
 type lsbStruct struct {
 	ID          string
 	Release     string
@@ -395,7 +397,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*/"))