Skip to content

Commit 1adce6b

Browse files
authored
bugfix: s/TrimRight/TrimSuffix for certain cases (#618)
Use `TrimSuffix` instead of `TrimRight` in cases where an exact suffix string needs to be removed, not all occurrences of all characters in a specified cutset. Fixes: #507 Signed-off-by: Pranshu Srivastava <[email protected]>
1 parent 2085b8f commit 1adce6b

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

buddyinfo.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ func parseBuddyInfo(r io.Reader) ([]BuddyInfo, error) {
5858
return nil, fmt.Errorf("%w: Invalid number of fields, found: %v", ErrFileParse, parts)
5959
}
6060

61-
node := strings.TrimRight(parts[1], ",")
62-
zone := strings.TrimRight(parts[3], ",")
61+
node := strings.TrimSuffix(parts[1], ",")
62+
zone := strings.TrimSuffix(parts[3], ",")
6363
arraySize := len(parts[4:])
6464

6565
if bucketCount == -1 {

proc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ func (p Proc) CmdLine() ([]string, error) {
137137
return []string{}, nil
138138
}
139139

140-
return strings.Split(string(bytes.TrimRight(data, string("\x00"))), string(byte(0))), nil
140+
return strings.Split(string(bytes.TrimRight(data, "\x00")), "\x00"), nil
141141
}
142142

143143
// Wchan returns the wchan (wait channel) of a process.

proc_smaps.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ func (s *ProcSMapsRollup) parseLine(line string) error {
127127
}
128128

129129
v := strings.TrimSpace(kv[1])
130-
v = strings.TrimRight(v, " kB")
130+
v = strings.TrimSuffix(v, " kB")
131131

132132
vKBytes, err := strconv.ParseUint(v, 10, 64)
133133
if err != nil {

sysfs/system_cpu.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ func parseCPURange(data []byte) ([]uint16, error) {
321321

322322
var cpusInt = []uint16{}
323323

324-
for _, cpu := range strings.Split(strings.TrimRight(string(data), "\n"), ",") {
324+
for _, cpu := range strings.Split(strings.TrimSuffix(string(data), "\n"), ",") {
325325
if cpu == "" {
326326
continue
327327
}

0 commit comments

Comments
 (0)