Merge pull request #12 from heroku/small_cleanup

Small cleanup
mcuadros · Feb 11, 2015 · d715976 · d715976
2 parents b1cc05f + 06b4277
commit d715976
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/rfc6587_test.go b/rfc6587_test.go
@@ -61,7 +61,7 @@ func TestBadSplit(t *testing.T) {
 	if err := scanner.Err(); err == nil {
 		t.Error("Expected an error, but didn't get one")
 	} else {
-		t.Log("Error: ", err)
+		t.Log("Error was: ", err)
 	}
 
 }
diff --git a/server.go b/server.go
@@ -169,9 +169,10 @@ func rfc6587ScannerSplit(data []byte, atEOF bool) (advance int, token []byte, er
 		if err != nil {
 			return 0, nil, err
 		}
-		if len(data) >= length+i+1 {
+		end := length + i + 1
+		if len(data) >= end {
 			//Return the frame with the length removed
-			return length + i + 1, data[i+1 : length+i+1], nil
+			return end, data[i+1 : end], nil
 		}
 	}