Fix CI lint errors

samuelkarp · Jun 4, 2021 · 70c7e47 · 70c7e47
1 parent 89d5243
commit 70c7e47
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/cmd/runj-entrypoint/main.go b/cmd/runj-entrypoint/main.go
@@ -34,8 +34,8 @@ import (
 	"strconv"
 	"syscall"
 
-	"go.sbk.wtf/runj/state"
 	"go.sbk.wtf/runj/pkg/gojail"
+	"go.sbk.wtf/runj/state"
 
 	"github.com/containerd/console"
 	"golang.org/x/sys/unix"
@@ -165,4 +165,3 @@ func dupStdio(slavePath string) error {
 	}
 	return nil
 }
-
diff --git a/cmd/runj/create.go b/cmd/runj/create.go
@@ -9,9 +9,9 @@ import (
 
 	"go.sbk.wtf/runj/jail"
 	"go.sbk.wtf/runj/oci"
+	"go.sbk.wtf/runj/pkg/gojail"
 	"go.sbk.wtf/runj/runtimespec"
 	"go.sbk.wtf/runj/state"
-	"go.sbk.wtf/runj/pkg/gojail"
 
 	"github.com/spf13/cobra"
 )

diff --git a/cmd/runj/delete.go b/cmd/runj/delete.go
@@ -6,9 +6,9 @@ import (
 
 	"go.sbk.wtf/runj/jail"
 	"go.sbk.wtf/runj/oci"
+	"go.sbk.wtf/runj/pkg/gojail"
 	"go.sbk.wtf/runj/runtimespec"
 	"go.sbk.wtf/runj/state"
-	"go.sbk.wtf/runj/pkg/gojail"
 
 	"github.com/spf13/cobra"
 )

diff --git a/pkg/gojail/createchildjail.go b/pkg/gojail/createchildjail.go
@@ -27,7 +27,7 @@ func forkAndCreateChildJail(parentID, iovecs, niovecs, errbufptr uintptr, pipe i
 		return int(r1), 0
 	}
 
-	r1, _, err1 = syscall.RawSyscall(syscall.SYS_JAIL_ATTACH, uintptr(parentID), 0, 0)
+	_, _, err1 = syscall.RawSyscall(syscall.SYS_JAIL_ATTACH, parentID, 0, 0)
 	if err1 != 0 {
 		goto childerror
 	}
@@ -46,7 +46,7 @@ func forkAndCreateChildJail(parentID, iovecs, niovecs, errbufptr uintptr, pipe i
 childerror:
 	syscall.RawSyscall(syscall.SYS_WRITE, uintptr(pipe), uintptr(unsafe.Pointer(&err1)), unsafe.Sizeof(err1))
 	if sendmsg {
-	    syscall.RawSyscall(syscall.SYS_WRITE, uintptr(pipe), uintptr(errbufptr), errormsglen)
+		syscall.RawSyscall(syscall.SYS_WRITE, uintptr(pipe), errbufptr, errormsglen)
 	}
 	for {
 		syscall.RawSyscall(syscall.SYS_EXIT, 253, 0, 0)