Removed redundant Fd from Linux and POSIX ports

- Removed reduntant File Descriptor field stored in Port structure for Linux and POSIX implementations
tarm · Mar 14, 2015 · d30c3c8 · d30c3c8
1 parent cee3521
commit d30c3c8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/serial_linux.go b/serial_linux.go
@@ -86,14 +86,13 @@ func openPort(name string, baud int, readTimeout time.Duration) (p *Port, err er
 		return
 	}
 
-	return &Port{f: f, fd: fd}, nil
+	return &Port{f: f}, nil
 }
 
 type Port struct {
 	// We intentionly do not use an "embedded" struct so that we
 	// don't export File
-	f  *os.File
-	fd uintptr
+	f *os.File
 }
 
 func (p *Port) Read(b []byte) (n int, err error) {
@@ -108,7 +107,7 @@ func (p *Port) Flush() error {
 	const TCFLSH = 0x540B
 	_, _, err := syscall.Syscall(
 		syscall.SYS_IOCTL,
-		uintptr(p.fd),
+		uintptr(p.f.Fd()),
 		uintptr(TCFLSH),
 		uintptr(syscall.TCIOFLUSH),
 	)

diff --git a/serial_posix.go b/serial_posix.go
@@ -116,14 +116,13 @@ func openPort(name string, baud int, readTimeout time.Duration) (p *Port, err er
 				}
 	*/
 
-	return &Port{f: f, fd: fd}, nil
+	return &Port{f: f}, nil
 }
 
 type Port struct {
 	// We intentionly do not use an "embedded" struct so that we
 	// don't export File
-	f  *os.File
-	fd C.int
+	f *os.File
 }
 
 func (p *Port) Read(b []byte) (n int, err error) {
@@ -135,7 +134,7 @@ func (p *Port) Write(b []byte) (n int, err error) {
 }
 
 func (p *Port) Flush() error {
-	_, err := C.tcflush(p.fd, C.TCIOFLUSH)
+	_, err := C.tcflush(C.int(p.f.Fd()), C.TCIOFLUSH)
 	return err
 }