echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup: Don't use DataHelper.writeLong() for a single byte

Browse Source
This commit is contained in:
zzz
2015-12-13 16:38:06 +00:00
parent fee755bdb7
commit 97ae1e5034
10 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/src/net/i2p/data/i2cp/AbuseSeverity.java
View File

@ -45,7 +45,7 @@ public class AbuseSeverity extends DataStructureImpl {
public void writeBytes(OutputStream out) throws DataFormatException, IOException { public void writeBytes(OutputStream out) throws DataFormatException, IOException {
if (_severityId < 0) throw new DataFormatException("Invalid abuse severity: " + _severityId); if (_severityId < 0) throw new DataFormatException("Invalid abuse severity: " + _severityId);
DataHelper.writeLong(out, 1, _severityId); out.write((byte) _severityId);
} }
@Override @Override

2
core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java
View File

@ -105,7 +105,7 @@ public abstract class I2CPMessageImpl extends DataStructureImpl implements I2CPM
byte[] data = doWriteMessage(); byte[] data = doWriteMessage();
try { try {
DataHelper.writeLong(out, 4, data.length); DataHelper.writeLong(out, 4, data.length);
DataHelper.writeLong(out, 1, getType()); out.write((byte) getType());
} catch (DataFormatException dfe) { } catch (DataFormatException dfe) {
throw new I2CPMessageException("Unable to write the message length or type", dfe); throw new I2CPMessageException("Unable to write the message length or type", dfe);
} }

2
core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java
View File

@ -106,7 +106,7 @@ public class MessagePayloadMessage extends I2CPMessageImpl {
int size = 2 + 4 + 4 + _payload.getSize(); int size = 2 + 4 + 4 + _payload.getSize();
try { try {
DataHelper.writeLong(out, 4, size); DataHelper.writeLong(out, 4, size);
DataHelper.writeLong(out, 1, MESSAGE_TYPE); out.write((byte) MESSAGE_TYPE);
DataHelper.writeLong(out, 2, _sessionId); DataHelper.writeLong(out, 2, _sessionId);
DataHelper.writeLong(out, 4, _messageId); DataHelper.writeLong(out, 4, _messageId);
DataHelper.writeLong(out, 4, _payload.getSize()); DataHelper.writeLong(out, 4, _payload.getSize());

4
core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java
View File

@ -324,10 +324,10 @@ public class MessageStatusMessage extends I2CPMessageImpl {
try { try {
DataHelper.writeLong(out, 4, len); DataHelper.writeLong(out, 4, len);
DataHelper.writeLong(out, 1, MESSAGE_TYPE); out.write((byte) MESSAGE_TYPE);
DataHelper.writeLong(out, 2, _sessionId); DataHelper.writeLong(out, 2, _sessionId);
DataHelper.writeLong(out, 4, _messageId); DataHelper.writeLong(out, 4, _messageId);
DataHelper.writeLong(out, 1, _status); out.write((byte) _status);
DataHelper.writeLong(out, 4, _size); DataHelper.writeLong(out, 4, _size);
DataHelper.writeLong(out, 4, _nonce); DataHelper.writeLong(out, 4, _nonce);
} catch (DataFormatException dfe) { } catch (DataFormatException dfe) {

2
core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java
View File

@ -86,7 +86,7 @@ public class ReceiveMessageBeginMessage extends I2CPMessageImpl {
try { try {
DataHelper.writeLong(out, 4, len); DataHelper.writeLong(out, 4, len);
DataHelper.writeLong(out, 1, MESSAGE_TYPE); out.write((byte) MESSAGE_TYPE);
DataHelper.writeLong(out, 2, _sessionId); DataHelper.writeLong(out, 2, _sessionId);
DataHelper.writeLong(out, 4, _messageId); DataHelper.writeLong(out, 4, _messageId);
} catch (DataFormatException dfe) { } catch (DataFormatException dfe) {

2
core/java/src/net/i2p/data/i2cp/SendMessageExpiresMessage.java
View File

@ -117,7 +117,7 @@ public class SendMessageExpiresMessage extends SendMessageMessage {
try { try {
DataHelper.writeLong(out, 4, len); DataHelper.writeLong(out, 4, len);
DataHelper.writeLong(out, 1, MESSAGE_TYPE); out.write((byte) MESSAGE_TYPE);
_sessionId.writeBytes(out); _sessionId.writeBytes(out);
_destination.writeBytes(out); _destination.writeBytes(out);
_payload.writeBytes(out); _payload.writeBytes(out);

2
core/java/src/net/i2p/data/i2cp/SendMessageMessage.java
View File

@ -139,7 +139,7 @@ public class SendMessageMessage extends I2CPMessageImpl {
try { try {
DataHelper.writeLong(out, 4, len); DataHelper.writeLong(out, 4, len);
DataHelper.writeLong(out, 1, getType()); out.write((byte) getType());
_sessionId.writeBytes(out); _sessionId.writeBytes(out);
_destination.writeBytes(out); _destination.writeBytes(out);
_payload.writeBytes(out); _payload.writeBytes(out);

2
router/java/src/net/i2p/data/i2np/DeliveryInstructions.java
View File

@ -430,7 +430,7 @@ public class DeliveryInstructions extends DataStructureImpl {
// _log.debug("Write flags: " + flags + " mode: " + getDeliveryMode() // _log.debug("Write flags: " + flags + " mode: " + getDeliveryMode()
// + " =?= " + flagMode(flags)); // + " =?= " + flagMode(flags));
byte additionalInfo[] = getAdditionalInfo(); byte additionalInfo[] = getAdditionalInfo();
DataHelper.writeLong(out, 1, flags); out.write((byte) flags);
if (additionalInfo != null) { if (additionalInfo != null) {
out.write(additionalInfo); out.write(additionalInfo);
out.flush(); out.flush();

2
router/java/src/net/i2p/data/router/RouterAddress.java
View File

@ -288,7 +288,7 @@ public class RouterAddress extends DataStructureImpl {
public void writeBytes(OutputStream out) throws DataFormatException, IOException { public void writeBytes(OutputStream out) throws DataFormatException, IOException {
if (_transportStyle == null) if (_transportStyle == null)
throw new DataFormatException("uninitialized"); throw new DataFormatException("uninitialized");
DataHelper.writeLong(out, 1, _cost); out.write((byte) _cost);
DataHelper.writeLong(out, 8, _expiration); DataHelper.writeLong(out, 8, _expiration);
DataHelper.writeString(out, _transportStyle); DataHelper.writeString(out, _transportStyle);
DataHelper.writeProperties(out, _options); DataHelper.writeProperties(out, _options);

4
router/java/src/net/i2p/router/message/GarlicMessageBuilder.java
View File

@ -243,7 +243,7 @@ public class GarlicMessageBuilder {
if (config instanceof PayloadGarlicConfig) { if (config instanceof PayloadGarlicConfig) {
byte clove[] = buildClove(ctx, (PayloadGarlicConfig)config); byte clove[] = buildClove(ctx, (PayloadGarlicConfig)config);
baos = new ByteArrayOutputStream(clove.length + 16); baos = new ByteArrayOutputStream(clove.length + 16);
DataHelper.writeLong(baos, 1, 1); baos.write((byte) 1);
baos.write(clove); baos.write(clove);
} else { } else {
byte cloves[][] = new byte[config.getCloveCount()][]; byte cloves[][] = new byte[config.getCloveCount()][];
@ -263,7 +263,7 @@ public class GarlicMessageBuilder {
for (int i = 0; i < cloves.length; i++) for (int i = 0; i < cloves.length; i++)
len += cloves[i].length; len += cloves[i].length;
baos = new ByteArrayOutputStream(len + 16); baos = new ByteArrayOutputStream(len + 16);
DataHelper.writeLong(baos, 1, cloves.length); baos.write((byte) cloves.length);
for (int i = 0; i < cloves.length; i++) for (int i = 0; i < cloves.length; i++)
baos.write(cloves[i]); baos.write(cloves[i]);
} }