Skip to content

Commit 60502fd

Browse files
committed
Change return type of KaitaiStream.pos() to long
1 parent 3241aa0 commit 60502fd

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
@@ -246,8 +246,8 @@ public void seek(long newPos) {
246246
}
247247

248248
@Override
249-
public int pos() {
250-
return bb.position() + ((bitsWriteMode && bitsLeft > 0) ? 1 : 0);
249+
public long pos() {
250+
return bb.position() + ((bitsWriteMode && bitsLeft > 0) ? 1L : 0L);
251251
}
252252

253253
@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
@@ -110,10 +110,9 @@ public void seek(long newPos) {
110110
}
111111

112112
@Override
113-
public int pos() {
113+
public long pos() {
114114
try {
115-
// FIXME cast
116-
return (int) raf.getFilePointer() + ((bitsWriteMode && bitsLeft > 0) ? 1 : 0);
115+
return raf.getFilePointer() + ((bitsWriteMode && bitsLeft > 0) ? 1L : 0L);
117116
} catch (IOException e) {
118117
throw new RuntimeException(e);
119118
}

0 commit comments

Comments
 (0)