You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/02/20 22:02:17 UTC
[commons-codec] branch master updated: Inline variable. (#107)
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-codec.git
The following commit(s) were added to refs/heads/master by this push:
new 03ae658 Inline variable. (#107)
03ae658 is described below
commit 03ae658e5449d7a3b6c9fa2ee38e712b41d85123
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Sun Feb 20 23:02:12 2022 +0100
Inline variable. (#107)
---
src/main/java/org/apache/commons/codec/digest/MurmurHash3.java | 6 ++----
src/main/java/org/apache/commons/codec/digest/UnixCrypt.java | 3 +--
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java b/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java
index 0c28cff..7c85e84 100644
--- a/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java
+++ b/src/main/java/org/apache/commons/codec/digest/MurmurHash3.java
@@ -460,7 +460,6 @@ public final class MurmurHash3 {
public static long hash64(final long data) {
long hash = DEFAULT_SEED;
long k = Long.reverseBytes(data);
- final int length = LONG_BYTES;
// mix functions
k *= C1;
k = Long.rotateLeft(k, R1);
@@ -468,7 +467,7 @@ public final class MurmurHash3 {
hash ^= k;
hash = Long.rotateLeft(hash, R2) * M + N1;
// finalization
- hash ^= length;
+ hash ^= LONG_BYTES;
hash = fmix64(hash);
return hash;
}
@@ -505,14 +504,13 @@ public final class MurmurHash3 {
@Deprecated
public static long hash64(final int data) {
long k1 = Integer.reverseBytes(data) & (-1L >>> 32);
- final int length = INTEGER_BYTES;
long hash = DEFAULT_SEED;
k1 *= C1;
k1 = Long.rotateLeft(k1, R1);
k1 *= C2;
hash ^= k1;
// finalization
- hash ^= length;
+ hash ^= INTEGER_BYTES;
hash = fmix64(hash);
return hash;
}
diff --git a/src/main/java/org/apache/commons/codec/digest/UnixCrypt.java b/src/main/java/org/apache/commons/codec/digest/UnixCrypt.java
index 05f0cdd..a7b8501 100644
--- a/src/main/java/org/apache/commons/codec/digest/UnixCrypt.java
+++ b/src/main/java/org/apache/commons/codec/digest/UnixCrypt.java
@@ -326,8 +326,7 @@ public class UnixCrypt {
}
private static int byteToUnsigned(final byte b) {
- final int value = b;
- return value < 0 ? value + 256 : value;
+ return b & 0xff;
}
private static int dEncrypt(int el, final int r, final int s, final int e0, final int e1, final int[] sArr) {