From e025d5ac6d58fbc1da5cccc8d0096d00ebc052bb Mon Sep 17 00:00:00 2001
From: Christian Mehlmauer <firefart@gmail.com>
Date: Sat, 1 Aug 2020 13:10:34 +0200
Subject: [PATCH] fix tests and linter

---
 .golangci.yml            | 1 +
 helper/helper.go         | 2 +-
 libgobuster/helpers.go   | 4 ++--
 libgobuster/http_test.go | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 6d455e5..652f142 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -12,6 +12,7 @@ linters:
     - testpackage
     - godot
     - goerr113
+    - gofumpt
 
 issues:
   exclude-rules:
diff --git a/helper/helper.go b/helper/helper.go
index f42ca5c..d0ee1bd 100644
--- a/helper/helper.go
+++ b/helper/helper.go
@@ -53,7 +53,7 @@ func SliceContains(s []int, e int) bool {
 
 // JoinIntSlice joins an int slice by ,
 func JoinIntSlice(s []int) string {
-	var valuesText []string
+	valuesText := make([]string, len(s))
 	for _, number := range s {
 		text := strconv.Itoa(number)
 		valuesText = append(valuesText, text)
diff --git a/libgobuster/helpers.go b/libgobuster/helpers.go
index a9bed52..d15cfaf 100644
--- a/libgobuster/helpers.go
+++ b/libgobuster/helpers.go
@@ -60,7 +60,7 @@ func (set *StringSet) Length() int {
 
 // Stringify the set
 func (set *StringSet) Stringify() string {
-	var values []string
+	values := make([]string, len(set.Set))
 	for s := range set.Set {
 		values = append(values, s)
 	}
@@ -87,7 +87,7 @@ func (set *IntSet) Contains(i int) bool {
 
 // Stringify the set
 func (set *IntSet) Stringify() string {
-	var values []int
+	values := make([]int, len(set.Set))
 	for s := range set.Set {
 		values = append(values, s)
 	}
diff --git a/libgobuster/http_test.go b/libgobuster/http_test.go
index 4fc705e..62d588a 100644
--- a/libgobuster/http_test.go
+++ b/libgobuster/http_test.go
@@ -46,7 +46,7 @@ func TestRequest(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Got Error: %v", err)
 	}
-	status, length, body, err := c.Request(h.URL, RequestOptions{ReturnBody: true})
+	status, length, _, body, err := c.Request(h.URL, RequestOptions{ReturnBody: true})
 	if err != nil {
 		t.Fatalf("Got Error: %v", err)
 	}
@@ -70,7 +70,7 @@ func BenchmarkRequestWithoutBody(b *testing.B) {
 		b.Fatalf("Got Error: %v", err)
 	}
 	for x := 0; x < b.N; x++ {
-		_, _, _, err := c.Request(h.URL, RequestOptions{ReturnBody: false})
+		_, _, _, _, err := c.Request(h.URL, RequestOptions{ReturnBody: false})
 		if err != nil {
 			b.Fatalf("Got Error: %v", err)
 		}
@@ -86,7 +86,7 @@ func BenchmarkRequestWitBody(b *testing.B) {
 		b.Fatalf("Got Error: %v", err)
 	}
 	for x := 0; x < b.N; x++ {
-		_, _, _, err := c.Request(h.URL, RequestOptions{ReturnBody: true})
+		_, _, _, _, err := c.Request(h.URL, RequestOptions{ReturnBody: true})
 		if err != nil {
 			b.Fatalf("Got Error: %v", err)
 		}