diff --git a/binding/java/src/main/java/org/lionsoul/ip2region/xdb/Header.java b/binding/java/src/main/java/org/lionsoul/ip2region/xdb/Header.java index a6305f1..4b73150 100644 --- a/binding/java/src/main/java/org/lionsoul/ip2region/xdb/Header.java +++ b/binding/java/src/main/java/org/lionsoul/ip2region/xdb/Header.java @@ -21,13 +21,13 @@ public class Header { public Header(byte[] buff) { assert buff.length >= 16; - version = LittleEndian.getInt2(buff, 0); - indexPolicy = LittleEndian.getInt2(buff, 2); + version = LittleEndian.getUint16(buff, 0); + indexPolicy = LittleEndian.getUint16(buff, 2); createdAt = LittleEndian.getUint32(buff, 4); startIndexPtr = LittleEndian.getUint32(buff, 8); endIndexPtr = LittleEndian.getUint32(buff, 12); - ipVersion = LittleEndian.getInt2(buff, 16); - runtimePtrBytes = LittleEndian.getInt2(buff, 18); + ipVersion = LittleEndian.getUint16(buff, 16); + runtimePtrBytes = LittleEndian.getUint16(buff, 18); buffer = buff; } diff --git a/binding/java/src/main/java/org/lionsoul/ip2region/xdb/LittleEndian.java b/binding/java/src/main/java/org/lionsoul/ip2region/xdb/LittleEndian.java index 2a8b7b0..06a223d 100644 --- a/binding/java/src/main/java/org/lionsoul/ip2region/xdb/LittleEndian.java +++ b/binding/java/src/main/java/org/lionsoul/ip2region/xdb/LittleEndian.java @@ -32,7 +32,7 @@ public class LittleEndian { } // put a 2-bytes int to the buffer from the specified offset - public static void putInt2(final byte[] buff, int offset, int value) { + public static void putUint16(final byte[] buff, int offset, int value) { buff[offset++] = (byte) (value & 0xFF); buff[offset ] = (byte) ((value >> 8) & 0xFF); } @@ -48,7 +48,7 @@ public class LittleEndian { } // get an 2 bytes int from a byte array from the specified offset - public static int getInt2(final byte[] buff, int offset) { + public static int getUint16(final byte[] buff, int offset) { return ( ((buff[offset++]) & 0x000000FF) | ((buff[offset ] << 8) & 0x0000FF00) diff --git a/binding/java/src/main/java/org/lionsoul/ip2region/xdb/LongByteArray.java b/binding/java/src/main/java/org/lionsoul/ip2region/xdb/LongByteArray.java index 3fb2a07..1d41219 100644 --- a/binding/java/src/main/java/org/lionsoul/ip2region/xdb/LongByteArray.java +++ b/binding/java/src/main/java/org/lionsoul/ip2region/xdb/LongByteArray.java @@ -114,7 +114,7 @@ public class LongByteArray { public int getInt2(long offset) { final byte[] b = new byte[4]; copy(offset, b, 0, 4); - return LittleEndian.getInt2(b, 0); + return LittleEndian.getUint16(b, 0); } // position entry class diff --git a/binding/java/src/main/java/org/lionsoul/ip2region/xdb/Searcher.java b/binding/java/src/main/java/org/lionsoul/ip2region/xdb/Searcher.java index 68264a8..dbae4de 100644 --- a/binding/java/src/main/java/org/lionsoul/ip2region/xdb/Searcher.java +++ b/binding/java/src/main/java/org/lionsoul/ip2region/xdb/Searcher.java @@ -137,7 +137,7 @@ public class Searcher { } else if (version.ipSubCompare(ip, buff, bytes) > 0) { l = m + 1; } else { - dataLen = LittleEndian.getInt2(buff, dBytes); + dataLen = LittleEndian.getUint16(buff, dBytes); dataPtr = LittleEndian.getUint32(buff, dBytes + 2); break; } diff --git a/binding/java/src/test/java/org/lionsoul/ip2region/xdb/LittleEndianTest.java b/binding/java/src/test/java/org/lionsoul/ip2region/xdb/LittleEndianTest.java index 9b216a3..7132c7d 100644 --- a/binding/java/src/test/java/org/lionsoul/ip2region/xdb/LittleEndianTest.java +++ b/binding/java/src/test/java/org/lionsoul/ip2region/xdb/LittleEndianTest.java @@ -18,18 +18,18 @@ public class LittleEndianTest { LittleEndian.put(buff, 4, 2L, 4); // putUint32 - LittleEndian.putInt2(buff, 8, 24); + LittleEndian.putUint16(buff, 8, 24); LittleEndian.putUint32(buff, 10, 1024L); // decode assertEquals(LittleEndian.getUint32(buff, 0), 1); assertEquals(LittleEndian.getUint32(buff, 4), 2); - assertEquals(LittleEndian.getInt2(buff, 8), 24); + assertEquals(LittleEndian.getUint16(buff, 8), 24); assertEquals(LittleEndian.getUint32(buff, 10), 1024); log.debugf("uint32(buff, 0): %d", LittleEndian.getUint32(buff, 0)); log.debugf("uint32(buff, 4): %d", LittleEndian.getUint32(buff, 4)); - log.debugf("int2(buff, 8): %d", LittleEndian.getInt2(buff, 8)); + log.debugf("int2(buff, 8): %d", LittleEndian.getUint16(buff, 8)); log.debugf("uint32(buff, 10): %d", LittleEndian.getUint32(buff, 10)); }