_
/
aerc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

commands: move ParseNextPrevMessage error value to its last return value 

Signed-off-by: Wagner Riffel <wgrriffel@gmail.com>
This commit is contained in:
Wagner Riffel 2019-09-03 16:34:06 -03:00 committed by Drew DeVault
parent baa70469c3
commit bdb5e3e658
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
commands/account/next.go
View File

@ -23,8 +23,8 @@ func (NextPrevMsg) Complete(aerc *widgets.Aerc, args []string) []string {
return nil return nil
} }
var err, n, pct = ParseNextPrevMessage(args)
func (NextPrevMsg) Execute(aerc *widgets.Aerc, args []string) error { func (NextPrevMsg) Execute(aerc *widgets.Aerc, args []string) error {
n, pct, err := ParseNextPrevMessage(args)
if err != nil { if err != nil {
return err return err
} }
@ -35,9 +35,9 @@ func (NextPrevMsg) Execute(aerc *widgets.Aerc, args []string) error {
return ExecuteNextPrevMessage(args, acct, pct, n) return ExecuteNextPrevMessage(args, acct, pct, n)
} }
func ParseNextPrevMessage(args []string) (error, int, bool) { func ParseNextPrevMessage(args []string) (int, bool, error) {
if len(args) > 2 { if len(args) > 2 {
return nextPrevMessageUsage(args[0]), 0, false return 0, false, nextPrevMessageUsage(args[0])
} }
var ( var (
n int = 1 n int = 1
@ -51,10 +51,10 @@ func ParseNextPrevMessage(args []string) (error, int, bool) {
} }
n, err = strconv.Atoi(args[1]) n, err = strconv.Atoi(args[1])
if err != nil { if err != nil {
return nextPrevMessageUsage(args[0]), 0, false return 0, false, nextPrevMessageUsage(args[0])
} }
} }
return nil, n, pct return n, pct, nil
} }
func ExecuteNextPrevMessage(args []string, acct *widgets.AccountView, pct bool, n int) error { func ExecuteNextPrevMessage(args []string, acct *widgets.AccountView, pct bool, n int) error {

2
commands/msgview/next.go
View File

@ -19,8 +19,8 @@ func (NextPrevMsg) Complete(aerc *widgets.Aerc, args []string) []string {
return nil return nil
} }
err, n, pct := account.ParseNextPrevMessage(args)
func (NextPrevMsg) Execute(aerc *widgets.Aerc, args []string) error { func (NextPrevMsg) Execute(aerc *widgets.Aerc, args []string) error {
n, pct, err := account.ParseNextPrevMessage(args)
if err != nil { if err != nil {
return err return err
} }