Pass params by-value

Author: fasterthanlime

probe.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 
 	"github.com/itchio/elefant/version"
-	"github.com/itchio/httpkit/eos"
 	"github.com/itchio/headway/state"
+	"github.com/itchio/httpkit/eos"
 	"github.com/pkg/errors"
 )
 
@@ -30,11 +30,8 @@ type ProbeParams struct {
 }
 
 // Probe retrieves information about an ELF file
-func Probe(file eos.File, params *ProbeParams) (*ElfInfo, error) {
-	var consumer *state.Consumer
-	if params != nil {
-		consumer = params.Consumer
-	}
+func Probe(file eos.File, params ProbeParams) (*ElfInfo, error) {
+	consumer := params.Consumer
 
 	ef, err := elf.NewFile(file)
 	if err != nil {

probe_test.go

@@ -9,12 +9,16 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+func params() elefant.ProbeParams {
+	return elefant.ProbeParams{}
+}
+
 func Test_NotElfFile(t *testing.T) {
 	f, err := eos.Open("./testdata/hello.c")
 	assert.NoError(t, err)
 	defer f.Close()
 
-	_, err = elefant.Probe(f, nil)
+	_, err = elefant.Probe(f, params())
 	assert.Error(t, err)
 }
 
@@ -23,7 +27,7 @@ func Test_Hello32(t *testing.T) {
 	assert.NoError(t, err)
 	defer f.Close()
 
-	res, err := elefant.Probe(f, nil)
+	res, err := elefant.Probe(f, params())
 	assert.NoError(t, err)
 	assert.EqualValues(t, elefant.Arch386, res.Arch)
 }
@@ -33,7 +37,7 @@ func Test_Hello64(t *testing.T) {
 	assert.NoError(t, err)
 	defer f.Close()
 
-	res, err := elefant.Probe(f, nil)
+	res, err := elefant.Probe(f, params())
 	assert.NoError(t, err)
 	assert.EqualValues(t, elefant.ArchAmd64, res.Arch)
 }
@@ -48,7 +52,7 @@ func Test_Trace(t *testing.T) {
 	assert.NoError(t, err)
 	defer f.Close()
 
-	res, err := elefant.Probe(f, nil)
+	res, err := elefant.Probe(f, params())
 	assert.NoError(t, err)
 	assert.EqualValues(t, elefant.ArchAmd64, res.Arch)
 

trace.go

@@ -79,7 +79,7 @@ func (n *TraceNode) trace(cache *Cache, searchPaths *SearchPaths) error {
 					}
 					defer f.Close()
 
-					ei, err := Probe(f, nil)
+					ei, err := Probe(f, ProbeParams{})
 					if err != nil {
 						return errors.WithStack(err)
 					}