PlainSocketImpl.java: Reformatting.

2003-06-21  Michael Koch  <konqueror@gmx.de>

	* java/net/PlainSocketImpl.java:
	Reformatting.
	(static): New implicit method.
	(read): Made package private.
	(write): Likewise.

From-SVN: r68304

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6a4e9f986725877e2e51fa7efa5ea6577925b2ca..c927a6b9afebb7f0c171dc45adc9aa77b84c5717 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,11 @@
+2003-06-21  Michael Koch  <konqueror@gmx.de>
+
+       * java/net/PlainSocketImpl.java:
+       Reformatting.
+       (static): New implicit method.
+       (read): Made package private.
+       (write): Likewise.
+
 2003-06-21  Michael Koch  <konqueror@gmx.de>
 
        * java/util/SimpleTimeZone.java:

diff --git a/libjava/java/net/PlainSocketImpl.java b/libjava/java/net/PlainSocketImpl.java
index ed63b57bc43743845a1d92cba1ca7847dadeba5e..36fe26cb156b9de9ab56bf6447e9842108abce91 100644 (file)
--- a/libjava/java/net/PlainSocketImpl.java
+++ b/libjava/java/net/PlainSocketImpl.java
@@ -41,18 +41,29 @@ package java.net;
 import java.io.InputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import gnu.classpath.Configuration;
 
 /**
- * The standard GCJ socket implementation.
  * Written using on-line Java Platform 1.2 API Specification, as well
  * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
  * Status:  Believed complete and correct.
- *
+ */
+
+/**
  * @author Per Bothner <bothner@cygnus.com>
  * @author Nic Ferrier <nferrier@tapsellferrier.co.uk>
  */
 class PlainSocketImpl extends SocketImpl
 {
+  // Static initializer to load native library.
+  static
+    {
+      if (Configuration.INIT_LOAD_LIBRARY)
+        {
+          System.loadLibrary("javanet");
+        }
+    }
+  
   // These fields are mirrored for use in native code to avoid cpp conflicts
   // when the #defines in system header files are the same as the public fields.
   static final int _Jv_TCP_NODELAY_ = SocketOptions.TCP_NODELAY,
@@ -137,17 +148,17 @@ class PlainSocketImpl extends SocketImpl
 
   // The native read methods.
 
-  private native int read() throws IOException;
+  native int read() throws IOException;
 
-  private native int read(byte[] buffer, int offset, int count)
+  native int read(byte[] buffer, int offset, int count)
     throws IOException;
 
 
   // The native write methods.
 
-  private native void write(int c) throws IOException;
+  native void write(int c) throws IOException;
 
-  private native void write(byte[] buffer, int offset, int count)
+  native void write(byte[] buffer, int offset, int count)
     throws IOException;
 
   protected void finalize() throws Throwable