Skip to content

Commit

Permalink
driver_darwin: Make readPidFromFile to return int32 instead int
Browse files Browse the repository at this point in the history
With that we don't need to do type conversion and avoid following
golint error.

```
pkg/drivers/vfkit/driver_darwin.go:407:40: G115: integer overflow conversion int -> int32 (gosec)
	exists, err := process.PidExists(int32(pid))
	                                      ^
pkg/drivers/vfkit/driver_darwin.go:414:36: G115: integer overflow conversion int -> int32 (gosec)
	p, err := process.NewProcess(int32(pid))
	                                  ^
```
  • Loading branch information
praveenkumar committed Oct 8, 2024
1 parent c6000b4 commit f3428fe
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions pkg/drivers/vfkit/driver_darwin.go
Original file line number Diff line number Diff line change
Expand Up @@ -404,14 +404,14 @@ func (d *Driver) findVfkitProcess() (*process.Process, error) {
return nil, errors.Wrapf(err, "error reading pidfile %s", pidFile)
}

exists, err := process.PidExists(int32(pid))
exists, err := process.PidExists(pid)
if err != nil {
return nil, err
}
if !exists {
return nil, nil
}
p, err := process.NewProcess(int32(pid))
p, err := process.NewProcess(pid)
if err != nil {
return nil, errors.Wrap(err, fmt.Sprintf("cannot find pid %d", pid))
}
Expand All @@ -434,18 +434,18 @@ func (d *Driver) findVfkitProcess() (*process.Process, error) {
return p, nil
}

func readPidFromFile(filename string) (int, error) {
func readPidFromFile(filename string) (int32, error) {
bs, err := os.ReadFile(filename)
if err != nil {
return 0, err
}
content := strings.TrimSpace(string(bs))
pid, err := strconv.Atoi(content)
pid, err := strconv.ParseInt(content, 10, 32)
if err != nil {
return 0, errors.Wrapf(err, "parsing %s", filename)
}

return pid, nil
return int32(pid), nil
}

// recoverFromUncleanShutdown searches for an existing vfkit.pid file in
Expand Down

0 comments on commit f3428fe

Please sign in to comment.