From 97ae1e5034e2130f75c143b3b0115b90b2d7693c Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sun, 13 Dec 2015 16:38:06 +0000
Subject: [PATCH] Cleanup: Don't use DataHelper.writeLong() for a single byte
---
core/java/src/net/i2p/data/i2cp/AbuseSeverity.java | 2 +-
core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java | 2 +-
core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java | 2 +-
core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java | 4 ++--
.../src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java | 2 +-
.../java/src/net/i2p/data/i2cp/SendMessageExpiresMessage.java | 2 +-
core/java/src/net/i2p/data/i2cp/SendMessageMessage.java | 2 +-
router/java/src/net/i2p/data/i2np/DeliveryInstructions.java | 2 +-
router/java/src/net/i2p/data/router/RouterAddress.java | 2 +-
.../java/src/net/i2p/router/message/GarlicMessageBuilder.java | 4 ++--
10 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/core/java/src/net/i2p/data/i2cp/AbuseSeverity.java b/core/java/src/net/i2p/data/i2cp/AbuseSeverity.java
index bc3b9bbc97..00855844cf 100644
--- a/core/java/src/net/i2p/data/i2cp/AbuseSeverity.java
+++ b/core/java/src/net/i2p/data/i2cp/AbuseSeverity.java
@@ -45,7 +45,7 @@ public class AbuseSeverity extends DataStructureImpl {
public void writeBytes(OutputStream out) throws DataFormatException, IOException {
if (_severityId < 0) throw new DataFormatException("Invalid abuse severity: " + _severityId);
- DataHelper.writeLong(out, 1, _severityId);
+ out.write((byte) _severityId);
}
@Override
diff --git a/core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java b/core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java
index ff597559fb..1f91da128d 100644
--- a/core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java
+++ b/core/java/src/net/i2p/data/i2cp/I2CPMessageImpl.java
@@ -105,7 +105,7 @@ public abstract class I2CPMessageImpl extends DataStructureImpl implements I2CPM
byte[] data = doWriteMessage();
try {
DataHelper.writeLong(out, 4, data.length);
- DataHelper.writeLong(out, 1, getType());
+ out.write((byte) getType());
} catch (DataFormatException dfe) {
throw new I2CPMessageException("Unable to write the message length or type", dfe);
}
diff --git a/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java b/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java
index c7b78c4600..b349534115 100644
--- a/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/MessagePayloadMessage.java
@@ -106,7 +106,7 @@ public class MessagePayloadMessage extends I2CPMessageImpl {
int size = 2 + 4 + 4 + _payload.getSize();
try {
DataHelper.writeLong(out, 4, size);
- DataHelper.writeLong(out, 1, MESSAGE_TYPE);
+ out.write((byte) MESSAGE_TYPE);
DataHelper.writeLong(out, 2, _sessionId);
DataHelper.writeLong(out, 4, _messageId);
DataHelper.writeLong(out, 4, _payload.getSize());
diff --git a/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java b/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java
index 401fa96f0f..b3612eccd3 100644
--- a/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/MessageStatusMessage.java
@@ -324,10 +324,10 @@ public class MessageStatusMessage extends I2CPMessageImpl {
try {
DataHelper.writeLong(out, 4, len);
- DataHelper.writeLong(out, 1, MESSAGE_TYPE);
+ out.write((byte) MESSAGE_TYPE);
DataHelper.writeLong(out, 2, _sessionId);
DataHelper.writeLong(out, 4, _messageId);
- DataHelper.writeLong(out, 1, _status);
+ out.write((byte) _status);
DataHelper.writeLong(out, 4, _size);
DataHelper.writeLong(out, 4, _nonce);
} catch (DataFormatException dfe) {
diff --git a/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java b/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java
index 03e3e4aae4..29c8a02ef9 100644
--- a/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/ReceiveMessageBeginMessage.java
@@ -86,7 +86,7 @@ public class ReceiveMessageBeginMessage extends I2CPMessageImpl {
try {
DataHelper.writeLong(out, 4, len);
- DataHelper.writeLong(out, 1, MESSAGE_TYPE);
+ out.write((byte) MESSAGE_TYPE);
DataHelper.writeLong(out, 2, _sessionId);
DataHelper.writeLong(out, 4, _messageId);
} catch (DataFormatException dfe) {
diff --git a/core/java/src/net/i2p/data/i2cp/SendMessageExpiresMessage.java b/core/java/src/net/i2p/data/i2cp/SendMessageExpiresMessage.java
index 1a4a5b6120..6462dd595a 100644
--- a/core/java/src/net/i2p/data/i2cp/SendMessageExpiresMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/SendMessageExpiresMessage.java
@@ -117,7 +117,7 @@ public class SendMessageExpiresMessage extends SendMessageMessage {
try {
DataHelper.writeLong(out, 4, len);
- DataHelper.writeLong(out, 1, MESSAGE_TYPE);
+ out.write((byte) MESSAGE_TYPE);
_sessionId.writeBytes(out);
_destination.writeBytes(out);
_payload.writeBytes(out);
diff --git a/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java b/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java
index 0a6e69b3a0..039ba9e4ff 100644
--- a/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java
+++ b/core/java/src/net/i2p/data/i2cp/SendMessageMessage.java
@@ -139,7 +139,7 @@ public class SendMessageMessage extends I2CPMessageImpl {
try {
DataHelper.writeLong(out, 4, len);
- DataHelper.writeLong(out, 1, getType());
+ out.write((byte) getType());
_sessionId.writeBytes(out);
_destination.writeBytes(out);
_payload.writeBytes(out);
diff --git a/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java b/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java
index 5f59415124..2c34b40013 100644
--- a/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java
+++ b/router/java/src/net/i2p/data/i2np/DeliveryInstructions.java
@@ -430,7 +430,7 @@ public class DeliveryInstructions extends DataStructureImpl {
// _log.debug("Write flags: " + flags + " mode: " + getDeliveryMode()
// + " =?= " + flagMode(flags));
byte additionalInfo[] = getAdditionalInfo();
- DataHelper.writeLong(out, 1, flags);
+ out.write((byte) flags);
if (additionalInfo != null) {
out.write(additionalInfo);
out.flush();
diff --git a/router/java/src/net/i2p/data/router/RouterAddress.java b/router/java/src/net/i2p/data/router/RouterAddress.java
index e7cd0d6842..a350ef5936 100644
--- a/router/java/src/net/i2p/data/router/RouterAddress.java
+++ b/router/java/src/net/i2p/data/router/RouterAddress.java
@@ -288,7 +288,7 @@ public class RouterAddress extends DataStructureImpl {
public void writeBytes(OutputStream out) throws DataFormatException, IOException {
if (_transportStyle == null)
throw new DataFormatException("uninitialized");
- DataHelper.writeLong(out, 1, _cost);
+ out.write((byte) _cost);
DataHelper.writeLong(out, 8, _expiration);
DataHelper.writeString(out, _transportStyle);
DataHelper.writeProperties(out, _options);
diff --git a/router/java/src/net/i2p/router/message/GarlicMessageBuilder.java b/router/java/src/net/i2p/router/message/GarlicMessageBuilder.java
index ae2f792a57..d6382f4570 100644
--- a/router/java/src/net/i2p/router/message/GarlicMessageBuilder.java
+++ b/router/java/src/net/i2p/router/message/GarlicMessageBuilder.java
@@ -243,7 +243,7 @@ public class GarlicMessageBuilder {
if (config instanceof PayloadGarlicConfig) {
byte clove[] = buildClove(ctx, (PayloadGarlicConfig)config);
baos = new ByteArrayOutputStream(clove.length + 16);
- DataHelper.writeLong(baos, 1, 1);
+ baos.write((byte) 1);
baos.write(clove);
} else {
byte cloves[][] = new byte[config.getCloveCount()][];
@@ -263,7 +263,7 @@ public class GarlicMessageBuilder {
for (int i = 0; i < cloves.length; i++)
len += cloves[i].length;
baos = new ByteArrayOutputStream(len + 16);
- DataHelper.writeLong(baos, 1, cloves.length);
+ baos.write((byte) cloves.length);
for (int i = 0; i < cloves.length; i++)
baos.write(cloves[i]);
}
--
GitLab