(commons-compress) branch master updated: Refactor common constants

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-compress.git


The following commit(s) were added to refs/heads/master by this push:
     new 5065f06c0 Refactor common constants
5065f06c0 is described below

commit 5065f06c072f31f0f9d35dc79695503fb1c46261
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Thu Feb 1 08:40:45 2024 -0500

    Refactor common constants
    
    Make it obvious that the same constants are used.
---
 .../archivers/tar/TarArchiveInputStream.java         | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git 
a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
 
b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
index 0899d179d..10eb6a166 100644
--- 
a/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
+++ 
b/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
@@ -58,22 +58,26 @@ public class TarArchiveInputStream extends 
ArchiveInputStream<TarArchiveEntry> {
      * @return true, if this stream is a tar archive stream, false otherwise
      */
     public static boolean matches(final byte[] signature, final int length) {
-        if (length < TarConstants.VERSION_OFFSET + TarConstants.VERSIONLEN) {
+        final int versionOffset = TarConstants.VERSION_OFFSET;
+        final int versionLen = TarConstants.VERSIONLEN;
+        if (length < versionOffset + versionLen) {
             return false;
         }
 
-        if (ArchiveUtils.matchAsciiBuffer(TarConstants.MAGIC_POSIX, signature, 
TarConstants.MAGIC_OFFSET, TarConstants.MAGICLEN)
-                && ArchiveUtils.matchAsciiBuffer(TarConstants.VERSION_POSIX, 
signature, TarConstants.VERSION_OFFSET, TarConstants.VERSIONLEN)) {
+        final int magicOffset = TarConstants.MAGIC_OFFSET;
+        final int magicLen = TarConstants.MAGICLEN;
+        if (ArchiveUtils.matchAsciiBuffer(TarConstants.MAGIC_POSIX, signature, 
magicOffset, magicLen)
+                && ArchiveUtils.matchAsciiBuffer(TarConstants.VERSION_POSIX, 
signature, versionOffset, versionLen)) {
             return true;
         }
-        if (ArchiveUtils.matchAsciiBuffer(TarConstants.MAGIC_GNU, signature, 
TarConstants.MAGIC_OFFSET, TarConstants.MAGICLEN)
-                && 
(ArchiveUtils.matchAsciiBuffer(TarConstants.VERSION_GNU_SPACE, signature, 
TarConstants.VERSION_OFFSET, TarConstants.VERSIONLEN)
-                        || 
ArchiveUtils.matchAsciiBuffer(TarConstants.VERSION_GNU_ZERO, signature, 
TarConstants.VERSION_OFFSET, TarConstants.VERSIONLEN))) {
+        if (ArchiveUtils.matchAsciiBuffer(TarConstants.MAGIC_GNU, signature, 
magicOffset, magicLen)
+                && 
(ArchiveUtils.matchAsciiBuffer(TarConstants.VERSION_GNU_SPACE, signature, 
versionOffset, versionLen)
+                        || 
ArchiveUtils.matchAsciiBuffer(TarConstants.VERSION_GNU_ZERO, signature, 
versionOffset, versionLen))) {
             return true;
         }
         // COMPRESS-107 - recognize Ant tar files
-        return ArchiveUtils.matchAsciiBuffer(TarConstants.MAGIC_ANT, 
signature, TarConstants.MAGIC_OFFSET, TarConstants.MAGICLEN)
-                && ArchiveUtils.matchAsciiBuffer(TarConstants.VERSION_ANT, 
signature, TarConstants.VERSION_OFFSET, TarConstants.VERSIONLEN);
+        return ArchiveUtils.matchAsciiBuffer(TarConstants.MAGIC_ANT, 
signature, magicOffset, magicLen)
+                && ArchiveUtils.matchAsciiBuffer(TarConstants.VERSION_ANT, 
signature, versionOffset, versionLen);
     }
 
     private final byte[] smallBuf = new byte[SMALL_BUFFER_SIZE];