This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

FYI: Patch: gnu.java.net.PlainDatagramSocketImpl


Hi list,


I commited the attached patch to merge 
gnu.java.net.PlainDatagramSocketImpl more with classpath.


Michael


2004-03-11  Michael Koch  <konqueror@gmx.de>

	* gnu/java/net/PlainDatagramSocketImpl.java:
	Reformated to match classpath's version more.
Index: gnu/java/net/PlainDatagramSocketImpl.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/net/PlainDatagramSocketImpl.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 PlainDatagramSocketImpl.java
--- gnu/java/net/PlainDatagramSocketImpl.java	20 Dec 2003 23:04:44 -0000	1.4
+++ gnu/java/net/PlainDatagramSocketImpl.java	11 Mar 2004 08:46:37 -0000
@@ -135,13 +135,13 @@
    *
    * @exception SocketException If an error occurs
    */
-  protected native void bind(int lport, InetAddress laddr)
+  protected native void bind(int port, InetAddress addr)
 	throws SocketException;
 
-  protected native void connect (InetAddress i, int port)
+  protected native void connect(InetAddress addr, int port)
 	throws SocketException;
   
-  protected native void disconnect ();
+  protected native void disconnect();
   
   /**
    * Creates a new datagram socket
@@ -150,9 +150,9 @@
    */
   protected native void create() throws SocketException;
   
-  protected native int peek(InetAddress i) throws IOException;
+  protected native int peek(InetAddress addr) throws IOException;
   
-  protected native int peekData (DatagramPacket dp) throws IOException;
+  protected native int peekData(DatagramPacket packet) throws IOException;
 
   /**
    * Sets the Time to Live value for the socket
@@ -188,7 +188,7 @@
    *
    * @exception IOException IOException If an error occurs
    */
-  protected native void receive(DatagramPacket p) throws IOException;
+  protected native void receive(DatagramPacket packet) throws IOException;
 
   /**
    * Sets the value of an option on the socket
@@ -198,7 +198,8 @@
    *
    * @exception SocketException If an error occurs
    */
-  public native void setOption(int optID, Object value) throws SocketException;
+  public native void setOption(int option_id, Object val)
+    throws SocketException;
 
   /**
    * Retrieves the value of an option on the socket
@@ -209,7 +210,8 @@
    *
    * @exception SocketException If an error occurs
    */
-  public native Object getOption(int optID) throws SocketException;
+  public native Object getOption(int option_id)
+    throws SocketException;
   
   /**
    * Joins or leaves a broadcasting group on a given network interface.
@@ -222,8 +224,7 @@
    *
    * @exception IOException If an error occurs.
    */
-  private native void mcastGrp(InetAddress inetAddr,
-		  	       NetworkInterface netIf,
+  private native void mcastGrp(InetAddress inetAddr, NetworkInterface netIf,
 		               boolean join)
     throws IOException;
 
@@ -267,9 +268,9 @@
    *
    * @exception IOException If an error occurs
    */
-  protected void join(InetAddress inetaddr) throws IOException
+  protected void join(InetAddress addr) throws IOException
   {
-    mcastGrp(inetaddr, null, true);
+    mcastGrp(addr, null, true);
   }
 
   /**
@@ -279,20 +280,20 @@
    *
    * @exception IOException If an error occurs
    */
-  protected void leave(InetAddress inetaddr) throws IOException
+  protected void leave(InetAddress addr) throws IOException
   {
-    mcastGrp(inetaddr, null, false);
+    mcastGrp(addr, null, false);
   }
 
-  protected void joinGroup (SocketAddress mcastaddr, NetworkInterface netIf)
+  protected void joinGroup(SocketAddress mcastaddr, NetworkInterface netIf)
 	  throws IOException
   {
-    mcastGrp(((InetSocketAddress)mcastaddr).getAddress(), netIf, true);
+    mcastGrp(((InetSocketAddress) mcastaddr).getAddress(), netIf, true);
   }
 
-  protected void leaveGroup (SocketAddress mcastaddr, NetworkInterface netIf)
+  protected void leaveGroup(SocketAddress mcastaddr, NetworkInterface netIf)
 	  throws IOException
   {
-    mcastGrp(((InetSocketAddress)mcastaddr).getAddress(), netIf, false);
+    mcastGrp(((InetSocketAddress) mcastaddr).getAddress(), netIf, false);
   }
 }

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]