This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-net.git
commit 87bb61856d970ecc4972899d2da2ecae00723d85 Author: Gary Gregory <[email protected]> AuthorDate: Tue Jun 24 07:41:20 2025 -0400 Upper case internal constants Reduce vertical whitespace --- .../org/apache/commons/net/io/FromNetASCIIInputStream.java | 13 ------------- .../org/apache/commons/net/io/FromNetASCIIOutputStream.java | 3 --- 2 files changed, 16 deletions(-) diff --git a/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java b/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java index cc02df9f..a27fe2a1 100644 --- a/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java +++ b/src/main/java/org/apache/commons/net/io/FromNetASCIIInputStream.java @@ -82,7 +82,6 @@ public final class FromNetASCIIInputStream extends PushbackInputStream { if (NO_CONVERSION_REQUIRED) { return super.read(); } - return readInt(); } @@ -113,41 +112,30 @@ public final class FromNetASCIIInputStream extends PushbackInputStream { if (NO_CONVERSION_REQUIRED) { return super.read(buffer, offset, length); } - if (length < 1) { return 0; } - int ch; final int off; - ch = available(); - this.length = Math.min(length, ch); - // If nothing is available, block to read only one character if (this.length < 1) { this.length = 1; } - if ((ch = readInt()) == -1) { return NetConstants.EOS; } - off = offset; - do { buffer[offset++] = (byte) ch; } while (--this.length > 0 && (ch = readInt()) != -1); - return offset - off; } private int readInt() throws IOException { int ch; - ch = super.read(); - if (ch == '\r') { ch = super.read(); if (ch != '\n') { @@ -161,7 +149,6 @@ public final class FromNetASCIIInputStream extends PushbackInputStream { // This is a kluge for read(byte[], ...) to read the right amount --length; } - return ch; } diff --git a/src/main/java/org/apache/commons/net/io/FromNetASCIIOutputStream.java b/src/main/java/org/apache/commons/net/io/FromNetASCIIOutputStream.java index e6cd3471..2d12360a 100644 --- a/src/main/java/org/apache/commons/net/io/FromNetASCIIOutputStream.java +++ b/src/main/java/org/apache/commons/net/io/FromNetASCIIOutputStream.java @@ -54,7 +54,6 @@ public final class FromNetASCIIOutputStream extends FilterOutputStream { super.close(); return; } - if (lastWasCR) { out.write('\r'); } @@ -88,7 +87,6 @@ public final class FromNetASCIIOutputStream extends FilterOutputStream { out.write(buffer, offset, length); return; } - while (length-- > 0) { writeInt(buffer[offset++]); } @@ -108,7 +106,6 @@ public final class FromNetASCIIOutputStream extends FilterOutputStream { out.write(ch); return; } - writeInt(ch); }
