diff options
| author | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-09-24 05:38:36 +0000 |
|---|---|---|
| committer | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-09-24 05:38:36 +0000 |
| commit | 1f1db466fc6d7c5b169d667964bb5b79d2ee2c8d (patch) | |
| tree | e590f9d618533504ebc1020d0b891654538a1dff /libjava/gnu/java/net/natPlainSocketImplWin32.cc | |
| parent | 04d26b229d3224f7666c8321902c8598ecaf2d42 (diff) | |
| download | gcc-1f1db466fc6d7c5b169d667964bb5b79d2ee2c8d.tar.gz | |
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@71724 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/gnu/java/net/natPlainSocketImplWin32.cc')
| -rw-r--r-- | libjava/gnu/java/net/natPlainSocketImplWin32.cc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/libjava/gnu/java/net/natPlainSocketImplWin32.cc b/libjava/gnu/java/net/natPlainSocketImplWin32.cc index 93393803f2d..fc93e5713c7 100644 --- a/libjava/gnu/java/net/natPlainSocketImplWin32.cc +++ b/libjava/gnu/java/net/natPlainSocketImplWin32.cc @@ -346,14 +346,14 @@ gnu::java::net::PlainSocketImpl::close() // Write a byte to the socket. void -gnu::java::net::PlainSocketImpl::write(jint b) +gnu::java::net::PlainSocketImpl$SocketOutputStream::write(jint b) { jbyte d =(jbyte) b; int r = 0; while (r != 1) { - r = ::send (fnum, (char*) &d, 1, 0); + r = ::send (this$0->fnum, (char*) &d, 1, 0); if (r == -1) { DWORD dwErr = WSAGetLastError(); @@ -376,7 +376,8 @@ gnu::java::net::PlainSocketImpl::write(jint b) // Write some bytes to the socket. void -gnu::java::net::PlainSocketImpl::write(jbyteArray b, jint offset, jint len) +gnu::java::net::PlainSocketImpl$SocketOutputStream::write(jbyteArray b, + jint offset, jint len) { if (! b) throw new ::java::lang::NullPointerException; @@ -387,7 +388,7 @@ gnu::java::net::PlainSocketImpl::write(jbyteArray b, jint offset, jint len) int written = 0; while (len > 0) { - int r = ::send (fnum, (char*) bytes, len, 0); + int r = ::send (this$0->fnum, (char*) bytes, len, 0); if (r == -1) { @@ -479,16 +480,17 @@ error: // Read a single byte from the socket. jint -gnu::java::net::PlainSocketImpl::read(void) +gnu::java::net::PlainSocketImpl$SocketInputStream::read(void) { jbyte b; - doRead(fnum, &b, 1, timeout); + doRead(this$0->fnum, &b, 1, this$0->timeout); return b & 0xFF; } // Read count bytes into the buffer, starting at offset. jint -gnu::java::net::PlainSocketImpl::read(jbyteArray buffer, jint offset, jint count) +gnu::java::net::PlainSocketImpl$SocketInputStream::read(jbyteArray buffer, + jint offset, jint count) { if (! buffer) throw new ::java::lang::NullPointerException; @@ -501,7 +503,7 @@ gnu::java::net::PlainSocketImpl::read(jbyteArray buffer, jint offset, jint count jbyte *bytes = elements (buffer) + offset; // Read the socket. - return doRead(fnum, bytes, count, timeout); + return doRead(this$0->fnum, bytes, count, this$0->timeout); } // How many bytes are available? |