Skip to content

Commit 03ae658

Browse files
Inline variable. (apache#107)
1 parent c75c0af commit 03ae658

2 files changed

Lines changed: 3 additions & 6 deletions

File tree

src/main/java/org/apache/commons/codec/digest/MurmurHash3.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -460,15 +460,14 @@ public static int hash32x86(final byte[] data, final int offset, final int lengt
460460
public static long hash64(final long data) {
461461
long hash = DEFAULT_SEED;
462462
long k = Long.reverseBytes(data);
463-
final int length = LONG_BYTES;
464463
// mix functions
465464
k *= C1;
466465
k = Long.rotateLeft(k, R1);
467466
k *= C2;
468467
hash ^= k;
469468
hash = Long.rotateLeft(hash, R2) * M + N1;
470469
// finalization
471-
hash ^= length;
470+
hash ^= LONG_BYTES;
472471
hash = fmix64(hash);
473472
return hash;
474473
}
@@ -505,14 +504,13 @@ public static long hash64(final long data) {
505504
@Deprecated
506505
public static long hash64(final int data) {
507506
long k1 = Integer.reverseBytes(data) & (-1L >>> 32);
508-
final int length = INTEGER_BYTES;
509507
long hash = DEFAULT_SEED;
510508
k1 *= C1;
511509
k1 = Long.rotateLeft(k1, R1);
512510
k1 *= C2;
513511
hash ^= k1;
514512
// finalization
515-
hash ^= length;
513+
hash ^= INTEGER_BYTES;
516514
hash = fmix64(hash);
517515
return hash;
518516
}

src/main/java/org/apache/commons/codec/digest/UnixCrypt.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,8 +326,7 @@ private static int[] body(final int[] schedule, final int eSwap0, final int eSwa
326326
}
327327

328328
private static int byteToUnsigned(final byte b) {
329-
final int value = b;
330-
return value < 0 ? value + 256 : value;
329+
return b & 0xff;
331330
}
332331

333332
private static int dEncrypt(int el, final int r, final int s, final int e0, final int e1, final int[] sArr) {

0 commit comments

Comments
 (0)