Skip to content
This repository was archived by the owner on Dec 13, 2018. It is now read-only.

Commit 6940d0e

Browse files
committed
Merge pull request #156 from LK4D4/fix_vet_errors
Fix warnings from go vet
2 parents 1befa2f + 665613c commit 6940d0e

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

console/console.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func OpenPtmx() (*os.File, error) {
114114
func OpenTerminal(name string, flag int) (*os.File, error) {
115115
r, e := syscall.Open(name, flag, 0)
116116
if e != nil {
117-
return nil, &os.PathError{"open", name, e}
117+
return nil, &os.PathError{Op: "open", Path: name, Err: e}
118118
}
119119
return os.NewFile(uintptr(r), name), nil
120120
}

mount/init.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ func reOpenDevNull(rootfs string) error {
236236
if stat.Rdev == devNullStat.Rdev {
237237
// Close and re-open the fd.
238238
if err = syscall.Dup2(int(file.Fd()), fd); err != nil {
239-
return fmt.Errorf("Failed to dup fd %d to fd %d - %s", file.Fd(), fd)
239+
return fmt.Errorf("Failed to dup fd %d to fd %d - %s", file.Fd(), fd, err)
240240
}
241241
}
242242
}

netlink/netlink_linux_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func TestAddDelNetworkIp(t *testing.T) {
2727
ifaceName := "lo"
2828
ip := net.ParseIP("127.0.1.1")
2929
mask := net.IPv4Mask(255, 255, 255, 255)
30-
ipNet := &net.IPNet{ip, mask}
30+
ipNet := &net.IPNet{IP: ip, Mask: mask}
3131

3232
iface, err := net.InterfaceByName(ifaceName)
3333
if err != nil {
@@ -47,7 +47,7 @@ func TestAddDelNetworkIp(t *testing.T) {
4747
}
4848

4949
if ipAssigned(iface, ip) {
50-
t.Fatal("Located address '%s' in lo address list after removal.", ip.String())
50+
t.Fatalf("Located address '%s' in lo address list after removal.", ip.String())
5151
}
5252
}
5353

0 commit comments

Comments
 (0)