diff options
Diffstat (limited to 'helper')
| -rw-r--r-- | helper/args.go | 6 | ||||
| -rw-r--r-- | helper/args_test.go | 4 | ||||
| -rw-r--r-- | helper/helper_test.go | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/helper/args.go b/helper/args.go index 88b5e691..80cd3024 100644 --- a/helper/args.go +++ b/helper/args.go @@ -35,7 +35,7 @@ func (a argsWt) String() string { } // NewCheckedArgs returns a checked null-terminated argument writer for a copy of args. -func NewCheckedArgs(args []string) (wt io.WriterTo, err error) { +func NewCheckedArgs(args ...string) (wt io.WriterTo, err error) { a := make(argsWt, len(args)) for i, arg := range args { a[i], err = syscall.ByteSliceFromString(arg) @@ -49,8 +49,8 @@ func NewCheckedArgs(args []string) (wt io.WriterTo, err error) { // MustNewCheckedArgs returns a checked null-terminated argument writer for a copy of args. // If s contains a NUL byte this function panics instead of returning an error. -func MustNewCheckedArgs(args []string) io.WriterTo { - a, err := NewCheckedArgs(args) +func MustNewCheckedArgs(args ...string) io.WriterTo { + a, err := NewCheckedArgs(args...) if err != nil { panic(err.Error()) } diff --git a/helper/args_test.go b/helper/args_test.go index 3aff8cf5..d6225c3e 100644 --- a/helper/args_test.go +++ b/helper/args_test.go @@ -22,7 +22,7 @@ func TestNewCheckedArgs(t *testing.T) { t.Parallel() args := []string{"\x00"} - if _, err := helper.NewCheckedArgs(args); !errors.Is(err, syscall.EINVAL) { + if _, err := helper.NewCheckedArgs(args...); !errors.Is(err, syscall.EINVAL) { t.Errorf("NewCheckedArgs: error = %v, wantErr %v", err, syscall.EINVAL) } @@ -36,6 +36,6 @@ func TestNewCheckedArgs(t *testing.T) { t.Errorf("MustNewCheckedArgs: panic = %v, wantPanic %v", r, wantPanic) } }() - helper.MustNewCheckedArgs(badPayload) + helper.MustNewCheckedArgs(badPayload...) }) } diff --git a/helper/helper_test.go b/helper/helper_test.go index 45f7bc96..4cc36d34 100644 --- a/helper/helper_test.go +++ b/helper/helper_test.go @@ -27,7 +27,7 @@ var ( } wantPayload = strings.Join(wantArgs, "\x00") + "\x00" - argsWt = helper.MustNewCheckedArgs(wantArgs) + argsWt = helper.MustNewCheckedArgs(wantArgs...) ) func argF(argsFd, statFd int) []string { |