From d03d157e76d1d861fa8bd9be179f9dc4fb91f8d2 Mon Sep 17 00:00:00 2001 From: Josh Rickmar Date: Tue, 24 Oct 2023 14:35:32 +0000 Subject: [PATCH] review --- unix/pledge_openbsd.go | 12 ++++-------- unix/unveil_openbsd.go | 9 +++------ 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/unix/pledge_openbsd.go b/unix/pledge_openbsd.go index 23f62273f..a614929fd 100644 --- a/unix/pledge_openbsd.go +++ b/unix/pledge_openbsd.go @@ -20,8 +20,7 @@ import ( // // For more information see pledge(2). func Pledge(promises, execpromises string) error { - err := pledgeAvailable() - if err != nil { + if err := pledgeAvailable(); err != nil { return err } @@ -50,8 +49,7 @@ func Pledge(promises, execpromises string) error { // // For more information see pledge(2). func PledgePromises(promises string) error { - err := pledgeAvailable() - if err != nil { + if err := pledgeAvailable(); err != nil { return err } @@ -78,8 +76,7 @@ func PledgePromises(promises string) error { // // For more information see pledge(2). func PledgeExecpromises(execpromises string) error { - err := pledgeAvailable() - if err != nil { + if err := pledgeAvailable(); err != nil { return err } @@ -133,8 +130,7 @@ func pledgeAvailable() error { // Require OpenBSD 6.4 as a minimum. if maj < 6 || (maj == 6 && min <= 3) { - return fmt.Errorf("cannot call Pledge on OpenBSD %d.%d", maj, - min) + return fmt.Errorf("cannot call Pledge on OpenBSD %d.%d", maj, min) } return nil diff --git a/unix/unveil_openbsd.go b/unix/unveil_openbsd.go index 4d1e04bf3..2a885187d 100644 --- a/unix/unveil_openbsd.go +++ b/unix/unveil_openbsd.go @@ -15,8 +15,7 @@ import ( // Note that the special case of blocking further // unveil calls is handled by UnveilBlock. func Unveil(path string, flags string) error { - err := supportsUnveil() - if err != nil { + if err := supportsUnveil(); err != nil { return err } pathPtr, err := syscall.BytePtrFromString(path) @@ -37,8 +36,7 @@ func Unveil(path string, flags string) error { // UnveilBlock blocks future unveil calls. // For more information see unveil(2). func UnveilBlock() error { - err := supportsUnveil() - if err != nil { + if err := supportsUnveil(); err != nil { return err } // Both pointers must be nil. @@ -60,8 +58,7 @@ func supportsUnveil() error { // unveil is not available before 6.4 if maj < 6 || (maj == 6 && min <= 3) { - return fmt.Errorf("cannot call Unveil on OpenBSD %d.%d", maj, - min) + return fmt.Errorf("cannot call Unveil on OpenBSD %d.%d", maj, min) } return nil