github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-20 21:43:18 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

go vet fixes

Browse source
This commit is contained in:
bonedaddy 2020-12-24 17:31:40 -08:00
commit 05b8e3065e
No known key found for this signature in database
GPG key ID: 5386234333106B29
6 changed files with 32 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

6
session/command_handler.go
View file

@ -1,13 +1,14 @@
package session
import (
"github.com/bettercap/readline"
"regexp"
"sync"
"github.com/bettercap/readline"
)
type CommandHandler struct {
sync.Mutex
*sync.Mutex
Name string
Description string
Completer *readline.PrefixCompleter
@ -17,6 +18,7 @@ type CommandHandler struct {
func NewCommandHandler(name string, expr string, desc string, exec func(args []string, s *Session) error) CommandHandler {
return CommandHandler{
Mutex: &sync.Mutex{},
Name: name,
Description: desc,
Completer: nil,

3
session/events.go
View file

@ -38,7 +38,7 @@ func (e Event) Label() string {
}
type EventPool struct {
sync.Mutex
*sync.Mutex
debug bool
silent bool
@ -48,6 +48,7 @@ type EventPool struct {
func NewEventPool(debug bool, silent bool) *EventPool {
return &EventPool{
Mutex: &sync.Mutex{},
debug: debug,
silent: silent,
events: make([]Event, 0),

40
session/events_test.go
View file

@ -82,7 +82,7 @@ func TestNewEventPool(t *testing.T) {
func TestEventPool_SetSilent(t *testing.T) {
type fields struct {
Mutex sync.Mutex
Mutex *sync.Mutex
debug bool
silent bool
events []Event
@ -98,32 +98,32 @@ func TestEventPool_SetSilent(t *testing.T) {
}{
{
name: "Set silent on non-silent event pool",
fields: fields{silent: false, debug: false},
fields: fields{silent: false, debug: false, Mutex: &sync.Mutex{}},
args: args{s: true},
},
{
name: "Set silent on silent event pool",
fields: fields{silent: true, debug: false},
fields: fields{silent: true, debug: false, Mutex: &sync.Mutex{}},
args: args{s: true},
},
{
name: "Set non-silent on non-silent event pool",
fields: fields{silent: false, debug: false},
fields: fields{silent: false, debug: false, Mutex: &sync.Mutex{}},
args: args{s: false},
},
{
name: "Set silent on silent event pool",
fields: fields{silent: true, debug: false},
fields: fields{silent: true, debug: false, Mutex: &sync.Mutex{}},
args: args{s: false},
},
{
name: "Set silent on non-silent and debug event pool",
fields: fields{silent: false, debug: true},
fields: fields{silent: false, debug: true, Mutex: &sync.Mutex{}},
args: args{s: true},
},
{
name: "Set non-silent on non-silent and debug event pool",
fields: fields{silent: false, debug: true},
fields: fields{silent: false, debug: true, Mutex: &sync.Mutex{}},
args: args{s: false},
},
}
@ -146,7 +146,7 @@ func TestEventPool_SetSilent(t *testing.T) {
func TestEventPool_SetDebug(t *testing.T) {
type fields struct {
Mutex sync.Mutex
Mutex *sync.Mutex
debug bool
silent bool
events []Event
@ -164,32 +164,32 @@ func TestEventPool_SetDebug(t *testing.T) {
}{
{
name: "Set debug on non-debug event pool",
fields: fields{silent: false, debug: false},
fields: fields{silent: false, debug: false, Mutex: &sync.Mutex{}},
args: args{s: true},
},
{
name: "Set debug on debug event pool",
fields: fields{silent: false, debug: true},
fields: fields{silent: false, debug: true, Mutex: &sync.Mutex{}},
args: args{s: true},
},
{
name: "Set non-debug on non-debug event pool",
fields: fields{silent: false, debug: false},
fields: fields{silent: false, debug: false, Mutex: &sync.Mutex{}},
args: args{s: false},
},
{
name: "Set non-debug on debug event pool",
fields: fields{silent: false, debug: true},
fields: fields{silent: false, debug: true, Mutex: &sync.Mutex{}},
args: args{s: false},
},
{
name: "Set silent on non-silent and debug event pool",
fields: fields{silent: false, debug: true},
fields: fields{silent: false, debug: true, Mutex: &sync.Mutex{}},
args: args{s: true},
},
{
name: "Set non-silent on non-silent and debug event pool",
fields: fields{silent: false, debug: true},
fields: fields{silent: false, debug: true, Mutex: &sync.Mutex{}},
args: args{s: true},
},
}
@ -212,7 +212,7 @@ func TestEventPool_SetDebug(t *testing.T) {
func TestEventPool_Clear(t *testing.T) {
type fields struct {
Mutex sync.Mutex
Mutex *sync.Mutex
debug bool
silent bool
events []Event
@ -225,11 +225,11 @@ func TestEventPool_Clear(t *testing.T) {
}{
{
name: "Clear events on empty list",
fields: fields{debug: false, silent: false, events: []Event{}},
fields: fields{debug: false, silent: false, events: []Event{}, Mutex: &sync.Mutex{}},
},
{
name: "Clear events",
fields: fields{debug: false, silent: false, events: []Event{{Tag: "meh", Data: "something", Time: time.Now()}}},
fields: fields{debug: false, silent: false, events: []Event{{Tag: "meh", Data: "something", Time: time.Now()}}, Mutex: &sync.Mutex{}},
},
}
for _, tt := range tests {
@ -251,7 +251,7 @@ func TestEventPool_Clear(t *testing.T) {
func TestEventPool_Add(t *testing.T) {
type fields struct {
Mutex sync.Mutex
Mutex *sync.Mutex
debug bool
silent bool
events []Event
@ -268,12 +268,12 @@ func TestEventPool_Add(t *testing.T) {
}{
{
name: "Add event with nil data on empty event list",
fields: fields{debug: false, silent: false, events: []Event{}},
fields: fields{debug: false, silent: false, events: []Event{}, Mutex: &sync.Mutex{}},
args: args{tag: "tag with empty data", data: nil},
},
{
name: "Add event with nil data",
fields: fields{debug: false, silent: false, events: []Event{{Tag: "meh", Data: "something", Time: time.Now()}}},
fields: fields{debug: false, silent: false, events: []Event{{Tag: "meh", Data: "something", Time: time.Now()}}, Mutex: &sync.Mutex{}},
args: args{tag: "tag with empty data", data: nil},
},
}

3
session/module_handler.go
View file

@ -19,7 +19,7 @@ const (
)
type ModuleHandler struct {
sync.Mutex
*sync.Mutex
Name string
Description string
@ -30,6 +30,7 @@ type ModuleHandler struct {
func NewModuleHandler(name string, expr string, desc string, exec func(args []string) error) ModuleHandler {
h := ModuleHandler{
Mutex: &sync.Mutex{},
Name: name,
Description: desc,
Parser: nil,