Cleanup

- Drop duplicated header includes.
- Enhance error messages in windows writeBytes().

Author: hiddenalpha

src/main/cpp/_nix_based/jssc.cpp

@@ -25,12 +25,10 @@
 #include <assert.h>
 #include <limits.h>
 #include <stdio.h>
-#include <string.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <string.h>
 #include <sys/ioctl.h>
 #include <termios.h>
 #include <time.h>
@@ -41,7 +39,6 @@
 #endif
 #ifdef __sun
     #include <sys/filio.h>//Needed for FIONREAD in Solaris
-    #include <string.h>//Needed for select() function
 #endif
 #ifdef __APPLE__
     #include <serial/ioss.h>//Needed for IOSSIOSPEED in Mac OS X (Non standard baudrate)

src/main/cpp/windows/jssc.cpp

@@ -243,30 +243,37 @@ JNIEXPORT jint JNICALL Java_jssc_SerialNativeInterface_writeBytes
         if( exClz ) env->ThrowNew(exClz, "buffer");
         return 0;
     }
-    jbyte* jBuffer = env->GetByteArrayElements(buffer, NULL);
+    jbyte *jBuffer = env->GetByteArrayElements(buffer, NULL);
     if( !jBuffer ){
         jclass exClz = env->ExceptionCheck() ? NULL : env->FindClass("java/lang/RuntimeException");
         if( exClz ) env->ThrowNew(exClz, "jni->GetByteArrayElements() failed");
         return 0;
     }
     OVERLAPPED *overlapped = new OVERLAPPED();
     overlapped->hEvent = CreateEventA(NULL, true, false, NULL);
+    DWORD err = 0;
     if(WriteFile(hComm, jBuffer, (DWORD)env->GetArrayLength(buffer), &lpNumberOfBytesWritten, overlapped)){
         returnValue = lpNumberOfBytesWritten;
-    }
-    else if(GetLastError() == ERROR_IO_PENDING){
-        if(WaitForSingleObject(overlapped->hEvent, INFINITE) == WAIT_OBJECT_0){
-            if(GetOverlappedResult(hComm, overlapped, &lpNumberOfBytesTransferred, false)){
-                returnValue = lpNumberOfBytesTransferred;
+    }else{
+        err = GetLastError();
+        if( err == ERROR_IO_PENDING ){
+            if(WaitForSingleObject(overlapped->hEvent, INFINITE) == WAIT_OBJECT_0){
+                if(GetOverlappedResult(hComm, overlapped, &lpNumberOfBytesTransferred, false)){
+                    returnValue = lpNumberOfBytesTransferred;
+                }
+            }else{
+                err = GetLastError();
             }
         }
     }
     env->ReleaseByteArrayElements(buffer, jBuffer, 0);
     CloseHandle(overlapped->hEvent);
     delete overlapped;
     if( returnValue < 0 ){
+        char emsg[128];
+        snprintf(emsg, sizeof emsg, "Error %d. Details: https://learn.microsoft.com/en-us/windows/win32/debug/system-error-codes#system-error-codes", err);
         jobject *exClz = env->FindClass("jssc/SerialPortException");
-        if( exClz ) env->ThrowNew(exClz, "WriteFile() failed");
+        if( exClz ) env->ThrowNew(exClz, emsg);
         return 0;
     }
     return returnValue;

src/main/java/jssc/SerialPort.java

@@ -415,8 +415,8 @@ public boolean writeBytes1(byte[] buffer) throws SerialPortException {
         /* Delegate to new method and translate result to what original method
          * did return. */
         try{
-            int result = writeBytes(buffer);
-            return result == buffer.length;
+            int numWrittenBytes = writeBytes(buffer);
+            return numWrittenBytes == buffer.length;
         } catch(IOException ex) {
             throw SerialPortException.wrapNativeException(ex, this, "writeBytes1");
         }
@@ -428,7 +428,7 @@ public boolean writeBytes1(byte[] buffer) throws SerialPortException {
      * @param buffer <code>byte[]</code> array to write.
      *
      * @return number of bytes written.
-     * 
+     *
      * @throws SerialPortException
      */
     public int writeBytes(byte[] buffer) throws SerialPortException {