remove final Tcgetattr(..., termio) calls

Kzx157 · Dec 26, 2020 · 321cc23 · 321cc23
1 parent e25b098
commit 321cc23
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/term_solaris.go b/term_solaris.go
@@ -146,11 +146,11 @@ func Open(name string, options ...func(*Term) error) (*Term, error) {
 		}
 	}
 
-	t := Term{name: name, fd: fd}
-	termios.Tcgetattr(uintptr(t.fd), &t.orig)
-	if err := termios.Tcgetattr(uintptr(t.fd), &t.orig); err != nil {
+	orig, err := termios.Tcgetattr(uintptr(t.fd))
+	if err != nil {
 		return nil, err
 	}
+	t := Term{name: name, fd: fd, *orig}
 
 	if err := t.SetOption(options...); err != nil {
 		return nil, err

diff --git a/term_windows.go b/term_windows.go
@@ -70,11 +70,7 @@ func (t *Term) SetSpeed(baud int) error {
 
 // GetSpeed gets the transmit baud rate.
 func (t *Term) GetSpeed() (int, error) {
-	var a attr
-	if err := termios.Tcgetattr(uintptr(t.fd), (*syscall.Termios)(&a)); err != nil {
-		return 0, err
-	}
-	return a.getSpeed()
+	return 0, errNotSupported
 }
 
 // Flush flushes both data received but not read, and data written but not transmitted.

diff --git a/termios/termios_solaris.go b/termios/termios_solaris.go
@@ -23,10 +23,8 @@ const (
 )
 
 // Tcgetattr gets the current serial port settings.
-func Tcgetattr(fd uintptr, argp *unix.Termios) error {
-	termios, err := unix.IoctlGetTermios(int(fd), unix.TCGETS)
-	*argp = *(tiosTounix(termios))
-	return err
+func Tcgetattr(fd uintptr) (*unix.Termios, error) {
+	return unix.IoctlGetTermios(int(fd), unix.TCGETS)
 }
 
 // Tcsetattr sets the current serial port settings.