Re-add print statements on actual error

NeuronRobotics · Apr 14, 2020 · f151c10 · f151c10
1 parent 76c07f3
commit f151c10
Show file tree

Hide file tree

Showing 13 changed files with 11 additions and 9 deletions.
diff --git a/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv5.so b/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv5.so
diff --git a/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv6.so b/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv6.so
diff --git a/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv6_HF.so b/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv6_HF.so
diff --git a/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv7.so b/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv7.so
diff --git a/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv7_HF.so b/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv7_HF.so
diff --git a/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv8.so b/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv8.so
diff --git a/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv8_HF.so b/src/main/c/resources/native/linux/ARM_32/libNRJavaSerialv8_HF.so
diff --git a/src/main/c/resources/native/linux/ARM_64/libNRJavaSerialv8.so b/src/main/c/resources/native/linux/ARM_64/libNRJavaSerialv8.so
diff --git a/src/main/c/resources/native/linux/x86_32/libNRJavaSerial.so b/src/main/c/resources/native/linux/x86_32/libNRJavaSerial.so
diff --git a/src/main/c/resources/native/linux/x86_64/libNRJavaSerial.so b/src/main/c/resources/native/linux/x86_64/libNRJavaSerial.so
diff --git a/src/main/c/resources/native/windows/x86_32/libNRJavaSerial.dll b/src/main/c/resources/native/windows/x86_32/libNRJavaSerial.dll
diff --git a/src/main/c/resources/native/windows/x86_64/libNRJavaSerial.dll b/src/main/c/resources/native/windows/x86_64/libNRJavaSerial.dll
diff --git a/src/main/c/src/SerialImp.c b/src/main/c/src/SerialImp.c
@@ -5445,23 +5445,25 @@ int fhs_lock( const char *filename, int pid )
 	fd = open( file, O_CREAT | O_WRONLY | O_EXCL, 0666 );
 	if( fd < 0 )
 	{
-//		sprintf( message,
-//			"RXTX fhs_lock() Error: opening lock file: %s: %s.",
-//			file, strerror(errno) );
-//		report_error( message );
+
 		fd = open( file,  O_WRONLY );
 		if( fd < 0 ){
-//			sprintf( message,
-//				" FAILED TO OPEN: %s\n",
-//				 strerror(errno) );
-//			report_error( message );
+			sprintf( message,
+				" FAILED TO OPEN: %s\n",
+				 strerror(errno) );
+			report_error( message );
 			return 1;
 		}
 
 		if(check_lock_pid( file, pid )==0){
 //			report_error(" It is mine\n" );
+		}else{
+			sprintf(message, "RXTX fhs_lock() Error: opening lock file: %s: %s.", file,
+			strerror(errno));
+			report_error( message );
+			report_error(" It is NOT mine\n" );
 		}
-//		report_error( "\n" );
+		report_error( "\n" );
 		close( fd );
 		return 1;
 	}