FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PlainSocketImpl.java (read): Remove declaration.

Browse source 
* gnu/java/net/PlainSocketImpl.java (read): Remove declaration.
	(write): Likewise.
	(SocketInputStream, SocketOutputStream): Declare `read' and `write'
	native. Remove implementations which called back into
	PlainSocketImpl.
	Remove unneccessary overridden methods.
	* gnu/java/net/natPlainSocketImplNoNet.cc (read): Move
	implementation
	to inner class PlainSocketImpl.SocketInputStream.
	(write): Likewise.
	* gnu/java/net/natPlainSocketImplPosix.cc: As above.
	* gnu/java/net/natPlainSocketImplWin32.cc: As above.
	* gnu/java/net/SocketInputStream.java: Remove unused file.
	* gnu/java/net/SocketOutputStream.java: Likewise.
	* Makefile.am: Build CNI headers for PlainSocketImpl.SocketInputStream
	and SocketOutputStream.
	* Makefile.in: Rebuilt.

From-SVN: r71724
This commit is contained in:
Bryce McKinlay 2003-09-24 05:38:36 +00:00 • committed by Bryce McKinlay
parent b9f2972f1e
commit 9b7fe786e1
9 changed files with 85 additions and 458 deletions
Download patch file Download diff file Expand all files Collapse all files

80
libjava/gnu/java/net/PlainSocketImpl.java
View file

@ -271,32 +271,6 @@ public final class PlainSocketImpl extends SocketImpl
protected native void sendUrgentData(int data)
throws IOException;
native int read() throws IOException;
/**
* Internal method used by SocketInputStream for reading data from
* the connection. Reads up to len bytes of data into the buffer
* buf starting at offset bytes into the buffer.
*
* @return The actual number of bytes read or -1 if end of stream.
*
* @exception IOException If an error occurs
*/
native int read(byte[] buffer, int offset, int count)
throws IOException;
native void write(int c) throws IOException;
/**
* Internal method used by SocketOuputStream for writing data to
* the connection. Writes up to len bytes of data from the buffer
* buf starting at offset bytes into the buffer.
*
* @exception IOException If an error occurs
*/
native void write(byte[] buffer, int offset, int count)
throws IOException;
/**
* Returns an InputStream object for reading from this socket. This will
* be an instance of SocketInputStream.
@ -334,13 +308,14 @@ public final class PlainSocketImpl extends SocketImpl
*
* @author Nic Ferrier <nferrier@tapsellferrier.co.uk>
*/
class SocketInputStream
final class SocketInputStream
extends InputStream
{
SocketInputStream()
{
}
public native int read() throws IOException;
public native int read(byte[] buffer, int offset, int length)
throws IOException;
public final void close() throws IOException
{
PlainSocketImpl.this.close();
@ -350,52 +325,23 @@ public final class PlainSocketImpl extends SocketImpl
{
return PlainSocketImpl.this.available();
}
public final int read() throws IOException
{
return PlainSocketImpl.this.read();
}
public final int read(byte[] buffer, int offset, int length)
throws IOException
{
return PlainSocketImpl.this.read(buffer, offset, length);
}
public final int read(byte[] buffer)
throws IOException
{
return PlainSocketImpl.this.read(buffer, 0, buffer.length);
}
}
/** A stream which writes to the socket implementation.
*
* @author Nic Ferrier <nferrier@tapsellferrier.co.uk>
*/
class SocketOutputStream
final class SocketOutputStream
extends OutputStream
{
public final void close() throws IOException
public native void write(int c) throws IOException;
public native void write(byte[] buffer, int offset, int length)
throws IOException;
public void close() throws IOException
{
PlainSocketImpl.this.close();
}
public final void write(int c) throws IOException
{
PlainSocketImpl.this.write(c);
}
public final void write(byte[] buffer, int offset, int length)
throws IOException
{
PlainSocketImpl.this.write(buffer, offset, length);
}
public final void write(byte[] buffer)
throws IOException
{
PlainSocketImpl.this.write(buffer, 0, buffer.length);
}
}
}