classpath-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Mark Wielaard
Subject: Re: [cp-patches] Reindented native/jni code
Date: Sat, 09 Apr 2005 02:19:03 +0200

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.

Thanks,

Mark

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

Join the community at http://planet.classpath.org/
Index: native/jni/java-lang/java_lang_Double.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-lang/java_lang_Double.c,v
retrieving revision 1.17
diff -u -r1.17 java_lang_Double.c
--- native/jni/java-lang/java_lang_Double.c     8 Apr 2005 13:01:42 -0000       
1.17
+++ native/jni/java-lang/java_lang_Double.c     9 Apr 2005 00:02:51 -0000
@@ -58,7 +58,7 @@
  * Signature: ()V
  */
 JNIEXPORT void JNICALL
-  Java_java_lang_Double_initIDs (JNIEnv * env, jclass cls)
+Java_java_lang_Double_initIDs (JNIEnv * env, jclass cls)
 {
   jfieldID negInfID;
   jfieldID posInfID;
@@ -103,7 +103,7 @@
  * Signature: (DZ)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL
-  Java_java_lang_Double_toString
+Java_java_lang_Double_toString
   (JNIEnv * env, jclass cls, jdouble value, jboolean isFloat)
 {
   char buffer[50], result[50];
@@ -211,7 +211,7 @@
  * Signature: (Ljava/lang/String;)D
  */
 JNIEXPORT jdouble JNICALL
-  Java_java_lang_Double_parseDouble
+Java_java_lang_Double_parseDouble
   (JNIEnv * env, jclass cls __attribute__ ((__unused__)), jstring str)
 {
   jboolean isCopy;
Index: native/jni/java-lang/java_lang_Math.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-lang/java_lang_Math.c,v
retrieving revision 1.7
diff -u -r1.7 java_lang_Math.c
--- native/jni/java-lang/java_lang_Math.c       8 Apr 2005 13:01:42 -0000       
1.7
+++ native/jni/java-lang/java_lang_Math.c       9 Apr 2005 00:02:51 -0000
@@ -41,7 +41,7 @@
 #include <fdlibm.h>
 
 JNIEXPORT jdouble JNICALL
-  Java_java_lang_Math_sin
+Java_java_lang_Math_sin
   (JNIEnv * env __attribute__ ((__unused__)),
    jclass cls __attribute__ ((__unused__)), jdouble x)
 {
@@ -49,7 +49,7 @@
 }
 
 JNIEXPORT jdouble JNICALL
-  Java_java_lang_Math_cos
+Java_java_lang_Math_cos
   (JNIEnv * env __attribute__ ((__unused__)),
    jclass cls __attribute__ ((__unused__)), jdouble x)
 {
@@ -57,7 +57,7 @@
 }
 
 JNIEXPORT jdouble JNICALL
-  Java_java_lang_Math_tan
+Java_java_lang_Math_tan
   (JNIEnv * env __attribute__ ((__unused__)),
    jclass cls __attribute__ ((__unused__)), jdouble x)
 {
@@ -65,7 +65,7 @@
 }
 
 JNIEXPORT jdouble JNICALL
-  Java_java_lang_Math_asin
+Java_java_lang_Math_asin
   (JNIEnv * env __attribute__ ((__unused__)),
    jclass cls __attribute__ ((__unused__)), jdouble x)
 {
@@ -73,7 +73,7 @@
 }
 
 JNIEXPORT jdouble JNICALL
-  Java_java_lang_Math_acos
+Java_java_lang_Math_acos
   (JNIEnv * env __attribute__ ((__unused__)),
    jclass cls __attribute__ ((__unused__)), jdouble x)
 {
@@ -81,7 +81,7 @@
 }
 
 JNIEXPORT jdouble JNICALL
-  Java_java_lang_Math_atan
+Java_java_lang_Math_atan
   (JNIEnv * env __attribute__ ((__unused__)),
    jclass cls __attribute__ ((__unused__)), jdouble x)
 {
@@ -89,7 +89,7 @@
 }
 
 JNIEXPORT jdouble JNICALL
-  Java_java_lang_Math_atan2
+Java_java_lang_Math_atan2
   (JNIEnv * env __attribute__ ((__unused__)),
    jclass cls __attribute__ ((__unused__)), jdouble y, jdouble x)
 {
@@ -97,7 +97,7 @@
 }
 
 JNIEXPORT jdouble JNICALL
-  Java_java_lang_Math_exp
+Java_java_lang_Math_exp
   (JNIEnv * env __attribute__ ((__unused__)),
    jclass cls __attribute__ ((__unused__)), jdouble x)
 {
@@ -105,7 +105,7 @@
 }
 
 JNIEXPORT jdouble JNICALL
-  Java_java_lang_Math_log
+Java_java_lang_Math_log
   (JNIEnv * env __attribute__ ((__unused__)),
    jclass cls __attribute__ ((__unused__)), jdouble x)
 {
@@ -113,7 +113,7 @@
 }
 
 JNIEXPORT jdouble JNICALL
-  Java_java_lang_Math_sqrt
+Java_java_lang_Math_sqrt
   (JNIEnv * env __attribute__ ((__unused__)),
    jclass cls __attribute__ ((__unused__)), jdouble x)
 {
@@ -121,7 +121,7 @@
 }
 
 JNIEXPORT jdouble JNICALL
-  Java_java_lang_Math_pow
+Java_java_lang_Math_pow
   (JNIEnv * env __attribute__ ((__unused__)),
    jclass cls __attribute__ ((__unused__)), jdouble x, jdouble y)
 {
@@ -129,7 +129,7 @@
 }
 
 JNIEXPORT jdouble JNICALL
-  Java_java_lang_Math_IEEEremainder
+Java_java_lang_Math_IEEEremainder
   (JNIEnv * env __attribute__ ((__unused__)),
    jclass cls __attribute__ ((__unused__)), jdouble x, jdouble y)
 {
@@ -137,7 +137,7 @@
 }
 
 JNIEXPORT jdouble JNICALL
-  Java_java_lang_Math_ceil
+Java_java_lang_Math_ceil
   (JNIEnv * env __attribute__ ((__unused__)),
    jclass cls __attribute__ ((__unused__)), jdouble x)
 {
@@ -145,7 +145,7 @@
 }
 
 JNIEXPORT jdouble JNICALL
-  Java_java_lang_Math_floor
+Java_java_lang_Math_floor
   (JNIEnv * env __attribute__ ((__unused__)),
    jclass cls __attribute__ ((__unused__)), jdouble x)
 {
@@ -153,7 +153,7 @@
 }
 
 JNIEXPORT jdouble JNICALL
-  Java_java_lang_Math_rint
+Java_java_lang_Math_rint
   (JNIEnv * env __attribute__ ((__unused__)),
    jclass cls __attribute__ ((__unused__)), jdouble x)
 {
Index: native/jni/java-lang/java_lang_Object.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-lang/java_lang_Object.c,v
retrieving revision 1.6
diff -u -r1.6 java_lang_Object.c
--- native/jni/java-lang/java_lang_Object.c     8 Apr 2005 13:01:42 -0000       
1.6
+++ native/jni/java-lang/java_lang_Object.c     9 Apr 2005 00:02:51 -0000
@@ -44,7 +44,7 @@
  * Signature: ()Ljava/lang/Class;
  */
 JNIEXPORT jclass JNICALL
-  Java_java_lang_Object_getClass (JNIEnv * env, jobject thisObj)
+Java_java_lang_Object_getClass (JNIEnv * env, jobject thisObj)
 {
   return (*env)->GetObjectClass (env, thisObj);
 }
Index: native/jni/java-lang/java_lang_VMDouble.c
===================================================================
RCS file: 
/cvsroot/classpath/classpath/native/jni/java-lang/java_lang_VMDouble.c,v
retrieving revision 1.7
diff -u -r1.7 java_lang_VMDouble.c
--- native/jni/java-lang/java_lang_VMDouble.c   8 Apr 2005 13:01:42 -0000       
1.7
+++ native/jni/java-lang/java_lang_VMDouble.c   9 Apr 2005 00:02:51 -0000
@@ -47,7 +47,7 @@
  * Signature: (D)J
  */
 JNIEXPORT jlong JNICALL
-  Java_java_lang_VMDouble_doubleToLongBits
+Java_java_lang_VMDouble_doubleToLongBits
   (JNIEnv * env __attribute__ ((__unused__)),
    jclass cls __attribute__ ((__unused__)), jdouble doubleValue)
 {
@@ -70,7 +70,7 @@
  * Signature: (D)J
  */
 JNIEXPORT jlong JNICALL
-  Java_java_lang_VMDouble_doubleToRawLongBits
+Java_java_lang_VMDouble_doubleToRawLongBits
   (JNIEnv * env __attribute__ ((__unused__)),
    jclass cls __attribute__ ((__unused__)), jdouble doubleValue)
 {
@@ -85,7 +85,7 @@
  * Signature: (J)D
  */
 JNIEXPORT jdouble JNICALL
-  Java_java_lang_VMDouble_longBitsToDouble
+Java_java_lang_VMDouble_longBitsToDouble
   (JNIEnv * env __attribute__ ((__unused__)),
    jclass cls __attribute__ ((__unused__)), jlong longValue)
 {
Index: native/jni/java-lang/java_lang_VMFloat.c
===================================================================
RCS file: 
/cvsroot/classpath/classpath/native/jni/java-lang/java_lang_VMFloat.c,v
retrieving revision 1.6
diff -u -r1.6 java_lang_VMFloat.c
--- native/jni/java-lang/java_lang_VMFloat.c    8 Apr 2005 13:01:42 -0000       
1.6
+++ native/jni/java-lang/java_lang_VMFloat.c    9 Apr 2005 00:02:51 -0000
@@ -46,7 +46,7 @@
  * Signature: (F)I
  */
 JNIEXPORT jint JNICALL
-  Java_java_lang_VMFloat_floatToIntBits
+Java_java_lang_VMFloat_floatToIntBits
   (JNIEnv * env __attribute__ ((__unused__)),
    jclass cls __attribute__ ((__unused__)), jfloat value)
 {
@@ -68,7 +68,7 @@
  * Signature: (F)I
  */
 JNIEXPORT jint JNICALL
-  Java_java_lang_VMFloat_floatToRawIntBits
+Java_java_lang_VMFloat_floatToRawIntBits
   (JNIEnv * env __attribute__ ((__unused__)),
    jclass cls __attribute__ ((__unused__)), jfloat value)
 {
@@ -83,7 +83,7 @@
  * Signature: (I)F
  */
 JNIEXPORT jfloat JNICALL
-  Java_java_lang_VMFloat_intBitsToFloat
+Java_java_lang_VMFloat_intBitsToFloat
   (JNIEnv * env __attribute__ ((__unused__)),
    jclass cls __attribute__ ((__unused__)), jint bits)
 {
Index: native/jni/java-lang/java_lang_VMSystem.c
===================================================================
RCS file: 
/cvsroot/classpath/classpath/native/jni/java-lang/java_lang_VMSystem.c,v
retrieving revision 1.11
diff -u -r1.11 java_lang_VMSystem.c
--- native/jni/java-lang/java_lang_VMSystem.c   8 Apr 2005 13:01:42 -0000       
1.11
+++ native/jni/java-lang/java_lang_VMSystem.c   9 Apr 2005 00:02:51 -0000
@@ -117,7 +117,7 @@
  * Signature: ()J
  */
 JNIEXPORT jlong JNICALL
-  Java_java_lang_VMSystem_currentTimeMillis
+Java_java_lang_VMSystem_currentTimeMillis
   (JNIEnv * env __attribute__ ((__unused__)),
    jclass thisClass __attribute__ ((__unused__)))
 {
Index: native/jni/java-lang/java_lang_reflect_Array.c
===================================================================
RCS file: 
/cvsroot/classpath/classpath/native/jni/java-lang/java_lang_reflect_Array.c,v
retrieving revision 1.8
diff -u -r1.8 java_lang_reflect_Array.c
--- native/jni/java-lang/java_lang_reflect_Array.c      8 Apr 2005 13:01:42 
-0000       1.8
+++ native/jni/java-lang/java_lang_reflect_Array.c      9 Apr 2005 00:02:51 
-0000
@@ -52,7 +52,7 @@
  * Signature: (Ljava/lang/Class;I)Ljava/lang/Object;
  */
 JNIEXPORT jobject JNICALL
-  Java_java_lang_reflect_Array_createObjectArray
+Java_java_lang_reflect_Array_createObjectArray
   (JNIEnv * env,
    jclass thisClass __attribute__ ((__unused__)),
    jclass arrayType, jint arrayLength)
Index: native/jni/java-nio/java_nio.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-nio/java_nio.c,v
retrieving revision 1.7
diff -u -r1.7 java_nio.c
--- native/jni/java-nio/java_nio.c      8 Apr 2005 13:01:42 -0000       1.7
+++ native/jni/java-nio/java_nio.c      9 Apr 2005 00:02:51 -0000
@@ -253,30 +253,6 @@
 }
 
 
-jlong
-Java_gnu_java_nio_FileChannelImpl_nio_1mmap_1file (JNIEnv * env,
-                                                  jclass c,
-                                                  jint fd,
-                                                  jlong pos,
-                                                  jint size, jint jflags)
-{
-  //  fprintf(stderr, "fd=%d, pos=%lld, size=%d, flags=%d\n", fd, pos, size, 
jflags);
-
-  return nio_mmap_file (fd, pos, size, jflags);
-}
-
-void
-Java_gnu_java_nio_FileChannelImpl_nio_1unmmap_1file (JNIEnv * env,
-                                                    jclass c,
-                                                    jint fd,
-                                                    jlong pos, jint size)
-{
-  //  fprintf(stderr, "size=%d, fd=%d, pos=%p\n", fd, size, (void*)pos);
-
-  nio_unmmap_file (fd, pos, size);
-}
-
-
 /***************************************
  *
  * Socket Channel implementation
@@ -350,222 +326,3 @@
   return (0);
 #endif /* not WITHOUT_NETWORK */
 }
-
-int
-Java_gnu_java_nio_SocketChannelImpl_SocketCreate (JNIEnv * env, jclass c)
-{
-#ifndef WITHOUT_NETWORK
-  int fd;
-  int result;
-
-  TARGET_NATIVE_NETWORK_SOCKET_OPEN_STREAM (fd, result);
-  if (result != TARGET_NATIVE_OK)
-    {
-      return (0);
-    }
-
-  TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_REUSE_ADDRESS (fd, 1, result);
-  if (result != TARGET_NATIVE_OK)
-    {
-      TARGET_NATIVE_NETWORK_SOCKET_CLOSE (fd, result);
-      return (0);
-    }
-  TARGET_NATIVE_NETWORK_SOCKET_SET_OPTION_TCP_NODELAY (fd, 1, result);
-  if (result != TARGET_NATIVE_OK)
-    {
-      TARGET_NATIVE_NETWORK_SOCKET_CLOSE (fd, result);
-      return (0);
-    }
-
-  return (fd);
-#else /* not WITHOUT_NETWORK */
-  return (-1);
-#endif /* not WITHOUT_NETWORK */
-}
-
-int
-Java_gnu_java_nio_SocketChannelImpl_SocketConnect (JNIEnv * env, jclass c,
-                                                  int fd,
-                                                  jobject InetAddress,
-                                                  int port)
-{
-#ifndef WITHOUT_NETWORK
-  int inet_addr;
-  int result;
-  int local_address;
-  int local_port;
-
-  inet_addr = socket_channel_get_net_addr (env, InetAddress);
-
-  /* connect */
-  do
-    {
-      TARGET_NATIVE_NETWORK_SOCKET_CONNECT (fd, inet_addr, inet_addr, result);
-    }
-  while ((result != TARGET_NATIVE_OK) &&
-        (TARGET_NATIVE_LAST_ERROR () ==
-         TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL));
-  if (result != TARGET_NATIVE_OK)
-    {
-      return (-1);
-    }
-
-  /* get local address info */
-  TARGET_NATIVE_NETWORK_SOCKET_GET_LOCAL_INFO (fd, local_address, local_port,
-                                              result);
-  if (result != TARGET_NATIVE_OK)
-    {
-//??? NYI
-      perror ("getsockname: ");
-      return (-1);
-    }
-
-  return (local_port);
-#else /* not WITHOUT_NETWORK */
-  return (-1);
-#endif /* not WITHOUT_NETWORK */
-}
-
-int
-Java_gnu_java_nio_SocketChannelImpl_SocketBind (JNIEnv * env, jclass c,
-                                               int fd, jobject InetAddress,
-                                               int port)
-{
-#ifndef WITHOUT_NETWORK
-  int inet_addr;
-  int result;
-  int local_address;
-  int local_port;
-
-  inet_addr = socket_channel_get_net_addr (env, InetAddress);
-
-  TARGET_NATIVE_NETWORK_SOCKET_BIND (fd, inet_addr, port, result);
-  if (result != TARGET_NATIVE_OK)
-    {
-//??? NYI
-      perror ("BIND");
-      return -1;
-    }
-  if (port == 0)
-    {
-      /* get local address info */
-      TARGET_NATIVE_NETWORK_SOCKET_GET_LOCAL_INFO (fd, local_address,
-                                                  local_port, result);
-      if (result != TARGET_NATIVE_OK)
-       {
-//??? NYI
-         perror ("getsockname: ");
-         return -1;
-       }
-    }
-  else
-    {
-      local_port = port;
-    }
-
-  return (local_port);
-#else /* not WITHOUT_NETWORK */
-#endif /* not WITHOUT_NETWORK */
-}
-
-int
-Java_gnu_java_nio_SocketChannelImpl_SocketListen (JNIEnv * env, jclass c,
-                                                 int fd, int backlog)
-{
-#ifndef WITHOUT_NETWORK
-  int result;
-
-  TARGET_NATIVE_NETWORK_SOCKET_LISTEN (fd, backlog, result);
-  if (result != TARGET_NATIVE_OK)
-    {
-      return (-1);
-    }
-
-  return (0);
-#else /* not WITHOUT_NETWORK */
-  return (-1);
-#endif /* not WITHOUT_NETWORK */
-}
-
-int
-Java_gnu_java_nio_SocketChannelImpl_SocketAvailable (JNIEnv * env, jclass c,
-                                                    int fd)
-{
-#ifndef WITHOUT_NETWORK
-  int bytes_available;
-  int result;
-
-  TARGET_NATIVE_NETWORK_SOCKET_RECEIVE_AVAILABLE (fd, bytes_available,
-                                                 result);
-  if (result != TARGET_NATIVE_OK)
-    {
-      return (0);
-    }
-
-  return (bytes_available);
-#else /* not WITHOUT_NETWORK */
-  return (0);
-#endif /* not WITHOUT_NETWORK */
-}
-
-int
-Java_gnu_java_nio_SocketChannelImpl_SocketClose (JNIEnv * env, jclass c,
-                                                int fd)
-{
-#ifndef WITHOUT_NETWORK
-  int result;
-
-  if (fd >= 0)
-    {
-      TARGET_NATIVE_NETWORK_SOCKET_CLOSE (fd, result);
-    }
-
-  return (0);
-#else /* not WITHOUT_NETWORK */
-  return (0);
-#endif /* not WITHOUT_NETWORK */
-}
-
-int
-Java_gnu_java_nio_SocketChannelImpl_SocketRead (JNIEnv * env, jclass c,
-                                               int fd, jarray buf, int off,
-                                               int len)
-{
-#ifndef WITHOUT_NETWORK
-  jbyte *buffer;
-  int bytes_received;
-
-  buffer = (*env)->GetByteArrayElements (env, buf, 0);
-  assert (buffer != NULL);
-
-  TARGET_NATIVE_NETWORK_SOCKET_RECEIVE (fd, buffer + off, len,
-                                       bytes_received);
-
-  (*env)->ReleaseByteArrayElements (env, buf, buffer, 0);
-
-  return (bytes_received);
-#else /* not WITHOUT_NETWORK */
-  return (0);
-#endif /* not WITHOUT_NETWORK */
-}
-
-int
-Java_gnu_java_nio_SocketChannelImpl_SocketWrite (JNIEnv * env, jclass c,
-                                                int fd, jarray buf, int off,
-                                                int len)
-{
-#ifndef WITHOUT_NETWORK
-  jbyte *buffer;
-  int bytes_sent;
-
-  buffer = (*env)->GetByteArrayElements (env, buf, 0);
-
-  TARGET_NATIVE_NETWORK_SOCKET_SEND (fd, buffer + off, len, bytes_sent);
-
-  (*env)->ReleaseByteArrayElements (env, buf, buffer, 0);
-
-  return (bytes_sent);
-#else /* not WITHOUT_NETWORK */
-  return (0);
-#endif /* not WITHOUT_NETWORK */
-}
Index: native/jni/java-nio/java_nio_VMDirectByteBuffer.c
===================================================================
RCS file: 
/cvsroot/classpath/classpath/native/jni/java-nio/java_nio_VMDirectByteBuffer.c,v
retrieving revision 1.4
diff -u -r1.4 java_nio_VMDirectByteBuffer.c
--- native/jni/java-nio/java_nio_VMDirectByteBuffer.c   8 Apr 2005 13:01:42 
-0000       1.4
+++ native/jni/java-nio/java_nio_VMDirectByteBuffer.c   9 Apr 2005 00:02:51 
-0000
@@ -79,7 +79,7 @@
 }
 
 JNIEXPORT void JNICALL
-  Java_java_nio_VMDirectByteBuffer_init
+Java_java_nio_VMDirectByteBuffer_init
   (JNIEnv * env, jclass clazz __attribute__ ((__unused__)))
 {
 #if SIZEOF_VOID_P == 4
@@ -146,7 +146,7 @@
 }
 
 JNIEXPORT jobject JNICALL
-  Java_java_nio_VMDirectByteBuffer_allocate
+Java_java_nio_VMDirectByteBuffer_allocate
   (JNIEnv * env, jclass clazz __attribute__ ((__unused__)), jint capacity)
 {
   void *buffer;
@@ -164,14 +164,14 @@
 }
 
 JNIEXPORT void JNICALL
-  Java_java_nio_VMDirectByteBuffer_free
+Java_java_nio_VMDirectByteBuffer_free
   (JNIEnv * env, jclass clazz __attribute__ ((__unused__)), jobject address)
 {
   free (NIOGetPointer (env, address));
 }
 
 JNIEXPORT jbyte JNICALL
-  Java_java_nio_VMDirectByteBuffer_get__Lgnu_classpath_RawData_2I
+Java_java_nio_VMDirectByteBuffer_get__Lgnu_classpath_RawData_2I
   (JNIEnv * env, jclass clazz __attribute__ ((__unused__)),
    jobject address, jint index)
 {
@@ -179,7 +179,7 @@
 }
 
 JNIEXPORT void JNICALL
-  Java_java_nio_VMDirectByteBuffer_put
+Java_java_nio_VMDirectByteBuffer_put
   (JNIEnv * env, jclass clazz __attribute__ ((__unused__)),
    jobject address, jint index, jbyte value)
 {
@@ -188,7 +188,7 @@
 }
 
 JNIEXPORT void JNICALL
-  Java_java_nio_VMDirectByteBuffer_get__Lgnu_classpath_RawData_2I_3BII
+Java_java_nio_VMDirectByteBuffer_get__Lgnu_classpath_RawData_2I_3BII
   (JNIEnv * env, jclass clazz __attribute__ ((__unused__)),
    jobject address, jint index, jbyteArray dst, jint dst_offset, jint dst_len)
 {
@@ -198,7 +198,7 @@
 }
 
 JNIEXPORT void JNICALL
-  Java_java_nio_VMDirectByteBuffer_shiftDown
+Java_java_nio_VMDirectByteBuffer_shiftDown
   (JNIEnv * env, jclass clazz __attribute__ ((__unused__)),
    jobject address, jint dst_offset, jint src_offset, jint count)
 {
@@ -208,7 +208,7 @@
 }
 
 JNIEXPORT jobject JNICALL
-  Java_java_nio_VMDirectByteBuffer_adjustAddress
+Java_java_nio_VMDirectByteBuffer_adjustAddress
   (JNIEnv * env, jclass clazz __attribute__ ((__unused__)),
    jobject address, jint offset)
 {

Attachment: signature.asc
Description: This is a digitally signed message part


reply via email to

[Prev in Thread] Current Thread [Next in Thread]