Merge pull request #49 from DmytroLinkin/master

moshe010 · web-flow · commit e360783a88a9 · 2022-03-27T22:55:08.000+03:00
Trim spaces when reading sfnum file in GetSfIndexByAuxDev()
diff --git a/sriovnet_aux.go b/sriovnet_aux.go
@@ -23,6 +23,7 @@ import (
 	"fmt"
 	"path/filepath"
 	"strconv"
+	"strings"
 
 	utilfs "github.com/Mellanox/sriovnet/pkg/utils/filesystem"
 )
@@ -47,7 +48,7 @@ func GetSfIndexByAuxDev(auxDev string) (int, error) {
 		return -1, fmt.Errorf("cannot read sfnum file for %s device: %v", auxDev, err)
 	}
 
-	sfnum, err := strconv.Atoi(string(sfNumStr))
+	sfnum, err := strconv.Atoi(strings.TrimSpace(string(sfNumStr)))
 	if err != nil {
 		return -1, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ import (`
`23`	`23`	`"fmt"`
`24`	`24`	`"path/filepath"`
`25`	`25`	`"strconv"`
	`26`	`+ "strings"`
`26`	`27`
`27`	`28`	`utilfs "github.com/Mellanox/sriovnet/pkg/utils/filesystem"`
`28`	`29`	`)`
`@@ -47,7 +48,7 @@ func GetSfIndexByAuxDev(auxDev string) (int, error) {`
`47`	`48`	`return -1, fmt.Errorf("cannot read sfnum file for %s device: %v", auxDev, err)`
`48`	`49`	`}`
`49`	`50`
`50`		`- sfnum, err := strconv.Atoi(string(sfNumStr))`
	`51`	`+ sfnum, err := strconv.Atoi(strings.TrimSpace(string(sfNumStr)))`
`51`	`52`	`if err != nil {`
`52`	`53`	`return -1, err`
`53`	`54`	`}`