From 262968443698e470653af950e579beff8c7db40c Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@bug.st>
Date: Wed, 31 Dec 2014 00:37:02 +0100
Subject: [PATCH] Cosmetic change: rewritten error conditions in a more compact
 way

---
 serial_linux.go   |  5 ++---
 serial_windows.go | 14 ++++++--------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/serial_linux.go b/serial_linux.go
index 4fb55bb..b197505 100644
--- a/serial_linux.go
+++ b/serial_linux.go
@@ -70,7 +70,7 @@ func OpenPort(portName string, mode *Mode) (SerialPort, error) {
 	}
 
 	// Setup serial port
-	if err := port.SetMode(mode); err != nil {
+	if port.SetMode(mode) != nil {
 		port.Close()
 		return nil, &SerialPortError{code: ERROR_INVALID_SERIAL_PORT}
 	}
@@ -93,8 +93,7 @@ func OpenPort(portName string, mode *Mode) (SerialPort, error) {
 	settings.Cc[syscall.VMIN] = 1
 	settings.Cc[syscall.VTIME] = 0
 
-	err = port.setTermSettings(settings)
-	if err != nil {
+	if port.setTermSettings(settings) != nil {
 		port.Close()
 		return nil, &SerialPortError{code: ERROR_INVALID_SERIAL_PORT}
 	}
diff --git a/serial_windows.go b/serial_windows.go
index 11eebad..ee14520 100644
--- a/serial_windows.go
+++ b/serial_windows.go
@@ -173,7 +173,7 @@ const (
 
 func (port *windowsSerialPort) SetMode(mode *Mode) error {
 	params := DCB{}
-	if err := GetCommState(port.Handle, &params); err != nil {
+	if GetCommState(port.Handle, &params) != nil {
 		port.Close()
 		return &SerialPortError{code: ERROR_INVALID_SERIAL_PORT}
 	}
@@ -189,7 +189,7 @@ func (port *windowsSerialPort) SetMode(mode *Mode) error {
 	}
 	params.StopBits = byte(mode.StopBits)
 	params.Parity = byte(mode.Parity)
-	if err := SetCommState(port.Handle, &params); err != nil {
+	if SetCommState(port.Handle, &params) != nil {
 		port.Close()
 		return &SerialPortError{code: ERROR_INVALID_SERIAL_PORT}
 	}
@@ -224,14 +224,13 @@ func OpenPort(portName string, mode *Mode) (SerialPort, error) {
 	}
 
 	// Set port parameters
-	if err := port.SetMode(mode); err != nil {
+	if port.SetMode(mode) != nil {
 		port.Close()
 		return nil, &SerialPortError{code: ERROR_INVALID_SERIAL_PORT}
 	}
 
 	params := &DCB{}
-	err = GetCommState(port.Handle, params)
-	if err != nil {
+	if GetCommState(port.Handle, params) != nil {
 		port.Close()
 		return nil, &SerialPortError{code: ERROR_INVALID_SERIAL_PORT}
 	}
@@ -248,8 +247,7 @@ func OpenPort(portName string, mode *Mode) (SerialPort, error) {
 	params.XoffLim = 512
 	params.XonChar = 17  // DC1
 	params.XoffChar = 19 // C3
-	err = SetCommState(port.Handle, params)
-	if err != nil {
+	if SetCommState(port.Handle, params) != nil {
 		port.Close()
 		return nil, &SerialPortError{code: ERROR_INVALID_SERIAL_PORT}
 	}
@@ -262,7 +260,7 @@ func OpenPort(portName string, mode *Mode) (SerialPort, error) {
 		WriteTotalTimeoutConstant:   0,
 		WriteTotalTimeoutMultiplier: 0,
 	}
-	if err := SetCommTimeouts(port.Handle, timeouts); err != nil {
+	if SetCommTimeouts(port.Handle, timeouts) != nil {
 		port.Close()
 		return nil, &SerialPortError{code: ERROR_INVALID_SERIAL_PORT}
 	}