From 7c1ce777a198ed1c4a9927e11ad037b66780e7b9 Mon Sep 17 00:00:00 2001
From: jrandom <jrandom>
Date: Thu, 23 Sep 2004 01:13:22 +0000
Subject: [PATCH] cleanup per jikes' whining (overloaded var names, val
overflow, etc)
---
.../client/RequestLeaseSetMessageHandler.java | 1 -
.../src/net/i2p/crypto/AESInputStream.java | 16 ++++++------
core/java/src/net/i2p/util/LogManager.java | 25 +++++++++----------
core/java/src/net/i2p/util/ShellCommand.java | 4 +--
4 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java b/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java
index 282c1dae98..6283f398f9 100644
--- a/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java
+++ b/core/java/src/net/i2p/client/RequestLeaseSetMessageHandler.java
@@ -33,7 +33,6 @@ import net.i2p.util.Log;
* @author jrandom
*/
class RequestLeaseSetMessageHandler extends HandlerImpl {
- private final static Log _log = new Log(RequestLeaseSetMessageHandler.class);
private Map _existingLeaseSets;
public RequestLeaseSetMessageHandler(I2PAppContext context) {
diff --git a/core/java/src/net/i2p/crypto/AESInputStream.java b/core/java/src/net/i2p/crypto/AESInputStream.java
index 073f4a7ea5..e5012cffc2 100644
--- a/core/java/src/net/i2p/crypto/AESInputStream.java
+++ b/core/java/src/net/i2p/crypto/AESInputStream.java
@@ -377,12 +377,12 @@ public class AESInputStream extends FilterInputStream {
long endE = Clock.getInstance().now();
ByteArrayInputStream encryptedStream = new ByteArrayInputStream(encrypted);
- AESInputStream in = new AESInputStream(ctx, encryptedStream, key, iv);
+ AESInputStream sin = new AESInputStream(ctx, encryptedStream, key, iv);
ByteArrayOutputStream baos = new ByteArrayOutputStream(512);
byte buf[] = new byte[1024 * 32];
- int read = DataHelper.read(in, buf);
+ int read = DataHelper.read(sin, buf);
if (read > 0) baos.write(buf, 0, read);
- in.close();
+ sin.close();
byte fin[] = baos.toByteArray();
long end = Clock.getInstance().now();
Hash origHash = SHA256Generator.getInstance().calculateHash(orig);
@@ -422,15 +422,15 @@ public class AESInputStream extends FilterInputStream {
System.arraycopy(encrypted, 0, encryptedSegment, 0, 40);
ByteArrayInputStream encryptedStream = new ByteArrayInputStream(encryptedSegment);
- AESInputStream in = new AESInputStream(ctx, encryptedStream, key, iv);
+ AESInputStream sin = new AESInputStream(ctx, encryptedStream, key, iv);
ByteArrayOutputStream baos = new ByteArrayOutputStream(512);
byte buf[] = new byte[1024 * 32];
- int read = DataHelper.read(in, buf);
- int remaining = in.remainingBytes();
- int readyBytes = in.readyBytes();
+ int read = DataHelper.read(sin, buf);
+ int remaining = sin.remainingBytes();
+ int readyBytes = sin.readyBytes();
log.info("Read: " + read);
if (read > 0) baos.write(buf, 0, read);
- in.close();
+ sin.close();
byte fin[] = baos.toByteArray();
log.info("fin.length: " + fin.length + " remaining: " + remaining + " ready: " + readyBytes);
long end = Clock.getInstance().now();
diff --git a/core/java/src/net/i2p/util/LogManager.java b/core/java/src/net/i2p/util/LogManager.java
index fea98dc0ae..de3c7a2b1b 100644
--- a/core/java/src/net/i2p/util/LogManager.java
+++ b/core/java/src/net/i2p/util/LogManager.java
@@ -447,19 +447,18 @@ public class LogManager {
if (!Character.isDigit(mod)) v = size.substring(0, size.length() - 1);
int val = Integer.parseInt(v);
switch (mod) {
- case 'K':
- val *= 1024;
- break;
- case 'M':
- val *= 1024 * 1024;
- break;
- case 'G':
- val *= 1024 * 1024 * 1024;
- break;
- case 'T':
- // because we can
- val *= 1024 * 1024 * 1024 * 1024;
- break;
+ case 'K':
+ val *= 1024;
+ break;
+ case 'M':
+ val *= 1024 * 1024;
+ break;
+ case 'G':
+ val *= 1024 * 1024 * 1024;
+ break;
+ default:
+ // blah, noop
+ break;
}
return val;
} catch (Throwable t) {
diff --git a/core/java/src/net/i2p/util/ShellCommand.java b/core/java/src/net/i2p/util/ShellCommand.java
index 9ad9b91272..2ad7880878 100644
--- a/core/java/src/net/i2p/util/ShellCommand.java
+++ b/core/java/src/net/i2p/util/ShellCommand.java
@@ -104,6 +104,8 @@ public class ShellCommand {
}
}
+ private final static int BUFFER_SIZE = 1024;
+
/**
* Reads data from a <code>java.io.InputStream</code> and writes it to
* <code>STDOUT</code>.
@@ -112,8 +114,6 @@ public class ShellCommand {
*/
private class StreamReader extends Thread {
- final int BUFFER_SIZE = 1024;
-
private BufferedReader bufferedReader;
private InputStreamReader inputStreamReader;
--
GitLab