Address errcheck errors

borkshop · Dec 29, 2017 · de89cbf · de89cbf
1 parent 5e1ae2d
commit de89cbf
Show file tree

Hide file tree

Showing 9 changed files with 129 additions and 57 deletions.
diff --git a/internal/cops/examples/borkart/main.go b/internal/cops/examples/borkart/main.go
@@ -17,11 +17,16 @@ func main() {
 	}
 }
 
-func run() error {
+func run() (err error) {
 
 	term := terminal.New(os.Stdout.Fd())
-	defer term.Restore()
-	term.SetRaw()
+	defer func() {
+		err = term.Restore()
+	}()
+	err = term.SetRaw()
+	if err != nil {
+		return err
+	}
 
 	bounds, err := term.Bounds()
 	if err != nil {
@@ -72,11 +77,17 @@ Loop:
 
 		buf, cur = display.RenderOver(buf, cur, front, back, display.Model24)
 		front, back = back, front
-		os.Stdout.Write(buf)
+		_, err = os.Stdout.Write(buf)
+		if err != nil {
+			return err
+		}
 		buf = buf[0:0]
 
 		var rbuf [1]byte
-		os.Stdin.Read(rbuf[0:1])
+		_, err = os.Stdin.Read(rbuf[0:1])
+		if err != nil {
+			return err
+		}
 
 		switch rbuf[0] {
 		case ' ':
@@ -101,7 +112,10 @@ Loop:
 	buf, cur = cur.Home(buf)
 	buf, cur = cur.Clear(buf)
 	buf, cur = cur.Show(buf)
-	os.Stdout.Write(buf)
+	_, err = os.Stdout.Write(buf)
+	if err != nil {
+		return err
+	}
 	buf = buf[0:0]
-	return nil
+	return err
 }
diff --git a/internal/cops/examples/brailleline/main.go b/internal/cops/examples/brailleline/main.go
@@ -17,7 +17,7 @@ func main() {
 	}
 }
 
-func run() error {
+func run() (err error) {
 	w, h := 32, 16
 	pb := image.Rect(0, 0, w, h)
 	bb := braille.Bounds(pb)
@@ -38,7 +38,7 @@ func run() error {
 	cur := display.Reset
 	buf, cur = display.Render(buf, cur, front, display.Model0)
 	buf = append(buf, "\r\n"...)
-	os.Stdout.Write(buf)
+	_, err = os.Stdout.Write(buf)
 
-	return nil
+	return err
 }
diff --git a/internal/cops/examples/braillematrix/main.go b/internal/cops/examples/braillematrix/main.go
@@ -17,7 +17,7 @@ func main() {
 	}
 }
 
-func run() error {
+func run() (err error) {
 
 	w, h := 16, 16
 	pb := image.Rect(0, 0, w, h)
@@ -66,7 +66,7 @@ func run() error {
 	cur := display.Reset
 	buf, cur = display.Render(buf, cur, page, display.Model8)
 	buf = append(buf, "\r\n"...)
-	os.Stdout.Write(buf)
+	_, err = os.Stdout.Write(buf)
 
-	return nil
+	return err
 }
diff --git a/internal/cops/examples/braillewave/main.go b/internal/cops/examples/braillewave/main.go
@@ -19,10 +19,15 @@ func main() {
 	}
 }
 
-func run() error {
+func run() (err error) {
 	term := terminal.New(os.Stdout.Fd())
-	defer term.Restore()
-	term.SetRaw()
+	defer func() {
+		err = term.Restore()
+	}()
+	err = term.SetRaw()
+	if err != nil {
+		return err
+	}
 
 	bounds, err := term.Bounds()
 	if err != nil {
@@ -34,7 +39,7 @@ func run() error {
 	stopper := make(chan struct{}, 0)
 	go func() {
 		var rbuf [1]byte
-		os.Stdin.Read(rbuf[0:1])
+		_, err = os.Stdin.Read(rbuf[0:1])
 		close(stopper)
 	}()
 
@@ -69,7 +74,10 @@ Loop:
 
 		buf, cur = display.RenderOver(buf, cur, front, back, display.Model24)
 		front, back = back, front
-		os.Stdout.Write(buf)
+		_, err = os.Stdout.Write(buf)
+		if err != nil {
+			return err
+		}
 		buf = buf[0:0]
 
 		select {
@@ -84,8 +92,8 @@ Loop:
 	buf, cur = cur.Home(buf)
 	buf, cur = cur.Clear(buf)
 	buf, cur = cur.Show(buf)
-	os.Stdout.Write(buf)
+	_, err = os.Stdout.Write(buf)
 	buf = buf[0:0]
 
-	return nil
+	return err
 }
diff --git a/internal/cops/examples/earthgif/earthgif.go b/internal/cops/examples/earthgif/earthgif.go
@@ -20,10 +20,15 @@ func main() {
 	}
 }
 
-func run() error {
+func run() (err error) {
 	term := terminal.New(os.Stdin.Fd())
-	defer term.Restore()
-	term.SetRaw()
+	defer func() {
+		err = term.Restore()
+	}()
+	err = term.SetRaw()
+	if err != nil {
+		return err
+	}
 
 	data, err := Asset("earth.gif")
 	if err != nil {
@@ -62,7 +67,10 @@ func run() error {
 	go func() {
 		var rbuf [1]byte
 		for {
-			os.Stdin.Read(rbuf[0:1])
+			_, err := os.Stdin.Read(rbuf[0:1])
+			if err != nil {
+				break
+			}
 			keypress <- rbuf[0]
 		}
 	}()
@@ -78,7 +86,10 @@ Loop:
 		buf, cur = display.RenderOver(buf, cur, front, back, display.Model24)
 		front, back = back, front
 		buf, cur = cur.Home(buf)
-		os.Stdout.Write(buf)
+		_, err = os.Stdout.Write(buf)
+		if err != nil {
+			break Loop
+		}
 		buf = buf[0:0]
 
 		delay := time.Duration(imgs.Delay[i]) * time.Millisecond * 10
@@ -98,10 +109,10 @@ Loop:
 	buf, cur = cur.Home(buf)
 	buf, cur = cur.Clear(buf)
 	buf, cur = cur.Show(buf)
-	os.Stdout.Write(buf)
+	_, err = os.Stdout.Write(buf)
 	buf = buf[0:0]
 
-	return nil
+	return err
 }
 
 func projectCenterPreserveAspect(inner, outer image.Point) image.Rectangle {

diff --git a/internal/cops/examples/hicops/hicops.go b/internal/cops/examples/hicops/hicops.go
@@ -19,10 +19,15 @@ func main() {
 	}
 }
 
-func run() error {
+func run() (err error) {
 	term := terminal.New(os.Stdin.Fd())
-	defer term.Restore()
-	term.SetRaw()
+	defer func() {
+		err = term.Restore()
+	}()
+	err = term.SetRaw()
+	if err != nil {
+		return
+	}
 
 	bounds, err := term.Bounds()
 	if err != nil {
@@ -51,17 +56,23 @@ func run() error {
 	buf, cur = cur.Home(buf)
 	buf, cur = display.Render(buf, cur, front, display.Model24)
 	buf, cur = cur.Home(buf)
-	os.Stdout.Write(buf)
+	_, err = os.Stdout.Write(buf)
+	if err != nil {
+		return err
+	}
 	buf = buf[0:0]
 
 	var input [1]byte
-	os.Stdin.Read(input[0:1])
+	_, err = os.Stdin.Read(input[0:1])
+	if err != nil {
+		return err
+	}
 
 	buf, cur = cur.Home(buf)
 	buf, cur = cur.Clear(buf)
 	buf, cur = cur.Show(buf)
-	os.Stdout.Write(buf)
+	_, err = os.Stdout.Write(buf)
 	buf = buf[0:0]
 
-	return nil
+	return err
 }
diff --git a/internal/cops/examples/vt/main.go b/internal/cops/examples/vt/main.go
@@ -18,10 +18,15 @@ func main() {
 	}
 }
 
-func run() error {
+func run() (err error) {
 	term := terminal.New(os.Stdin.Fd())
-	defer term.Restore()
-	term.SetRaw()
+	defer func() {
+		err = term.Restore()
+	}()
+	err = term.SetRaw()
+	if err != nil {
+		return err
+	}
 
 	leader, follower, err := termios.Pty()
 	if err != nil {
@@ -46,7 +51,9 @@ func run() error {
 	}
 
 	vtw := vtio.NewDisplayWriter(bounds)
-	go io.Copy(vtw, leader)
+	go func() {
+		_, err = io.Copy(vtw, leader)
+	}()
 
 	front, back := display.New2(bounds)
 
@@ -61,7 +68,7 @@ func run() error {
 	r := make(chan struct{}, 0)
 	go func() {
 		var rbuf [1]byte
-		os.Stdin.Read(rbuf[0:1])
+		_, err = os.Stdin.Read(rbuf[0:1])
 		close(r)
 	}()
 
@@ -73,7 +80,10 @@ DrawLoop:
 			buf, cur = display.RenderOver(buf, cur, front, back, display.Model24)
 			front, back = back, front
 			// fmt.Printf("%q\r\n", buf)
-			os.Stdout.Write(buf)
+			_, err = os.Stdout.Write(buf)
+			if err != nil {
+				break DrawLoop
+			}
 			buf = buf[0:0]
 		case <-r:
 			break DrawLoop
@@ -84,8 +94,8 @@ DrawLoop:
 	buf, cur = cur.Home(buf)
 	buf, cur = cur.Clear(buf)
 	buf, cur = cur.Show(buf)
-	os.Stdout.Write(buf)
+	_, err = os.Stdout.Write(buf)
 	buf = buf[0:0]
 
-	return nil
+	return err
 }
diff --git a/internal/cops/terminal/terminal.go b/internal/cops/terminal/terminal.go
@@ -21,7 +21,7 @@ type Terminal struct {
 // that terminal to its current state.
 func New(fd uintptr) Terminal {
 	t := Terminal{fd: fd}
-	termios.Tcgetattr(fd, &t.old)
+	_ = termios.Tcgetattr(fd, &t.old)
 	t.now = t.old
 	return t
 }