FYI: Patch: gnu.java.nio

[Michael Koch <konqueror at gmx dot de>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi list,


I commited the attached patch to trunk to clean up gnu.java.nio a bit.


Michael
- -- 
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQE+8YSiWSOgCCdjSDsRAv4oAJ9ei9/nUs+Ai7FVEFL8AU7AnOen0QCfZdcI
21ZiJ1Df8LIGxcE5E5UpjoE=
=QIy6
-----END PGP SIGNATURE-----

Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.1959
diff -u -b -B -r1.1959 ChangeLog
--- ChangeLog	18 Jun 2003 08:56:53 -0000	1.1959
+++ ChangeLog	19 Jun 2003 09:28:23 -0000
@@ -1,3 +1,13 @@
+2003-06-19  Michael Koch  <konqueror@gmx.de>
+
+	* gnu/java/nio/FileChannelImpl.java
+	(map_address): Made public.
+	(FileChannelImpl): Merged with classpath.
+	* gnu/java/nio/natFileChannelImpl.cc
+	(nio_mmap_file): Commented out unused arguments.
+	(nio_unmmap_file): Likewise.
+	(niu_msync): Likewise.
+
 2003-06-18  Michael Koch  <konqueror@gmx.de>
 
 	* gnu/java/nio/SelectorImpl.java
Index: gnu/java/nio/FileChannelImpl.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/nio/FileChannelImpl.java,v
retrieving revision 1.6
diff -u -b -B -r1.6 FileChannelImpl.java
--- gnu/java/nio/FileChannelImpl.java	14 Jun 2003 11:53:02 -0000	1.6
+++ gnu/java/nio/FileChannelImpl.java	19 Jun 2003 09:28:23 -0000
@@ -65,7 +65,7 @@
 
 public class FileChannelImpl extends FileChannel
 {
-  RawData map_address;
+  public RawData map_address;
   
   int length;
   FileDescriptor fd;
@@ -85,7 +85,7 @@
 
   public FileChannelImpl ()
   {
-    this (new FileDescriptor (-1), true, null);
+    this (new FileDescriptor (), true, null);
   }
 
   private native long implPosition ();
Index: gnu/java/nio/natFileChannelImpl.cc
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/nio/natFileChannelImpl.cc,v
retrieving revision 1.6
diff -u -b -B -r1.6 natFileChannelImpl.cc
--- gnu/java/nio/natFileChannelImpl.cc	18 Jun 2003 08:56:55 -0000	1.6
+++ gnu/java/nio/natFileChannelImpl.cc	19 Jun 2003 09:28:23 -0000
@@ -73,20 +73,22 @@
 }
 
 gnu::gcj::RawData*
-gnu::java::nio::FileChannelImpl::nio_mmap_file (jlong pos, jlong size,
+gnu::java::nio::FileChannelImpl::nio_mmap_file (jlong /*pos*/, jlong /*size*/,
                                                 jint /*mode*/)
 {
   throw new ::java::io::IOException (JvNewStringUTF ("mmap not implemented"));
 }
 
 void
-gnu::java::nio::FileChannelImpl::nio_unmmap_file (gnu::gcj::RawData* map_address, jint size)
+gnu::java::nio::FileChannelImpl::nio_unmmap_file (gnu::gcj::RawData* /*address*/,
+						  jint /*size*/)
 {
   throw new ::java::io::IOException (JvNewStringUTF ("munmap not implemented"));
 }
 
 void
-gnu::java::nio::FileChannelImpl::nio_msync (gnu::gcj::RawData* map_address, jint length)
+gnu::java::nio::FileChannelImpl::nio_msync (gnu::gcj::RawData* /*map_address*/,
+					    jint /*length*/)
 {
   throw new ::java::io::IOException (JvNewStringUTF ("msync not implemented"));
 }