From c7e7e174848618bc1f4535dad2fb09f4757d711e Mon Sep 17 00:00:00 2001 From: Paulo Casanova Date: Mon, 30 Oct 2017 11:39:24 +0000 Subject: Minor fixes in apkzlib to remove warnings in G3. Test: not needed Change-Id: I803c44cb78331a5df60c5d75fb96e0713aa85c0a --- src/main/java/com/android/apkzlib/zip/Eocd.java | 2 +- src/main/java/com/android/apkzlib/zip/StoredEntry.java | 2 +- src/main/java/com/android/apkzlib/zip/ZFile.java | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/android/apkzlib/zip/Eocd.java b/src/main/java/com/android/apkzlib/zip/Eocd.java index 665f0a8..1568840 100644 --- a/src/main/java/com/android/apkzlib/zip/Eocd.java +++ b/src/main/java/com/android/apkzlib/zip/Eocd.java @@ -215,7 +215,7 @@ class Eocd { * @return the size, in bytes, of the EOCD */ long getEocdSize() { - return F_COMMENT_SIZE.endOffset() + comment.length; + return (long) F_COMMENT_SIZE.endOffset() + comment.length; } /** diff --git a/src/main/java/com/android/apkzlib/zip/StoredEntry.java b/src/main/java/com/android/apkzlib/zip/StoredEntry.java index 5693fce..94aa01a 100644 --- a/src/main/java/com/android/apkzlib/zip/StoredEntry.java +++ b/src/main/java/com/android/apkzlib/zip/StoredEntry.java @@ -499,7 +499,7 @@ public class StoredEntry { long ddStart = cdh.getOffset() + FIXED_LOCAL_FILE_HEADER_SIZE + cdh.getName().length() + localExtra.size() + compressInfo.getCompressedSize(); - byte ddData[] = new byte[DataDescriptorType.DATA_DESCRIPTOR_WITH_SIGNATURE.size]; + byte[] ddData = new byte[DataDescriptorType.DATA_DESCRIPTOR_WITH_SIGNATURE.size]; file.directFullyRead(ddStart, ddData); ByteBuffer ddBytes = ByteBuffer.wrap(ddData); diff --git a/src/main/java/com/android/apkzlib/zip/ZFile.java b/src/main/java/com/android/apkzlib/zip/ZFile.java index 6eb2691..8a88cd0 100644 --- a/src/main/java/com/android/apkzlib/zip/ZFile.java +++ b/src/main/java/com/android/apkzlib/zip/ZFile.java @@ -351,8 +351,8 @@ public class ZFile implements Closeable { private final List toRun; /** - * {@code true} when {@link #notify(com.android.apkzlib.utils.IOExceptionFunction)} is notifying extensions. Used - * to avoid reordering notifications. + * {@code true} when {@link #notify(com.android.apkzlib.utils.IOExceptionFunction)} is + * notifying extensions. Used to avoid reordering notifications. */ private boolean isNotifying; @@ -2491,7 +2491,7 @@ public class ZFile implements Closeable { // We found a possible EOCD signature at position i. Try to read it. ByteBuffer bytes = ByteBuffer.wrap(comment, i, comment.length - i); try { - Eocd eocdInComment = new Eocd(bytes); + new Eocd(bytes); throw new IllegalArgumentException( "Position " + i -- cgit v1.2.3