Re: [cp-patches] Reindented native/jni code

[Michael Koch]

On Sat, Apr 09, 2005 at 02:19:03AM +0200, Mark Wielaard wrote:
> Hi Guilhem.
> 
> On Fri, 2005-04-08 at 14:34 +0200, Guilhem Lavaux wrote:
> > GNU Indent (GNU style) seems to show a lot of differences after having
> > been run on the native/jni code. I have run it on classpath, java-*
> > directories and here is a patch.
> 
> Thanks. But next time please give people a little while before actually
> checking a large automatic change like this in. Someone might be working
> on one of the files and then you would create an unnecessary merge
> conflict.
> 
> Now that this is in I get a build failure since the JNI check script
> cannot find all native methods. JNI methods have to start at the
> position zero of a line. And strangely enough it now also finds a couple
> of native methods that don't have a corresponding java method
> definition.
> 
> The following patch seems to fix the build failure. And all code seem to
> still work correctly even though I just removed a large collection of
> code. The code was probably dead. And without it things seem to work
> fine. But could someone (Michael?) take a quick look? I won't be online
> till Sunday night so could someone check it in if it isn't too bogus. A
> broken build is really not acceptable.
> 
> 2005-04-08  Mark Wielaard  <address@hidden>
> 
>         * native/jni/java-lang/java_lang_Double.c: Reindent.
>         * native/jni/java-lang/java_lang_Math.c: Likewise.
>         * native/jni/java-lang/java_lang_Object.c: Likewise.
>         * native/jni/java-lang/java_lang_VMDouble.c: Likewise.
>         * native/jni/java-lang/java_lang_VMFloat.c: Likewise.
>         * native/jni/java-lang/java_lang_VMSystem.c: Likewise.
>         * native/jni/java-lang/java_lang_reflect_Array.c: Likewise.
>         * native/jni/java-nio/java_nio.c
>         (Java_gnu_java_nio_FileChannelImpl_nio_1mmap_1file): Removed.
>         (Java_gnu_java_nio_FileChannelImpl_nio_1unmmap_1file): Likewise.
>         (Java_gnu_java_nio_SocketChannelImpl_SocketCreate): Likewise.
>         (Java_gnu_java_nio_SocketChannelImpl_SocketConnect): Likewise.
>         (Java_gnu_java_nio_SocketChannelImpl_SocketBind): Likewise.
>         (Java_gnu_java_nio_SocketChannelImpl_SocketListen): Likewise.
>         (Java_gnu_java_nio_SocketChannelImpl_SocketAvailable): Likewise.
>         (Java_gnu_java_nio_SocketChannelImpl_SocketClose): Likewise.
>         (Java_gnu_java_nio_SocketChannelImpl_SocketRead): Likewise.
>         (Java_gnu_java_nio_SocketChannelImpl_SocketWrite): Likewise.
>         * native/jni/java-nio/java_nio_VMDirectByteBuffer.c: Reindent.

I tested and commited this now. I found no bug with it and it makes HEAD
buildable again.


Michael
-- 
Escape the Java Trap with GNU Classpath!
http://www.gnu.org/philosophy/java-trap.html

Join the community at http://planet.classpath.org/