windows: Restructure if/else blocks with unnecessary indentation.

[libserialport.git] / serialport.c

diff --git a/serialport.c b/serialport.c
index 58da1e910bf194b320384f4eb9e4a6ca120d05ce..8d71865bad14ce5dc55d36f44d83570fb08c8d8a 100644 (file)
--- a/serialport.c
+++ b/serialport.c
@@ -758,18 +758,16 @@ SP_API enum sp_return sp_blocking_write(struct sp_port *port, const void *buf,
        }
 
        /* Start write. */
-       if (WriteFile(port->hdl, buf, count, NULL, &port->write_ovl) == 0) {
-               if (GetLastError() == ERROR_IO_PENDING) {
-                       DEBUG("Waiting for write to complete");
-                       GetOverlappedResult(port->hdl, &port->write_ovl, &bytes_written, TRUE);
-                       DEBUG_FMT("Write completed, %d/%d bytes written", bytes_written, count);
-                       RETURN_INT(bytes_written);
-               } else {
-                       RETURN_FAIL("WriteFile() failed");
-               }
-       } else {
+       if (WriteFile(port->hdl, buf, count, NULL, &port->write_ovl)) {
                DEBUG("Write completed immediately");
                RETURN_INT(count);
+       } else if (GetLastError() == ERROR_IO_PENDING) {
+               DEBUG("Waiting for write to complete");
+               GetOverlappedResult(port->hdl, &port->write_ovl, &bytes_written, TRUE);
+               DEBUG_FMT("Write completed, %d/%d bytes written", bytes_written, count);
+               RETURN_INT(bytes_written);
+       } else {
+               RETURN_FAIL("WriteFile() failed");
        }
 #else
        size_t bytes_written = 0;
@@ -921,16 +919,16 @@ SP_API enum sp_return sp_nonblocking_write(struct sp_port *port,
 /* Restart wait operation if buffer was emptied. */
 static enum sp_return restart_wait_if_needed(struct sp_port *port, unsigned int bytes_read)
 {
-       int ret, bytes_remaining;
-
-       ret = sp_input_waiting(port);
+       DWORD errors;
+       COMSTAT comstat;
 
-       if (ret < 0)
-               RETURN_CODEVAL(ret);
+       if (bytes_read == 0)
+               RETURN_OK();
 
-       bytes_remaining = ret;
+       if (ClearCommError(port->hdl, &errors, &comstat) == 0)
+               RETURN_FAIL("ClearCommError() failed");
 
-       if (bytes_read > 0 && bytes_remaining == 0)
+       if (comstat.cbInQue == 0)
                TRY(restart_wait(port));
 
        RETURN_OK();
@@ -970,17 +968,15 @@ SP_API enum sp_return sp_blocking_read(struct sp_port *port, void *buf,
        }
 
        /* Start read. */
-       if (ReadFile(port->hdl, buf, count, NULL, &port->read_ovl) == 0) {
-               if (GetLastError() == ERROR_IO_PENDING) {
-                       DEBUG("Waiting for read to complete");
-                       GetOverlappedResult(port->hdl, &port->read_ovl, &bytes_read, TRUE);
-                       DEBUG_FMT("Read completed, %d/%d bytes read", bytes_read, count);
-               } else {
-                       RETURN_FAIL("ReadFile() failed");
-               }
-       } else {
+       if (ReadFile(port->hdl, buf, count, NULL, &port->read_ovl)) {
                DEBUG("Read completed immediately");
                bytes_read = count;
+       } else if (GetLastError() == ERROR_IO_PENDING) {
+               DEBUG("Waiting for read to complete");
+               GetOverlappedResult(port->hdl, &port->read_ovl, &bytes_read, TRUE);
+               DEBUG_FMT("Read completed, %d/%d bytes read", bytes_read, count);
+       } else {
+               RETURN_FAIL("ReadFile() failed");
        }
 
        TRY(restart_wait_if_needed(port, bytes_read));