8336844: ZipConstants64 defines duplicate constants EXTID_ZIP64 and ZIP64_EXTID

Reviewed-by: jpai, vtewari, lancea

Author: cushon

src/java.base/share/classes/java/util/zip/ZipConstants64.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,6 @@ class ZipConstants64 {
     static final int  ZIP64_ENDHDR = 56;           // ZIP64 end header size
     static final int  ZIP64_LOCHDR = 20;           // ZIP64 end loc header size
     static final int  ZIP64_EXTHDR = 24;           // EXT header size
-    static final int  ZIP64_EXTID  = 0x0001;       // Extra field Zip64 header ID
 
     static final int  ZIP64_MAGICCOUNT = 0xFFFF;
     static final long ZIP64_MAGICVAL = 0xFFFFFFFFL;

src/java.base/share/classes/java/util/zip/ZipFile.java

@@ -1324,7 +1324,7 @@ private void checkExtraFields(int cenPos, int startingOffset,
                             tag, cenPos));
                 }
 
-                if (tag == ZIP64_EXTID) {
+                if (tag == EXTID_ZIP64) {
                     // Get the compressed size;
                     long csize = CENSIZ(cen, cenPos);
                     // Get the uncompressed size;
@@ -1360,15 +1360,15 @@ private void checkZip64ExtraFieldValues(int off, int blockSize, long csize,
                                                 long size, long locoff, int diskNo)
                 throws ZipException {
             byte[] cen = this.cen;
-            // if ZIP64_EXTID blocksize == 0, which may occur with some older
+            // if EXTID_ZIP64 blocksize == 0, which may occur with some older
             // versions of Apache Ant and Commons Compress, validate csize and size
             // to make sure neither field == ZIP64_MAGICVAL
             if (blockSize == 0) {
                 if (csize == ZIP64_MAGICVAL || size == ZIP64_MAGICVAL ||
                         locoff == ZIP64_MAGICVAL || diskNo == ZIP64_MAGICCOUNT) {
                     zerror("Invalid CEN header (invalid zip64 extra data field size)");
                 }
-                // Only validate the ZIP64_EXTID data if the block size > 0
+                // Only validate the EXTID_ZIP64 data if the block size > 0
                 return;
             }
             // Validate the Zip64 Extended Information Extra Field (0x0001)

src/java.base/share/classes/java/util/zip/ZipInputStream.java

@@ -679,7 +679,7 @@ private boolean expect64BitDataDescriptor(byte[] extra, int flag, long csize, lo
                 if (i + headerSize + dsize > extra.length) {
                     return false; // Invalid size
                 }
-                if (id == ZIP64_EXTID) {
+                if (id == EXTID_ZIP64) {
                     return true;
                 }
                 i += headerSize + dsize;

src/java.base/share/classes/java/util/zip/ZipOutputStream.java

@@ -485,7 +485,7 @@ private void writeLOC(XEntry xentry) throws IOException {
         writeShort(elen);
         writeBytes(nameBytes, 0, nameBytes.length);
         if (hasZip64) {
-            writeShort(ZIP64_EXTID);
+            writeShort(EXTID_ZIP64);
             writeShort(16);
             writeLong(e.size);
             writeLong(e.csize);
@@ -643,7 +643,7 @@ private void writeCEN(XEntry xentry) throws IOException {
 
         // take care of EXTID_ZIP64 and EXTID_EXTT
         if (hasZip64) {
-            writeShort(ZIP64_EXTID);// Zip64 extra
+            writeShort(EXTID_ZIP64);// Zip64 extra
             writeShort(elenZIP64);
             if (size == ZIP64_MAGICVAL)
                 writeLong(e.size);

src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipConstants.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -130,7 +130,6 @@ class ZipConstants {
     static final int  ZIP64_ENDHDR = 56;           // ZIP64 end header size
     static final int  ZIP64_LOCHDR = 20;           // ZIP64 end loc header size
     static final int  ZIP64_EXTHDR = 24;           // EXT header size
-    static final int  ZIP64_EXTID  = 0x0001;       // Extra field Zip64 header ID
 
     static final int  ZIP64_MINVAL32 = 0xFFFF;
     static final long ZIP64_MINVAL = 0xFFFFFFFFL;

src/jdk.zipfs/share/classes/jdk/nio/zipfs/ZipFileSystem.java

@@ -1710,15 +1710,15 @@ private void checkExtraFields( byte[] cen, int cenPos, long size, long csize,
     private void checkZip64ExtraFieldValues(byte[] cen, int off, int blockSize, long csize,
                                             long size, long locoff, int diskNo)
             throws ZipException {
-        // if ZIP64_EXTID blocksize == 0, which may occur with some older
+        // if EXTID_ZIP64 blocksize == 0, which may occur with some older
         // versions of Apache Ant and Commons Compress, validate csize and size
         // to make sure neither field == ZIP64_MAGICVAL
         if (blockSize == 0) {
             if (csize == ZIP64_MINVAL || size == ZIP64_MINVAL ||
                     locoff == ZIP64_MINVAL || diskNo == ZIP64_MINVAL32) {
                 zerror("Invalid CEN header (invalid zip64 extra data field size)");
             }
-            // Only validate the ZIP64_EXTID data if the block size > 0
+            // Only validate the EXTID_ZIP64 data if the block size > 0
             return;
         }
         // Validate the Zip64 Extended Information Extra Field (0x0001)