rewrite parseBlockSize to make into consideration only realistic values

Signed-off-by: Andrei Aaron <andaaron@cisco.com>

Author: Andrei Aaron

smartpqi/arcconf.go

@@ -16,34 +16,19 @@ const (
 	noArcConfRC = 127
 )
 
-// parseBlockSize parses a block size token that may use SI suffixes
-// (e.g. "512", "4K", "1M"). Returns the value in bytes.
+// parseBlockSize converts a native disk block/sector size token from arcconf
+// output into bytes. Known values are "512" (traditional) and "4K" (4K-native
+// drives). This is not intended for parsing human-readable capacity fields
+// like "SizeMB" which would require int64 for large disks.
 func parseBlockSize(raw string) (int, error) {
-	s := strings.TrimSpace(raw)
-	if len(s) == 0 {
-		return 0, fmt.Errorf("empty block size token")
-	}
-
-	multiplier := 1
-	suffix := strings.ToLower(s[len(s)-1:])
-	switch suffix {
-	case "k":
-		multiplier = 1024
-		s = s[:len(s)-1]
-	case "m":
-		multiplier = 1024 * 1024
-		s = s[:len(s)-1]
-	case "g":
-		multiplier = 1024 * 1024 * 1024
-		s = s[:len(s)-1]
-	}
-
-	v, err := strconv.Atoi(s)
-	if err != nil {
-		return 0, err
+	switch strings.TrimSpace(raw) {
+	case "512":
+		return 512, nil
+	case "4K", "4k", "4096":
+		return 4096, nil
+	default:
+		return 0, fmt.Errorf("unsupported block size value %q", raw)
 	}
-
-	return v * multiplier, nil
 }
 
 // splitLogicalDevices extracts individual logical device text blocks from raw

smartpqi/arcconf_test.go

@@ -861,11 +861,10 @@ func TestParseBlockSize(t *testing.T) {
 		{"4096", 4096, false},
 		{"4K", 4096, false},
 		{"4k", 4096, false},
-		{"1M", 1048576, false},
-		{"1G", 1073741824, false},
 		{"", 0, true},
 		{"abc", 0, true},
-		{"K", 0, true},
+		{"1M", 0, true},
+		{"1G", 0, true},
 	}
 
 	for _, tc := range testCases {