style: modernize the new tooling code to match the repo conventions
This commit is contained in:
+6
-13
@@ -7,6 +7,7 @@ import (
|
||||
"encoding/binary"
|
||||
"encoding/hex"
|
||||
"fmt"
|
||||
"strconv"
|
||||
"strings"
|
||||
"unsafe"
|
||||
)
|
||||
@@ -200,21 +201,13 @@ func ParseScalarArgs(spec string) (map[string]uint64, error) {
|
||||
}
|
||||
|
||||
func splitScalar(part string) (string, uint64, error) {
|
||||
eq := strings.Index(part, "=")
|
||||
if eq <= 0 {
|
||||
name, valStr, ok := strings.Cut(part, "=")
|
||||
if !ok || strings.TrimSpace(name) == "" {
|
||||
return "", 0, fmt.Errorf("scalar arg spec %q: want name=value", part)
|
||||
}
|
||||
name := strings.TrimSpace(part[:eq])
|
||||
valStr := strings.TrimSpace(part[eq+1:])
|
||||
var val uint64
|
||||
var err error
|
||||
if strings.HasPrefix(valStr, "0x") || strings.HasPrefix(valStr, "0X") {
|
||||
_, err = fmt.Sscanf(valStr, "0x%x", &val)
|
||||
} else {
|
||||
_, err = fmt.Sscanf(valStr, "%d", &val)
|
||||
}
|
||||
if err != nil || name == "" {
|
||||
val, err := strconv.ParseUint(strings.TrimSpace(valStr), 0, 64)
|
||||
if err != nil {
|
||||
return "", 0, fmt.Errorf("scalar arg spec %q: bad value", part)
|
||||
}
|
||||
return name, val, nil
|
||||
return strings.TrimSpace(name), val, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user