From 14b92fe617e9cb3a57249827ece4f3f5a0eb0fda Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@lanl.gov>
Date: Thu, 17 Sep 2020 19:48:17 -0600
Subject: [PATCH] Linter and spelling fixes

---
 cmd/mothd/providercommand.go |  6 ++--
 cmd/mothd/state_test.go      |  2 +-
 pkg/award/award.go           | 53 ++++++++++++++++++------------------
 3 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/cmd/mothd/providercommand.go b/cmd/mothd/providercommand.go
index 75e46b8..fc4bfd5 100644
--- a/cmd/mothd/providercommand.go
+++ b/cmd/mothd/providercommand.go
@@ -106,7 +106,7 @@ func (pc ProviderCommand) CheckAnswer(cat string, points int, answer string) (bo
 
 	stdout, err := cmd.Output()
 	if ee, ok := err.(*exec.ExitError); ok {
-		log.Printf("%s: %s", pc.Path, string(ee.Stderr))
+		log.Printf("WARNING: %s: %s", pc.Path, string(ee.Stderr))
 		return false, err
 	} else if err != nil {
 		return false, err
@@ -114,9 +114,7 @@ func (pc ProviderCommand) CheckAnswer(cat string, points int, answer string) (bo
 	result := strings.TrimSpace(string(stdout))
 
 	if result != "correct" {
-		if result == "" {
-			result = "Nothing written to stdout"
-		}
+		log.Printf("WARNING: %s: Nothing written to stdout", pc.Path)
 		return false, nil
 	}
 
diff --git a/cmd/mothd/state_test.go b/cmd/mothd/state_test.go
index cca8150..7c6e156 100644
--- a/cmd/mothd/state_test.go
+++ b/cmd/mothd/state_test.go
@@ -194,7 +194,7 @@ func TestStateDisabled(t *testing.T) {
 	s.Remove("initialized")
 	s.refresh()
 	if !s.Enabled {
-		t.Error("Re-initalizing didn't start event")
+		t.Error("Re-initializing didn't start event")
 	}
 }
 
diff --git a/pkg/award/award.go b/pkg/award/award.go
index f7600bd..a589866 100644
--- a/pkg/award/award.go
+++ b/pkg/award/award.go
@@ -79,29 +79,28 @@ func (a T) UnmarshalJSON(b []byte) error {
 	dec.UseNumber() // Don't use floats
 
 	// All this to make sure we get `[`
-	if t, err := dec.Token(); err != nil {
+	t, err := dec.Token()
+	if err != nil {
 		return err
-	} else {
-		switch token := t.(type) {
-		case json.Delim:
-			if token.String() != "[" {
-				return &json.UnmarshalTypeError{
-					Value:  token.String(),
-					Type:   reflect.TypeOf(a),
-					Offset: 0,
-				}
-			}
-		default:
+	}
+	switch token := t.(type) {
+	case json.Delim:
+		if token.String() != "[" {
 			return &json.UnmarshalTypeError{
-				Value:  fmt.Sprintf("%v", t),
+				Value:  token.String(),
 				Type:   reflect.TypeOf(a),
 				Offset: 0,
 			}
 		}
+	default:
+		return &json.UnmarshalTypeError{
+			Value:  fmt.Sprintf("%v", t),
+			Type:   reflect.TypeOf(a),
+			Offset: 0,
+		}
 	}
 
 	var num json.Number
-	var err error
 	if err := dec.Decode(&num); err != nil {
 		return err
 	}
@@ -122,25 +121,25 @@ func (a T) UnmarshalJSON(b []byte) error {
 	}
 
 	// All this to make sure we get `]`
-	if t, err := dec.Token(); err != nil {
+	t, err = dec.Token()
+	if err != nil {
 		return err
-	} else {
-		switch token := t.(type) {
-		case json.Delim:
-			if token.String() != "]" {
-				return &json.UnmarshalTypeError{
-					Value:  token.String(),
-					Type:   reflect.TypeOf(a),
-					Offset: 0,
-				}
-			}
-		default:
+	}
+	switch token := t.(type) {
+	case json.Delim:
+		if token.String() != "]" {
 			return &json.UnmarshalTypeError{
-				Value:  fmt.Sprintf("%v", t),
+				Value:  token.String(),
 				Type:   reflect.TypeOf(a),
 				Offset: 0,
 			}
 		}
+	default:
+		return &json.UnmarshalTypeError{
+			Value:  fmt.Sprintf("%v", t),
+			Type:   reflect.TypeOf(a),
+			Offset: 0,
+		}
 	}
 
 	return nil