github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-08-19 13:09:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

if block ends with a return statement drop this else and outdent its block

Browse source
This commit is contained in:
Kent Gruber 2018-05-01 23:22:26 -04:00
commit f09125b166
1 changed files with 12 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

18
session/module.go
View file

@ -62,7 +62,7 @@ func (m SessionModule) ListParam(name string) (err error, values []string) {
list := "" list := ""
if err, list = m.StringParam(name); err != nil { if err, list = m.StringParam(name); err != nil {
return return
} else { }
parts := strings.Split(list, ",") parts := strings.Split(list, ",")
for _, part := range parts { for _, part := range parts {
part = core.Trim(part) part = core.Trim(part)
@ -70,7 +70,6 @@ func (m SessionModule) ListParam(name string) (err error, values []string) {
values = append(values, part) values = append(values, part)
} }
} }
}
return return
} }
@ -78,33 +77,27 @@ func (m SessionModule) StringParam(name string) (error, string) {
if p, found := m.params[name]; found { if p, found := m.params[name]; found {
if err, v := p.Get(m.Session); err != nil { if err, v := p.Get(m.Session); err != nil {
return err, "" return err, ""
} else { }
return nil, v.(string) return nil, v.(string)
} }
} else {
return fmt.Errorf("Parameter %s does not exist.", name), "" return fmt.Errorf("Parameter %s does not exist.", name), ""
} }
}
func (m SessionModule) IntParam(name string) (error, int) { func (m SessionModule) IntParam(name string) (error, int) {
if p, found := m.params[name]; found { if p, found := m.params[name]; found {
if err, v := p.Get(m.Session); err != nil { if err, v := p.Get(m.Session); err != nil {
return err, 0 return err, 0
} else { }
return nil, v.(int) return nil, v.(int)
} }
} else {
return fmt.Errorf("Parameter %s does not exist.", name), 0 return fmt.Errorf("Parameter %s does not exist.", name), 0
} }
}
func (m SessionModule) BoolParam(name string) (error, bool) { func (m SessionModule) BoolParam(name string) (error, bool) {
if err, v := m.params[name].Get(m.Session); err != nil { if err, v := m.params[name].Get(m.Session); err != nil {
return err, false return err, false
} else {
return nil, v.(bool)
} }
return nil, v.(bool)
} }
func (m *SessionModule) AddHandler(h ModuleHandler) { func (m *SessionModule) AddHandler(h ModuleHandler) {
@ -127,9 +120,8 @@ func (m *SessionModule) SetRunning(running bool, cb func()) error {
if running == m.Running() { if running == m.Running() {
if m.Started { if m.Started {
return ErrAlreadyStarted return ErrAlreadyStarted
} else {
return ErrAlreadyStopped
} }
return ErrAlreadyStopped
} }
m.StatusLock.Lock() m.StatusLock.Lock()