Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-14 11:49:04 +01:00
Code Issues Projects Releases Wiki Activity

Renamed raw data type.

Browse Source
This commit is contained in:
akwizgran
2015-05-02 21:05:23 +01:00
parent b8e37a5421
commit 41c4c4d808
16 changed files with 92 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
briar-core/src/org/briarproject/data/ReaderImpl.java
View File

@@ -90,7 +90,7 @@ class ReaderImpl implements Reader {
else if(hasInteger()) skipInteger();
else if(hasFloat()) skipFloat();
else if(hasString()) skipString();
else if(hasBytes()) skipBytes();
else if(hasRaw()) skipRaw();
else if(hasList()) skipList();
else if(hasMap()) skipMap();
else if(hasNull()) skipNull();
@@ -262,16 +262,16 @@ class ReaderImpl implements Reader {
hasLookahead = false;
}
public boolean hasBytes() throws IOException {
public boolean hasRaw() throws IOException {
if(!hasLookahead) readLookahead();
if(eof) return false;
return next == RAW_8 || next == RAW_16 || next == RAW_32;
}
public byte[] readBytes(int maxLength) throws IOException {
if(!hasBytes()) throw new FormatException();
public byte[] readRaw(int maxLength) throws IOException {
if(!hasRaw()) throw new FormatException();
consumeLookahead();
int length = readBytesLength(true);
int length = readRawLength(true);
if(length < 0 || length > maxLength) throw new FormatException();
if(length == 0) return EMPTY_BUFFER;
byte[] b = new byte[length];
@@ -279,16 +279,16 @@ class ReaderImpl implements Reader {
return b;
}
private int readBytesLength(boolean consume) throws IOException {
private int readRawLength(boolean consume) throws IOException {
if(next == RAW_8) return readInt8(consume);
if(next == RAW_16) return readInt16(consume);
if(next == RAW_32) return readInt32(consume);
throw new FormatException();
}
public void skipBytes() throws IOException {
if(!hasBytes()) throw new FormatException();
int length = readBytesLength(false);
public void skipRaw() throws IOException {
if(!hasRaw()) throw new FormatException();
int length = readRawLength(false);
if(length < 0) throw new FormatException();
skip(length);
hasLookahead = false;

6
briar-core/src/org/briarproject/data/WriterImpl.java
View File

@@ -124,7 +124,7 @@ class WriterImpl implements Writer {
write(b);
}
public void writeBytes(byte[] b) throws IOException {
public void writeRaw(byte[] b) throws IOException {
if(b.length <= Byte.MAX_VALUE) {
write(RAW_8);
write((byte) b.length);
@@ -153,8 +153,8 @@ class WriterImpl implements Writer {
else if(o instanceof Float) writeFloat((Float) o);
else if(o instanceof Double) writeFloat((Double) o);
else if(o instanceof String) writeString((String) o);
else if(o instanceof byte[]) writeBytes((byte[]) o);
else if(o instanceof Bytes) writeBytes(((Bytes) o).getBytes());
else if(o instanceof byte[]) writeRaw((byte[]) o);
else if(o instanceof Bytes) writeRaw(((Bytes) o).getBytes());
else if(o instanceof List<?>) writeList((List<?>) o);
else if(o instanceof Map<?, ?>) writeMap((Map<?, ?>) o);
else if(o == null) writeNull();