Skip to content

Commit 4ed5ddd

Browse files
committed
Change return type of KaitaiStream.pos() to long
1 parent dadfd82 commit 4ed5ddd

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

src/main/java/io/kaitai/struct/ByteBufferKaitaiStream.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,8 @@ public void seek(long newPos) {
248248
}
249249

250250
@Override
251-
public int pos() {
252-
return bb.position() + ((bitsWriteMode && bitsLeft > 0) ? 1 : 0);
251+
public long pos() {
252+
return bb.position() + ((bitsWriteMode && bitsLeft > 0) ? 1L : 0L);
253253
}
254254

255255
@Override

src/main/java/io/kaitai/struct/KaitaiStream.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public abstract class KaitaiStream implements Closeable {
122122
* Get current position of a stream pointer.
123123
* @return pointer position, number of bytes from the beginning of the stream
124124
*/
125-
abstract public int pos();
125+
abstract public long pos();
126126

127127
/**
128128
* Get total size of the stream in bytes.

src/main/java/io/kaitai/struct/RandomAccessFileKaitaiStream.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,9 @@ public void seek(long newPos) {
111111
}
112112

113113
@Override
114-
public int pos() {
114+
public long pos() {
115115
try {
116-
// FIXME cast
117-
return (int) raf.getFilePointer() + ((bitsWriteMode && bitsLeft > 0) ? 1 : 0);
116+
return raf.getFilePointer() + ((bitsWriteMode && bitsLeft > 0) ? 1L : 0L);
118117
} catch (IOException e) {
119118
throw new RuntimeException(e);
120119
}

0 commit comments

Comments
 (0)