day1. Reformat code.

diff --git a/day1a/main.go b/day1a/main.go
index a2d209a..c41bae0 100644 (file)
--- a/day1a/main.go
+++ b/day1a/main.go
@@ -6,26 +6,35 @@ import (
     "os"
     "bufio"
     "strconv"
+    "io"
 )
 
-func main() {
-    h0, err := os.Open("input.txt")
-    if err != nil { return }
-    defer h0.Close()
-
-    s := bufio.NewScanner(h0)
+func f1 (r io.Reader) (int, error) {
+    s := bufio.NewScanner(r)
     var prev, i int
     for s.Scan() {
         cur, err := strconv.Atoi(s.Text())
         if err != nil {
-            fmt.Printf("%v\n", err)
-            return
+            return 0, fmt.Errorf("%v\n", err)
         }
         if prev < cur {
             i++
         }
         prev = cur
     }
-    fmt.Printf("%d\n", i-1)
+    return i-1, nil
+}
+
+func main() {
+    h0, err := os.Open("input.txt")
+    if err != nil { return }
+    defer h0.Close()
+
+    i, err := f1(h0)
+    if err != nil {
+        fmt.Printf("Error: %v\n", err)
+        return
+    }
+    fmt.Printf("%d\n", i)
 
 }