Merge remote-tracking branch 'origin/linuxfs_buff_overrun' into linux…

…fs_buff_overrun
Pi4J · Mar 3, 2024 · 2d30fb0 · 2d30fb0
2 parents a2f7bc3 + ed208f2
commit 2d30fb0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/libraries/pi4j-library-linuxfs/src/main/java/com/pi4j/library/linuxfs/LinuxFile.java b/libraries/pi4j-library-linuxfs/src/main/java/com/pi4j/library/linuxfs/LinuxFile.java
@@ -235,7 +235,6 @@ protected synchronized IntBuffer getOffsetsBuffer(int size) {
             localOffsetsBuffer.set(buf);
         }
         return buf;
-
     }
 
 
@@ -245,12 +244,10 @@ protected  synchronized ByteBuffer getDataBuffer(int size) {
         if (size > localBufferSize)
             throw new ScratchBufferOverrun();
 
-        // if no buffer exists, one always created.
-        // if buffer exists and limit is not equal to this getDataBuffer, allocate new
         if (buf == null) {
             buf = ByteBuffer.allocateDirect(size);
             localDataBuffer.set(buf);
-        } else if(buf.limit() != size){
+        }else if(buf.limit() != size){
             localDataBuffer.remove();
             buf = ByteBuffer.allocateDirect(size);
             localDataBuffer.set(buf);
@@ -259,7 +256,6 @@ protected  synchronized ByteBuffer getDataBuffer(int size) {
         return buf;
     }
 
-
     public static class ScratchBufferOverrun extends IllegalArgumentException {
         private static final long serialVersionUID = -418203522640826177L;
 

diff --git a/...ns/pi4j-plugin-linuxfs/src/main/java/com/pi4j/plugin/linuxfs/provider/i2c/LinuxFsI2C.java b/...ns/pi4j-plugin-linuxfs/src/main/java/com/pi4j/plugin/linuxfs/provider/i2c/LinuxFsI2C.java
@@ -243,7 +243,7 @@ public int readRegister(byte[] register, byte[] buffer, int offset, int length)
         short writeLength = (short) register.length;
         // two pointers will be used so 2 pairs of offset entries
         IntBuffer offsets = IntBuffer.allocate(4);
-         // create ByteBuffer, load with the write details Matches i2c provider 
+         // create ByteBuffer, load with the write details Matches i2c provider
         ByteBuffer ioctlData = ByteBuffer.allocate(2048);
         // Ensures Pi BCM little_endian
         ioctlData.order(ByteOrder.nativeOrder());