Skip to content

R
riscv-gcc-1
Commit a3bcdaf9 by Bryce McKinlay Committed by Bryce McKinlay
Options

natPlainDatagramSocketImpl.cc: Change various `JvThrow' calls to `throw'. 

2000-09-05  Bryce McKinlay  <bryce@albatross.co.nz>

	* java/net/natPlainDatagramSocketImpl.cc: Change various `JvThrow'
	calls to `throw'.
	(send): Undo last patch.
	Remove the label only.
	(mcastGrp): Ditto.
	* java/net/natPlainSocketImpl.cc: Change various `JvThrow' calls to
	`throw'.
	* java/net/natInetAdress.cc: Ditto.

From-SVN: r36165
parent 2f31ed7e
Showing with 114 additions and 80 deletions
libjava/ChangeLog
2000-09-05 Bryce McKinlay <bryce@albatross.co.nz>
* java/net/natPlainDatagramSocketImpl.cc: Change various `JvThrow'
calls to `throw'.
(send): Undo last patch.
Remove the label only.
(mcastGrp): Ditto.
* java/net/natPlainSocketImpl.cc: Change various `JvThrow' calls to
`throw'.
* java/net/natInetAdress.cc: Ditto.
2000-09-05 Tom Tromey <tromey@cygnus.com> 2000-09-05 Tom Tromey <tromey@cygnus.com>
* doc/cni.sgml: Updated from master copy. * doc/cni.sgml: Updated from master copy.
......
libjava/java/net/natInetAddress.cc
...@@ -256,7 +256,7 @@ java::net::InetAddress::lookup (jstring host, java::net::InetAddress* iaddr, ...@@ -256,7 +256,7 @@ java::net::InetAddress::lookup (jstring host, java::net::InetAddress* iaddr,
if (ex != NULL) if (ex != NULL)
{ {
if (iaddr == NULL || iaddr->address == NULL) if (iaddr == NULL || iaddr->address == NULL)
JvThrow (ex); throw ex;
hptr = NULL; hptr = NULL;
} }
} }
...@@ -268,7 +268,7 @@ java::net::InetAddress::lookup (jstring host, java::net::InetAddress* iaddr, ...@@ -268,7 +268,7 @@ java::net::InetAddress::lookup (jstring host, java::net::InetAddress* iaddr,
return NULL; return NULL;
} }
else else
JvThrow (new java::net::UnknownHostException(host)); throw new java::net::UnknownHostException(host);
} }
int count; int count;
if (all) if (all)
......
libjava/java/net/natPlainSocketImpl.cc
...@@ -57,43 +57,50 @@ extern java::lang::Class BooleanClass; ...@@ -57,43 +57,50 @@ extern java::lang::Class BooleanClass;
void void
java::net::PlainSocketImpl::create (jboolean) java::net::PlainSocketImpl::create (jboolean)
{ {
JvThrow (new java::io::IOException (JvNewStringLatin1 ("SocketImpl.create: unimplemented"))); throw new java::io::IOException (
JvNewStringLatin1 ("SocketImpl.create: unimplemented"));
} }
void void
java::net::PlainSocketImpl::bind (java::net::InetAddress *, jint) java::net::PlainSocketImpl::bind (java::net::InetAddress *, jint)
{ {
JvThrow (new BindException (JvNewStringLatin1 ("SocketImpl.bind: unimplemented"))); throw new BindException (
JvNewStringLatin1 ("SocketImpl.bind: unimplemented"));
} }
void void
java::net::PlainSocketImpl::connect (java::net::InetAddress *, jint) java::net::PlainSocketImpl::connect (java::net::InetAddress *, jint)
{ {
JvThrow (new ConnectException (JvNewStringLatin1 ("SocketImpl.connect: unimplemented"))); throw new ConnectException (
JvNewStringLatin1 ("SocketImpl.connect: unimplemented"));
} }
void void
java::net::PlainSocketImpl::listen (jint) java::net::PlainSocketImpl::listen (jint)
{ {
JvThrow (new java::io::IOException (JvNewStringLatin1 ("SocketImpl.listen: unimplemented"))); throw new java::io::IOException (
JvNewStringLatin1 ("SocketImpl.listen: unimplemented"));
} }
void void
java::net::PlainSocketImpl::accept (java::net::PlainSocketImpl *) java::net::PlainSocketImpl::accept (java::net::PlainSocketImpl *)
{ {
JvThrow (new java::io::IOException (JvNewStringLatin1 ("SocketImpl.accept: unimplemented"))); throw new java::io::IOException (
JvNewStringLatin1 ("SocketImpl.accept: unimplemented"));
} }
void void
java::net::PlainSocketImpl::setOption (jint, java::lang::Object *) java::net::PlainSocketImpl::setOption (jint, java::lang::Object *)
{ {
JvThrow (new SocketException (JvNewStringLatin1 ("SocketImpl.setOption: unimplemented"))); throw new SocketException (
JvNewStringLatin1 ("SocketImpl.setOption: unimplemented"));
} }
java::lang::Object * java::lang::Object *
java::net::PlainSocketImpl::getOption (jint) java::net::PlainSocketImpl::getOption (jint)
{ {
JvThrow (new SocketException (JvNewStringLatin1 ("SocketImpl.getOption: unimplemented"))); throw new SocketException (
JvNewStringLatin1 ("SocketImpl.getOption: unimplemented"));
} }
#else /* DISABLE_JAVA_NET */ #else /* DISABLE_JAVA_NET */
...@@ -117,7 +124,7 @@ java::net::PlainSocketImpl::create (jboolean stream) ...@@ -117,7 +124,7 @@ java::net::PlainSocketImpl::create (jboolean stream)
if (sock < 0) if (sock < 0)
{ {
char* strerr = strerror (errno); char* strerr = strerror (errno);
JvThrow (new java::io::IOException (JvNewStringUTF (strerr))); throw new java::io::IOException (JvNewStringUTF (strerr));
} }
fnum = sock; fnum = sock;
fd = new java::io::FileDescriptor (sock); fd = new java::io::FileDescriptor (sock);
...@@ -172,7 +179,7 @@ java::net::PlainSocketImpl::bind (java::net::InetAddress *host, jint lport) ...@@ -172,7 +179,7 @@ java::net::PlainSocketImpl::bind (java::net::InetAddress *host, jint lport)
} }
error: error:
char* strerr = strerror (errno); char* strerr = strerror (errno);
JvThrow (new java::net::BindException (JvNewStringUTF (strerr))); throw new java::net::BindException (JvNewStringUTF (strerr));
} }
void void
...@@ -218,7 +225,7 @@ java::net::PlainSocketImpl::connect (java::net::InetAddress *host, jint rport) ...@@ -218,7 +225,7 @@ java::net::PlainSocketImpl::connect (java::net::InetAddress *host, jint rport)
return; return;
error: error:
char* strerr = strerror (errno); char* strerr = strerror (errno);
JvThrow (new java::net::ConnectException (JvNewStringUTF (strerr))); throw new java::net::ConnectException (JvNewStringUTF (strerr));
} }
void void
...@@ -227,7 +234,7 @@ java::net::PlainSocketImpl::listen (jint backlog) ...@@ -227,7 +234,7 @@ java::net::PlainSocketImpl::listen (jint backlog)
if (::listen (fnum, backlog) != 0) if (::listen (fnum, backlog) != 0)
{ {
char* strerr = strerror (errno); char* strerr = strerror (errno);
JvThrow (new java::io::IOException (JvNewStringUTF (strerr))); throw new java::io::IOException (JvNewStringUTF (strerr));
} }
} }
...@@ -251,8 +258,8 @@ java::net::PlainSocketImpl::accept (java::net::PlainSocketImpl *s) ...@@ -251,8 +258,8 @@ java::net::PlainSocketImpl::accept (java::net::PlainSocketImpl *s)
if ((retval = _Jv_select (fnum + 1, &rset, NULL, NULL, &tv)) < 0) if ((retval = _Jv_select (fnum + 1, &rset, NULL, NULL, &tv)) < 0)
goto error; goto error;
else if (retval == 0) else if (retval == 0)
JvThrow (new java::io::InterruptedIOException ( throw new java::io::InterruptedIOException (
JvNewStringUTF("Accept timed out"))); JvNewStringUTF("Accept timed out"));
} }
new_socket = ::accept (fnum, (sockaddr*) &u, &addrlen); new_socket = ::accept (fnum, (sockaddr*) &u, &addrlen);
...@@ -285,7 +292,7 @@ java::net::PlainSocketImpl::accept (java::net::PlainSocketImpl *s) ...@@ -285,7 +292,7 @@ java::net::PlainSocketImpl::accept (java::net::PlainSocketImpl *s)
return; return;
error: error:
char* strerr = strerror (errno); char* strerr = strerror (errno);
JvThrow (new java::io::IOException (JvNewStringUTF (strerr))); throw new java::io::IOException (JvNewStringUTF (strerr));
} }
void void
...@@ -323,8 +330,8 @@ java::net::PlainSocketImpl::setOption (jint optID, java::lang::Object *value) ...@@ -323,8 +330,8 @@ java::net::PlainSocketImpl::setOption (jint optID, java::lang::Object *value)
val_len) != 0) val_len) != 0)
goto error; goto error;
#else #else
JvThrow (new java::lang::InternalError ( throw new java::lang::InternalError (
JvNewStringUTF ("TCP_NODELAY not supported"))); JvNewStringUTF ("TCP_NODELAY not supported"));
#endif /* TCP_NODELAY */ #endif /* TCP_NODELAY */
return; return;
case _Jv_SO_LINGER_ : case _Jv_SO_LINGER_ :
...@@ -336,8 +343,8 @@ java::net::PlainSocketImpl::setOption (jint optID, java::lang::Object *value) ...@@ -336,8 +343,8 @@ java::net::PlainSocketImpl::setOption (jint optID, java::lang::Object *value)
sizeof(l_val)) != 0) sizeof(l_val)) != 0)
goto error; goto error;
#else #else
JvThrow (new java::lang::InternalError ( throw new java::lang::InternalError (
JvNewStringUTF ("SO_LINGER not supported"))); JvNewStringUTF ("SO_LINGER not supported"));
#endif /* SO_LINGER */ #endif /* SO_LINGER */
return; return;
case _Jv_SO_SNDBUF_ : case _Jv_SO_SNDBUF_ :
...@@ -348,21 +355,21 @@ java::net::PlainSocketImpl::setOption (jint optID, java::lang::Object *value) ...@@ -348,21 +355,21 @@ java::net::PlainSocketImpl::setOption (jint optID, java::lang::Object *value)
if (::setsockopt (fnum, SOL_SOCKET, opt, (char *) &val, val_len) != 0) if (::setsockopt (fnum, SOL_SOCKET, opt, (char *) &val, val_len) != 0)
goto error; goto error;
#else #else
JvThrow (new java::lang::InternalError ( throw new java::lang::InternalError (
JvNewStringUTF ("SO_RCVBUF/SO_SNDBUF not supported"))); JvNewStringUTF ("SO_RCVBUF/SO_SNDBUF not supported"));
#endif #endif
return; return;
case _Jv_SO_BINDADDR_ : case _Jv_SO_BINDADDR_ :
JvThrow (new java::net::SocketException ( throw new java::net::SocketException (
JvNewStringUTF ("SO_BINDADDR: read only option"))); JvNewStringUTF ("SO_BINDADDR: read only option"));
return; return;
case _Jv_IP_MULTICAST_IF_ : case _Jv_IP_MULTICAST_IF_ :
JvThrow (new java::net::SocketException ( throw new java::net::SocketException (
JvNewStringUTF ("IP_MULTICAST_IF: not valid for TCP"))); JvNewStringUTF ("IP_MULTICAST_IF: not valid for TCP"));
return; return;
case _Jv_SO_REUSEADDR_ : case _Jv_SO_REUSEADDR_ :
JvThrow (new java::net::SocketException ( throw new java::net::SocketException (
JvNewStringUTF ("SO_REUSEADDR: not valid for TCP"))); JvNewStringUTF ("SO_REUSEADDR: not valid for TCP"));
return; return;
case _Jv_SO_TIMEOUT_ : case _Jv_SO_TIMEOUT_ :
timeout = val; timeout = val;
...@@ -373,7 +380,7 @@ java::net::PlainSocketImpl::setOption (jint optID, java::lang::Object *value) ...@@ -373,7 +380,7 @@ java::net::PlainSocketImpl::setOption (jint optID, java::lang::Object *value)
error: error:
char* strerr = strerror (errno); char* strerr = strerror (errno);
JvThrow (new java::net::SocketException (JvNewStringUTF (strerr))); throw new java::net::SocketException (JvNewStringUTF (strerr));
} }
java::lang::Object * java::lang::Object *
...@@ -396,8 +403,8 @@ java::net::PlainSocketImpl::getOption (jint optID) ...@@ -396,8 +403,8 @@ java::net::PlainSocketImpl::getOption (jint optID)
else else
return new java::lang::Boolean (val != 0); return new java::lang::Boolean (val != 0);
#else #else
JvThrow (new java::lang::InternalError ( throw new java::lang::InternalError (
JvNewStringUTF ("TCP_NODELAY not supported"))); JvNewStringUTF ("TCP_NODELAY not supported"));
#endif #endif
break; break;
...@@ -411,8 +418,8 @@ java::net::PlainSocketImpl::getOption (jint optID) ...@@ -411,8 +418,8 @@ java::net::PlainSocketImpl::getOption (jint optID)
else else
return new java::lang::Boolean ((__java_boolean)false); return new java::lang::Boolean ((__java_boolean)false);
#else #else
JvThrow (new java::lang::InternalError ( throw new java::lang::InternalError (
JvNewStringUTF ("SO_LINGER not supported"))); JvNewStringUTF ("SO_LINGER not supported"));
#endif #endif
break; break;
case _Jv_SO_RCVBUF_ : case _Jv_SO_RCVBUF_ :
...@@ -425,8 +432,8 @@ java::net::PlainSocketImpl::getOption (jint optID) ...@@ -425,8 +432,8 @@ java::net::PlainSocketImpl::getOption (jint optID)
else else
return new java::lang::Integer (val); return new java::lang::Integer (val);
#else #else
JvThrow (new java::lang::InternalError ( throw new java::lang::InternalError (
JvNewStringUTF ("SO_RCVBUF/SO_SNDBUF not supported"))); JvNewStringUTF ("SO_RCVBUF/SO_SNDBUF not supported"));
#endif #endif
break; break;
case _Jv_SO_BINDADDR_: case _Jv_SO_BINDADDR_:
...@@ -456,12 +463,12 @@ java::net::PlainSocketImpl::getOption (jint optID) ...@@ -456,12 +463,12 @@ java::net::PlainSocketImpl::getOption (jint optID)
return localAddress; return localAddress;
break; break;
case _Jv_IP_MULTICAST_IF_ : case _Jv_IP_MULTICAST_IF_ :
JvThrow (new java::net::SocketException ( throw new java::net::SocketException (
JvNewStringUTF ("IP_MULTICAST_IF: not valid for TCP"))); JvNewStringUTF ("IP_MULTICAST_IF: not valid for TCP"));
break; break;
case _Jv_SO_REUSEADDR_ : case _Jv_SO_REUSEADDR_ :
JvThrow (new java::net::SocketException ( throw new java::net::SocketException (
JvNewStringUTF ("SO_REUSEADDR: not valid for TCP"))); JvNewStringUTF ("SO_REUSEADDR: not valid for TCP"));
break; break;
case _Jv_SO_TIMEOUT_ : case _Jv_SO_TIMEOUT_ :
return new java::lang::Integer (timeout); return new java::lang::Integer (timeout);
...@@ -472,7 +479,7 @@ java::net::PlainSocketImpl::getOption (jint optID) ...@@ -472,7 +479,7 @@ java::net::PlainSocketImpl::getOption (jint optID)
error: error:
char* strerr = strerror (errno); char* strerr = strerror (errno);
JvThrow (new java::net::SocketException (JvNewStringUTF (strerr))); throw new java::net::SocketException (JvNewStringUTF (strerr));
} }
#endif /* DISABLE_JAVA_NET */ #endif /* DISABLE_JAVA_NET */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment