make Sonar less unhappy

3 files changed, 7 insertions, 11 deletions

diff --git a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
index 3ed8f2fd6..206d3881a 100644
--- a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
@@ -264,13 +264,11 @@ public class ArArchiveInputStream extends ArchiveInputStream {
         if (currentEntry == null) {
             throw new IllegalStateException("No current ar entry");
         }
-        int toRead = len;
         final long entryEnd = entryOffset + currentEntry.getLength();
-        if (len > 0 && entryEnd > offset) {
-            toRead = (int) Math.min(len, entryEnd - offset);
-        } else {
+        if (len < 0 || offset >= entryEnd) {
             return -1;
         }
+        final int toRead = (int) Math.min(len, entryEnd - offset);
         final int ret = this.input.read(b, off, toRead);
         trackReadBytes(ret);
         return ret;
diff --git a/src/main/java/org/apache/commons/compress/archivers/examples/Expander.java b/src/main/java/org/apache/commons/compress/archivers/examples/Expander.java
index cfaba8798..492252755 100644
--- a/src/main/java/org/apache/commons/compress/archivers/examples/Expander.java
+++ b/src/main/java/org/apache/commons/compress/archivers/examples/Expander.java
@@ -222,11 +222,9 @@ public class Expander {
             @Override
             public void writeEntryDataTo(ArchiveEntry entry, OutputStream out) throws IOException {
                 final byte[] buffer = new byte[8024];
-                int n = 0;
-                long count = 0;
+                int n;
                 while (-1 != (n = archive.read(buffer))) {
                     out.write(buffer, 0, n);
-                    count += n;
                 }
             }
         }, targetDirectory);
@@ -240,7 +238,7 @@ public class Expander {
         throws IOException {
         String targetDirPath = targetDirectory.getCanonicalPath();
         if (!targetDirPath.endsWith(File.separator)) {
-            targetDirPath += File.separatorChar;
+            targetDirPath += File.separator;
         }
         ArchiveEntry nextEntry = supplier.getNextReadableEntry();
         while (nextEntry != null) {
diff --git a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
index e1995d7aa..196e40239 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
@@ -246,7 +246,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream implements InputSt
             } else {
                 readFully(lfhBuf);
             }
-        } catch (final EOFException e) {
+        } catch (final EOFException e) { //NOSONAR
             return null;
         }
 
@@ -1120,7 +1120,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream implements InputSt
         // LFH has already been read and all but the first eight bytes contain (part of) the APK signing block,
         // also subtract 16 bytes in order to position us at the magic string
         BigInteger toSkip = len.add(BigInteger.valueOf(DWORD - suspectLocalFileHeader.length
-            - APK_SIGNING_BLOCK_MAGIC.length));
+            - (long) APK_SIGNING_BLOCK_MAGIC.length));
         byte[] magic = new byte[APK_SIGNING_BLOCK_MAGIC.length];
 
         try {
@@ -1144,7 +1144,7 @@ public class ZipArchiveInputStream extends ArchiveInputStream implements InputSt
                 realSkip(toSkip.longValue());
                 readFully(magic);
             }
-        } catch (EOFException ex) {
+        } catch (EOFException ex) { //NOSONAR
             // length was invalid
             return false;
         }