2003-10-29 Michael Koch <konqueror@gmx.de>

	* gnu/java/net/natPlainDatagramSocketImplPosix.cc
	(setOption): Directly return if no error occured.
	* gnu/java/net/natPlainSocketImplPosix.cc
	(setOption): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@73033 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index ee48557..8a846f6 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2003-10-29  Michael Koch  <konqueror@gmx.de>
+
+       * gnu/java/net/natPlainDatagramSocketImplPosix.cc
+       (setOption): Directly return if no error occured.
+       * gnu/java/net/natPlainSocketImplPosix.cc
+       (setOption): Likewise.
+
 2003-10-28  Bryce McKinlay  <bryce@mckinlay.net.nz>
 
        * 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 65d083c..89c5055 100644 (file)
--- 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 8a09f9a..9a3f7af 100644 (file)
--- 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 (