From 6eb3352f8bba71965fabcd3d3e9c0f5d295cae6a Mon Sep 17 00:00:00 2001
From: evilsocket <evilsocket@gmail.com>
Date: Sat, 25 Aug 2018 11:37:20 +0200
Subject: [PATCH] misc: small fix or general refactoring i did not bother
 commenting

---
 session/session.go       | 14 +++++++-------
 session/session_setup.go | 12 +++++-------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/session/session.go b/session/session.go
index 888ecd09..0207d80d 100644
--- a/session/session.go
+++ b/session/session.go
@@ -28,9 +28,9 @@ const (
 var (
 	I = (*Session)(nil)
 
-	ErrAlreadyStarted = errors.New("Module is already running.")
-	ErrAlreadyStopped = errors.New("Module is not running.")
-	ErrNotSupported   = errors.New("This component is not supported on this OS.")
+	ErrAlreadyStarted = errors.New("module is already running")
+	ErrAlreadyStopped = errors.New("module is not running")
+	ErrNotSupported   = errors.New("this component is not supported on this OS")
 
 	reCmdSpaceCleaner = regexp.MustCompile(`^([^\s]+)\s+(.+)$`)
 	reEnvVarCapture   = regexp.MustCompile(`{env\.([^}]+)}`)
@@ -112,7 +112,7 @@ func (s *Session) Module(name string) (err error, mod Module) {
 			return nil, m
 		}
 	}
-	return fmt.Errorf("Module %s not found", name), mod
+	return fmt.Errorf("module %s not found", name), mod
 }
 
 func (s *Session) Close() {
@@ -132,7 +132,7 @@ func (s *Session) Close() {
 	if *s.Options.EnvFile != "" {
 		envFile, _ := core.ExpandPath(*s.Options.EnvFile)
 		if err := s.Env.Save(envFile); err != nil {
-			fmt.Printf("Error while storing the environment to %s: %s", envFile, err)
+			fmt.Printf("error while storing the environment to %s: %s", envFile, err)
 		}
 	}
 
@@ -143,13 +143,13 @@ func (s *Session) Close() {
 	if *s.Options.MemProfile != "" {
 		f, err := os.Create(*s.Options.MemProfile)
 		if err != nil {
-			fmt.Printf("Could not create memory profile: %s\n", err)
+			fmt.Printf("could not create memory profile: %s\n", err)
 			return
 		}
 		defer f.Close()
 		runtime.GC() // get up-to-date statistics
 		if err := pprof.WriteHeapProfile(f); err != nil {
-			fmt.Printf("Could not write memory profile: %s\n", err)
+			fmt.Printf("could not write memory profile: %s\n", err)
 		}
 	}
 }
diff --git a/session/session_setup.go b/session/session_setup.go
index a786aa9d..80b3963b 100644
--- a/session/session_setup.go
+++ b/session/session_setup.go
@@ -22,15 +22,13 @@ func containsCapitals(s string) bool {
 	return true
 }
 
-func (s *Session) setupReadline() error {
-	var err error
-
-	pcompleters := make([]readline.PrefixCompleterInterface, 0)
+func (s *Session) setupReadline() (err error) {
+	prefixCompleters := make([]readline.PrefixCompleterInterface, 0)
 	for _, h := range s.CoreHandlers {
 		if h.Completer == nil {
-			pcompleters = append(pcompleters, readline.PcItem(h.Name))
+			prefixCompleters = append(prefixCompleters, readline.PcItem(h.Name))
 		} else {
-			pcompleters = append(pcompleters, h.Completer)
+			prefixCompleters = append(prefixCompleters, h.Completer)
 		}
 	}
 
@@ -61,7 +59,7 @@ func (s *Session) setupReadline() error {
 		HistoryFile:     history,
 		InterruptPrompt: "^C",
 		EOFPrompt:       "exit",
-		AutoComplete:    readline.NewPrefixCompleter(pcompleters...),
+		AutoComplete:    readline.NewPrefixCompleter(prefixCompleters...),
 	}
 
 	s.Input, err = readline.NewEx(&cfg)