From 1d749ee003f6ee1b0a531c64e8929be20d2adf24 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Wed, 29 Oct 2003 10:33:57 +0000 Subject: [PATCH] 2003-10-29 Michael Koch * gnu/java/net/natPlainDatagramSocketImplPosix.cc (setOption): Directly return if no error occured. * gnu/java/net/natPlainSocketImplPosix.cc (setOption): Likewise. From-SVN: r73033 --- libjava/ChangeLog | 7 +++++++ .../gnu/java/net/natPlainDatagramSocketImplPosix.cc | 8 ++++---- libjava/gnu/java/net/natPlainSocketImplPosix.cc | 12 ++++++------ 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index ee48557e0b0..8a846f6a04a 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2003-10-29 Michael Koch + + * gnu/java/net/natPlainDatagramSocketImplPosix.cc + (setOption): Directly return if no error occured. + * gnu/java/net/natPlainSocketImplPosix.cc + (setOption): Likewise. + 2003-10-28 Bryce McKinlay * java/lang/natClass.cc (_Jv_LayoutVTableMethods): Always assign a diff --git a/libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc b/libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc index 65d083c0970..89c50551b03 100644 --- a/libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc +++ b/libjava/gnu/java/net/natPlainDatagramSocketImplPosix.cc @@ -516,12 +516,12 @@ gnu::java::net::PlainDatagramSocketImpl::setOption (jint optID, if (::setsockopt (native_fd, SOL_SOCKET, SO_BROADCAST, (char *) &val, val_len) != 0) goto error; - break; + return; case _Jv_SO_OOBINLINE_ : throw new ::java::net::SocketException ( JvNewStringUTF ("SO_OOBINLINE: not valid for UDP")); - break; + return; case _Jv_SO_SNDBUF_ : case _Jv_SO_RCVBUF_ : @@ -590,12 +590,12 @@ gnu::java::net::PlainDatagramSocketImpl::setOption (jint optID, case _Jv_IP_MULTICAST_IF2_ : throw new ::java::net::SocketException ( JvNewStringUTF ("IP_MULTICAST_IF2: not yet implemented")); - break; + return; case _Jv_IP_MULTICAST_LOOP_ : throw new ::java::net::SocketException ( JvNewStringUTF ("IP_MULTICAST_LOOP: not yet implemented")); - break; + return; case _Jv_IP_TOS_ : if (::setsockopt (native_fd, SOL_SOCKET, IP_TOS, (char *) &val, diff --git a/libjava/gnu/java/net/natPlainSocketImplPosix.cc b/libjava/gnu/java/net/natPlainSocketImplPosix.cc index 8a09f9af595..9a3f7aff9fb 100644 --- a/libjava/gnu/java/net/natPlainSocketImplPosix.cc +++ b/libjava/gnu/java/net/natPlainSocketImplPosix.cc @@ -622,18 +622,18 @@ gnu::java::net::PlainSocketImpl::setOption (jint optID, ::java::lang::Object *va if (::setsockopt (native_fd, SOL_SOCKET, SO_KEEPALIVE, (char *) &val, val_len) != 0) goto error; - break; + return; case _Jv_SO_BROADCAST_ : throw new ::java::net::SocketException (JvNewStringUTF ("SO_BROADCAST not valid for TCP")); - break; + return; case _Jv_SO_OOBINLINE_ : if (::setsockopt (native_fd, SOL_SOCKET, SO_OOBINLINE, (char *) &val, val_len) != 0) goto error; - break; + return; case _Jv_SO_LINGER_ : #ifdef SO_LINGER @@ -676,18 +676,18 @@ gnu::java::net::PlainSocketImpl::setOption (jint optID, ::java::lang::Object *va case _Jv_IP_MULTICAST_IF2_ : throw new ::java::net::SocketException ( JvNewStringUTF ("IP_MULTICAST_IF2: not valid for TCP")); - break; + return; case _Jv_IP_MULTICAST_LOOP_ : throw new ::java::net::SocketException ( JvNewStringUTF ("IP_MULTICAST_LOOP: not valid for TCP")); - break; + return; case _Jv_IP_TOS_ : if (::setsockopt (native_fd, SOL_SOCKET, IP_TOS, (char *) &val, val_len) != 0) goto error; - break; + return; case _Jv_SO_REUSEADDR_ : throw new ::java::net::SocketException ( -- 2.30.2