archive-gh-me/ip2region
1
0
Fork 0
mirror of https://github.com/lionsoul2014/ip2region.git synced 2025-12-08 19:25:22 +00:00
Code Issues Projects Releases Wiki Activity

putInt2 to putUint16 and getInt2 to getUint16

Browse Source
This commit is contained in:
lion 2025-10-21 10:34:53 +08:00
parent bd69a255fd
commit 79cc6c1b0d
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
binding/java/src/main/java/org/lionsoul/ip2region/xdb/Header.java
View File

@ -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;
}

4
binding/java/src/main/java/org/lionsoul/ip2region/xdb/LittleEndian.java
View File

@ -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)

2
binding/java/src/main/java/org/lionsoul/ip2region/xdb/LongByteArray.java
View File

@ -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

2
binding/java/src/main/java/org/lionsoul/ip2region/xdb/Searcher.java
View File

@ -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;
}

6
binding/java/src/test/java/org/lionsoul/ip2region/xdb/LittleEndianTest.java
View File

@ -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));
}