Move the libcore registration out of libnativehelpers and into libcore.

Bug: 754114
Change-Id: Iaa03def509c10cbaa12fd2128584b93d4be4a6b7

17 files changed, 32 insertions, 131 deletions

diff --git a/luni/src/main/native/java_io_Console.cpp b/luni/src/main/native/java_io_Console.cpp
index ee48383..fdaafaf 100644
--- a/luni/src/main/native/java_io_Console.cpp
+++ b/luni/src/main/native/java_io_Console.cpp
@@ -15,7 +15,6 @@
  *  limitations under the License.
  */
 
-#include "AndroidSystemNatives.h"
 #include "JNIHelp.h"
 
 #include <errno.h>
@@ -46,7 +45,6 @@ static jint java_io_Console_setEcho(JNIEnv* env, jclass, jboolean on, jint previ
 }
 
 static JNINativeMethod gMethods[] = {
-    /* name, signature, funcPtr */
     { "isatty", "(I)Z", (void*) java_io_Console_isatty },
     { "setEchoImpl", "(ZI)I", (void*) java_io_Console_setEcho },
 };
diff --git a/luni/src/main/native/java_io_File.cpp b/luni/src/main/native/java_io_File.cpp
index 3006275..dc25057 100644
--- a/luni/src/main/native/java_io_File.cpp
+++ b/luni/src/main/native/java_io_File.cpp
@@ -15,7 +15,6 @@
  *  limitations under the License.
  */
 
-#include "AndroidSystemNatives.h"
 #include "JNIHelp.h"
 #include "LocalArray.h"
 #include "ScopedByteArray.h"
@@ -395,7 +394,6 @@ static jboolean java_io_File_renameToImpl(JNIEnv* env, jobject, jbyteArray oldPa
 }
 
 static JNINativeMethod gMethods[] = {
-    /* name, signature, funcPtr */
     { "canExecuteImpl",     "([B)Z", (void*) java_io_File_canExecuteImpl },
     { "canReadImpl",        "([B)Z", (void*) java_io_File_canReadImpl },
     { "canWriteImpl",       "([B)Z", (void*) java_io_File_canWriteImpl },
@@ -420,6 +418,5 @@ static JNINativeMethod gMethods[] = {
     { "setLastModifiedImpl","([BJ)Z", (void*) java_io_File_setLastModifiedImpl },
 };
 int register_java_io_File(JNIEnv* env) {
-    return jniRegisterNativeMethods(env, "java/io/File",
-            gMethods, NELEM(gMethods));
+    return jniRegisterNativeMethods(env, "java/io/File", gMethods, NELEM(gMethods));
 }
diff --git a/luni/src/main/native/java_io_FileDescriptor.c b/luni/src/main/native/java_io_FileDescriptor.c
index 897e688..075e19b 100644
--- a/luni/src/main/native/java_io_FileDescriptor.c
+++ b/luni/src/main/native/java_io_FileDescriptor.c
@@ -185,15 +185,10 @@ void jniSetFileDescriptorOfFD (JNIEnv* env, jobject fileDescriptor, int value) {
     setFd(env, fileDescriptor, value);
 }
 
-/*
- * JNI registration
- */
 static JNINativeMethod gMethods[] = {
-    /* name, signature, funcPtr */
     { "oneTimeInitialization", "()V",              nativeClassInit },
     { "syncImpl",           "()V",                 fd_sync }
 };
 int register_java_io_FileDescriptor(JNIEnv* env) {
-    return jniRegisterNativeMethods(env, "java/io/FileDescriptor",
-        gMethods, NELEM(gMethods));
+    return jniRegisterNativeMethods(env, "java/io/FileDescriptor", gMethods, NELEM(gMethods));
 }
diff --git a/luni/src/main/native/java_io_ObjectInputStream.c b/luni/src/main/native/java_io_ObjectInputStream.c
index 3519055..0aa56b0 100644
--- a/luni/src/main/native/java_io_ObjectInputStream.c
+++ b/luni/src/main/native/java_io_ObjectInputStream.c
@@ -16,7 +16,6 @@
  */
 
 #include "JNIHelp.h"
-#include "AndroidSystemNatives.h"
 
 static void java_setFieldBool (JNIEnv * env, jclass clazz, 
                                          jobject targetObject, 
@@ -244,11 +243,7 @@ static void java_setFieldObj (JNIEnv * env, jclass clazz,
     }
 }
 
-/*
- * JNI registration
- */
 static JNINativeMethod gMethods[] = {
-    /* name, signature, funcPtr */
     { "setField",          
         "(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;J)V",
         (void*) java_setFieldLong },
@@ -282,6 +277,5 @@ static JNINativeMethod gMethods[] = {
 
 };
 int register_java_io_ObjectInputStream(JNIEnv* env) {
-    return jniRegisterNativeMethods(env, "java/io/ObjectInputStream",
-                gMethods, NELEM(gMethods));
+    return jniRegisterNativeMethods(env, "java/io/ObjectInputStream", gMethods, NELEM(gMethods));
 }
diff --git a/luni/src/main/native/java_io_ObjectOutputStream.c b/luni/src/main/native/java_io_ObjectOutputStream.c
index e465bc2..d6432c7 100644
--- a/luni/src/main/native/java_io_ObjectOutputStream.c
+++ b/luni/src/main/native/java_io_ObjectOutputStream.c
@@ -16,7 +16,6 @@
  */
 
 #include "JNIHelp.h"
-#include "AndroidSystemNatives.h"
 
 static jlong java_getFieldLong(JNIEnv * env, jclass clazz,
                                               jobject targetObject,
@@ -205,11 +204,7 @@ static jint java_getFieldInt(JNIEnv * env, jclass clazz,
     }
 }
 
-/*
- * JNI registration
- */
 static JNINativeMethod gMethods[] = {
-    /* name, signature, funcPtr */
     { "getFieldLong",   
     	"(Ljava/lang/Object;Ljava/lang/Class;Ljava/lang/String;)J",
     	(void*) java_getFieldLong },
@@ -240,7 +235,5 @@ static JNINativeMethod gMethods[] = {
 
 };
 int register_java_io_ObjectOutputStream(JNIEnv* env) {
-	return jniRegisterNativeMethods(env, "java/io/ObjectOutputStream",
-                gMethods, NELEM(gMethods));
+    return jniRegisterNativeMethods(env, "java/io/ObjectOutputStream", gMethods, NELEM(gMethods));
 }
-
diff --git a/luni/src/main/native/java_io_ObjectStreamClass.c b/luni/src/main/native/java_io_ObjectStreamClass.c
index c3fb518..935ff37 100644
--- a/luni/src/main/native/java_io_ObjectStreamClass.c
+++ b/luni/src/main/native/java_io_ObjectStreamClass.c
@@ -16,7 +16,6 @@
  */
 
 #include "JNIHelp.h"
-#include "AndroidSystemNatives.h"
 
 static jobject java_io_osc_getFieldSignature(JNIEnv * env, jclass clazz,
                                                   jobject reflectField) {
@@ -109,11 +108,7 @@ static void java_io_osc_oneTimeInitialization(JNIEnv * env, jclass clazz) {
   // dummy to stay compatible to harmony
 }
 
-/*
- * JNI registration
- */
 static JNINativeMethod gMethods[] = {
-    /* name, signature, funcPtr */
     { "getFieldSignature",       
     	"(Ljava/lang/reflect/Field;)Ljava/lang/String;",
     	(void*) java_io_osc_getFieldSignature },
@@ -129,6 +124,5 @@ static JNINativeMethod gMethods[] = {
     	(void*) java_io_osc_oneTimeInitialization }
 };
 int register_java_io_ObjectStreamClass(JNIEnv* env) {
-	return jniRegisterNativeMethods(env, "java/io/ObjectStreamClass",
-                gMethods, NELEM(gMethods));
+    return jniRegisterNativeMethods(env, "java/io/ObjectStreamClass", gMethods, NELEM(gMethods));
 }
diff --git a/luni/src/main/native/java_lang_Double.c b/luni/src/main/native/java_lang_Double.c
index fd4b7f1..9cc0869 100644
--- a/luni/src/main/native/java_lang_Double.c
+++ b/luni/src/main/native/java_lang_Double.c
@@ -60,18 +60,11 @@ static jdouble longBitsToDouble(JNIEnv* env, jclass clazz, jlong val)
     return d.d;
 }
 
-/*
- * JNI registration
- */
 static JNINativeMethod gMethods[] = {
-    /* name, signature, funcPtr */
     { "doubleToLongBits",       "(D)J",     doubleToLongBits },
     { "doubleToRawLongBits",    "(D)J",     doubleToRawLongBits },
     { "longBitsToDouble",       "(J)D",     longBitsToDouble },
 };
-int register_java_lang_Double(JNIEnv* env)
-{
-    return jniRegisterNativeMethods(env, "java/lang/Double",
-                gMethods, NELEM(gMethods));
+int register_java_lang_Double(JNIEnv* env) {
+    return jniRegisterNativeMethods(env, "java/lang/Double", gMethods, NELEM(gMethods));
 }
-
diff --git a/luni/src/main/native/java_lang_Float.c b/luni/src/main/native/java_lang_Float.c
index 2a7af21..6426495 100644
--- a/luni/src/main/native/java_lang_Float.c
+++ b/luni/src/main/native/java_lang_Float.c
@@ -68,18 +68,11 @@ static jfloat intBitsToFloat(JNIEnv* env, jclass clazz, jint val)
     return f.f;
 }
 
-/*
- * JNI registration
- */
 static JNINativeMethod gMethods[] = {
-    /* name, signature, funcPtr */
     { "floatToIntBits",         "(F)I",     floatToIntBits },
     { "floatToRawIntBits",      "(F)I",     floatToRawBits },
     { "intBitsToFloat",         "(I)F",     intBitsToFloat },
 };
-int register_java_lang_Float(JNIEnv* env)
-{
-    return jniRegisterNativeMethods(env, "java/lang/Float",
-        gMethods, NELEM(gMethods));
+int register_java_lang_Float(JNIEnv* env) {
+    return jniRegisterNativeMethods(env, "java/lang/Float", gMethods, NELEM(gMethods));
 }
-
diff --git a/luni/src/main/native/java_lang_Math.c b/luni/src/main/native/java_lang_Math.c
index 90cb9b5..2092c2d 100644
--- a/luni/src/main/native/java_lang_Math.c
+++ b/luni/src/main/native/java_lang_Math.c
@@ -169,11 +169,7 @@ static jfloat copySign_f(JNIEnv* env, jclass clazz, jfloat a, jfloat b) {
     return copysignf(a, isnan(b) ? 1.0 : b);
 }
 
-/*
- * JNI registration.
- */
 static JNINativeMethod gMethods[] = {
-    /* name, signature, funcPtr */
     { "IEEEremainder", "(DD)D", jieee_remainder },
     { "acos",   "(D)D", jacos },
     { "asin",   "(D)D", jasin },
@@ -203,8 +199,6 @@ static JNINativeMethod gMethods[] = {
     { "tanh",   "(D)D", jtanh },
 };
 
-int register_java_lang_Math(JNIEnv* env)
-{
-    return jniRegisterNativeMethods(env, "java/lang/Math", gMethods,
-        NELEM(gMethods));
+int register_java_lang_Math(JNIEnv* env) {
+    return jniRegisterNativeMethods(env, "java/lang/Math", gMethods, NELEM(gMethods));
 }
diff --git a/luni/src/main/native/java_lang_StrictMath.c b/luni/src/main/native/java_lang_StrictMath.c
index cb0f87e..651e2dd 100644
--- a/luni/src/main/native/java_lang_StrictMath.c
+++ b/luni/src/main/native/java_lang_StrictMath.c
@@ -184,11 +184,7 @@ static jfloat jnextafterf(JNIEnv* env, jclass clazz, jfloat arg1, jfloat arg2)
     return arg1;
 }
 
-/*
- * JNI registration.
- */
 static JNINativeMethod gMethods[] = {
-    /* name, signature, funcPtr */
     { "IEEEremainder", "(DD)D", jieee_remainder },
     { "acos",   "(D)D", jacos },
     { "asin",   "(D)D", jasin },
@@ -216,8 +212,6 @@ static JNINativeMethod gMethods[] = {
     { "tanh",   "(D)D", jtanh },
 };
 
-int register_java_lang_StrictMath(JNIEnv* env)
-{
-    return jniRegisterNativeMethods(env, "java/lang/StrictMath", gMethods,
-        NELEM(gMethods));
+int register_java_lang_StrictMath(JNIEnv* env) {
+    return jniRegisterNativeMethods(env, "java/lang/StrictMath", gMethods, NELEM(gMethods));
 }
diff --git a/luni/src/main/native/java_net_InetAddress.cpp b/luni/src/main/native/java_net_InetAddress.cpp
index 62318e9..2fc575a 100644
--- a/luni/src/main/native/java_net_InetAddress.cpp
+++ b/luni/src/main/native/java_net_InetAddress.cpp
@@ -214,17 +214,12 @@ static jstring InetAddress_getnameinfo(JNIEnv* env, jobject obj,
     return env->NewStringUTF(name);
 }
 
-/*
- * JNI registration
- */
 static JNINativeMethod gMethods[] = {
-    /* name, signature, funcPtr */
     { "getaddrinfo", "(Ljava/lang/String;)[[B", (void*) InetAddress_getaddrinfo },
     { "gethostname", "()Ljava/lang/String;", (void*) InetAddress_gethostname  },
     { "getnameinfo", "([B)Ljava/lang/String;", (void*) InetAddress_getnameinfo },
 };
-
-extern "C" int register_java_net_InetAddress(JNIEnv* env) {
+int register_java_net_InetAddress(JNIEnv* env) {
     jclass tempClass = env->FindClass("[B");
     if (tempClass) {
         byteArrayClass = (jclass) env->NewGlobalRef(tempClass);
diff --git a/luni/src/main/native/java_net_NetworkInterface.cpp b/luni/src/main/native/java_net_NetworkInterface.cpp
index 4aea781..16b4619 100644
--- a/luni/src/main/native/java_net_NetworkInterface.cpp
+++ b/luni/src/main/native/java_net_NetworkInterface.cpp
@@ -15,7 +15,6 @@
  *  limitations under the License.
  */
 
-#include "AndroidSystemNatives.h"
 #include "JNIHelp.h"
 #include "jni.h"
 #include "ScopedFd.h"
@@ -229,7 +228,6 @@ static jboolean supportsMulticastImpl(JNIEnv* env, jclass, jstring name, jint in
 }
 
 static JNINativeMethod gMethods[] = {
-    /* name, signature, funcPtr */
     { "getAllInterfaceAddressesImpl", "()[Ljava/net/InterfaceAddress;", (void*) getAllInterfaceAddressesImpl },
     { "getHardwareAddressImpl", "(Ljava/lang/String;I)[B", (void*) getHardwareAddressImpl },
     { "getMTUImpl", "(Ljava/lang/String;I)I", (void*) getMTUImpl },
@@ -239,6 +237,5 @@ static JNINativeMethod gMethods[] = {
     { "supportsMulticastImpl", "(Ljava/lang/String;I)Z", (void*) supportsMulticastImpl },
 };
 int register_java_net_NetworkInterface(JNIEnv* env) {
-    return jniRegisterNativeMethods(env, "java/net/NetworkInterface",
-            gMethods, NELEM(gMethods));
+    return jniRegisterNativeMethods(env, "java/net/NetworkInterface", gMethods, NELEM(gMethods));
 }
diff --git a/luni/src/main/native/org_apache_harmony_luni_platform_OSFileSystem.cpp b/luni/src/main/native/org_apache_harmony_luni_platform_OSFileSystem.cpp
index c33cbed..af82efc 100644
--- a/luni/src/main/native/org_apache_harmony_luni_platform_OSFileSystem.cpp
+++ b/luni/src/main/native/org_apache_harmony_luni_platform_OSFileSystem.cpp
@@ -38,7 +38,6 @@
 #define HyOpenSync      128
 #define SHARED_LOCK_TYPE 1L
 
-#include "AndroidSystemNatives.h"
 #include "JNIHelp.h"
 #include "LocalArray.h"
 #include "ScopedByteArray.h"
@@ -501,11 +500,7 @@ static jint harmony_io_ioctlAvailable(JNIEnv*env, jobject, jobject fileDescripto
     return (jint) avail;
 }
 
-/*
- * JNI registration
- */
 static JNINativeMethod gMethods[] = {
-    /* name, signature, funcPtr */
     { "close",              "(I)V",       (void*) harmony_io_close },
     { "fflush",             "(IZ)V",      (void*) harmony_io_fflush },
     { "getAllocGranularity","()I",        (void*) harmony_io_getAllocGranularity },
@@ -524,8 +519,7 @@ static JNINativeMethod gMethods[] = {
     { "writeImpl",          "(I[BII)J",   (void*) harmony_io_writeImpl },
     { "writev",             "(I[I[I[II)J",(void*) harmony_io_writev },
 };
-int register_org_apache_harmony_luni_platform_OSFileSystem(JNIEnv* _env) {
-    return jniRegisterNativeMethods(_env,
-            "org/apache/harmony/luni/platform/OSFileSystem", gMethods,
+int register_org_apache_harmony_luni_platform_OSFileSystem(JNIEnv* env) {
+    return jniRegisterNativeMethods(env, "org/apache/harmony/luni/platform/OSFileSystem", gMethods,
             NELEM(gMethods));
 }
diff --git a/luni/src/main/native/org_apache_harmony_luni_platform_OSMemory.cpp b/luni/src/main/native/org_apache_harmony_luni_platform_OSMemory.cpp
index 1d63faf..d1dafdb 100644
--- a/luni/src/main/native/org_apache_harmony_luni_platform_OSMemory.cpp
+++ b/luni/src/main/native/org_apache_harmony_luni_platform_OSMemory.cpp
@@ -15,8 +15,8 @@
  */
 
 #define LOG_TAG "OSMemory"
+
 #include "JNIHelp.h"
-#include "AndroidSystemNatives.h"
 #include "utils/misc.h"
 #include "utils/Log.h"
 #include <sys/mman.h>
@@ -535,11 +535,7 @@ static jint harmony_nio_flushImpl(JNIEnv *_env, jobject _this, jint address,
     return msync((void *)address, size, MS_SYNC);
 }
 
-/*
- * JNI registration
- */
 static JNINativeMethod gMethods[] = {
-    /* name, signature, funcPtr */
     { "isLittleEndianImpl", "()Z",     (void*) harmony_nio_littleEndian },
     { "getPointerSizeImpl", "()I",     (void*) harmony_nio_getPointerSizeImpl },
     { "malloc",             "(I)I",    (void*) harmony_nio_mallocImpl },
@@ -570,7 +566,7 @@ static JNINativeMethod gMethods[] = {
     { "isLoadedImpl",       "(IJ)Z",   (void*) harmony_nio_isLoadedImpl },
     { "flushImpl",          "(IJ)I",   (void*) harmony_nio_flushImpl }
 };
-int register_org_apache_harmony_luni_platform_OSMemory(JNIEnv *_env) {
+int register_org_apache_harmony_luni_platform_OSMemory(JNIEnv* env) {
     /*
      * We need to call VMRuntime.trackExternal{Allocation,Free}.  Cache
      * method IDs and a reference to the singleton.
@@ -579,16 +575,16 @@ int register_org_apache_harmony_luni_platform_OSMemory(JNIEnv *_env) {
     jmethodID method_getRuntime;
     jclass clazz;
 
-    clazz = _env->FindClass(kVMRuntimeName);
+    clazz = env->FindClass(kVMRuntimeName);
     if (clazz == NULL) {
         LOGE("Unable to find class %s\n", kVMRuntimeName);
         return -1;
     }
-    gIDCache.method_trackExternalAllocation = _env->GetMethodID(clazz,
+    gIDCache.method_trackExternalAllocation = env->GetMethodID(clazz,
         "trackExternalAllocation", "(J)Z");
-    gIDCache.method_trackExternalFree = _env->GetMethodID(clazz,
+    gIDCache.method_trackExternalFree = env->GetMethodID(clazz,
         "trackExternalFree", "(J)V");
-    method_getRuntime = _env->GetStaticMethodID(clazz,
+    method_getRuntime = env->GetStaticMethodID(clazz,
         "getRuntime", "()Ldalvik/system/VMRuntime;");
 
     if (gIDCache.method_trackExternalAllocation == NULL ||
@@ -599,17 +595,13 @@ int register_org_apache_harmony_luni_platform_OSMemory(JNIEnv *_env) {
         return -1;
     }
 
-    jobject instance = _env->CallStaticObjectMethod(clazz, method_getRuntime);
+    jobject instance = env->CallStaticObjectMethod(clazz, method_getRuntime);
     if (instance == NULL) {
         LOGE("Unable to obtain VMRuntime instance\n");
         return -1;
     }
-    gIDCache.runtimeInstance = _env->NewGlobalRef(instance);
+    gIDCache.runtimeInstance = env->NewGlobalRef(instance);
 
-    /*
-     * Register methods.
-     */
-    return jniRegisterNativeMethods(_env,
-                "org/apache/harmony/luni/platform/OSMemory",
-                gMethods, NELEM(gMethods));
+    return jniRegisterNativeMethods(env, "org/apache/harmony/luni/platform/OSMemory",
+            gMethods, NELEM(gMethods));
 }
diff --git a/luni/src/main/native/org_apache_harmony_luni_platform_OSNetworkSystem.cpp b/luni/src/main/native/org_apache_harmony_luni_platform_OSNetworkSystem.cpp
index f3ba44a..0dbb070 100644
--- a/luni/src/main/native/org_apache_harmony_luni_platform_OSNetworkSystem.cpp
+++ b/luni/src/main/native/org_apache_harmony_luni_platform_OSNetworkSystem.cpp
@@ -23,7 +23,6 @@
 
 #define LOG_TAG "OSNetworkSystem"
 
-#include "AndroidSystemNatives.h"
 #include "JNIHelp.h"
 #include "LocalArray.h"
 #include "jni.h"
@@ -2834,11 +2833,7 @@ static void osNetworkSystem_socketClose(JNIEnv* env, jobject, jobject fileDescri
     close(fd);
 }
 
-/*
- * JNI registration.
- */
 static JNINativeMethod gMethods[] = {
-    /* name, signature, funcPtr */
     { "accept",                            "(Ljava/io/FileDescriptor;Ljava/net/SocketImpl;Ljava/io/FileDescriptor;I)V",(void*) osNetworkSystem_accept },
     { "bind",                              "(Ljava/io/FileDescriptor;Ljava/net/InetAddress;I)V",                       (void*) osNetworkSystem_bind },
     { "byteArrayToIpString",               "([B)Ljava/lang/String;",                                                   (void*) osNetworkSystem_byteArrayToIpString },
@@ -2878,11 +2873,8 @@ static JNINativeMethod gMethods[] = {
     { "writeDirect",                       "(Ljava/io/FileDescriptor;III)I",                                           (void*) osNetworkSystem_writeDirect },
     { "write",                             "(Ljava/io/FileDescriptor;[BII)I",                                          (void*) osNetworkSystem_write },
 };
-
 int register_org_apache_harmony_luni_platform_OSNetworkSystem(JNIEnv* env) {
     return initCachedFields(env) && jniRegisterNativeMethods(env,
-            "org/apache/harmony/luni/platform/OSNetworkSystem",
-            gMethods,
-            NELEM(gMethods));
+            "org/apache/harmony/luni/platform/OSNetworkSystem", gMethods, NELEM(gMethods));
 }
 // END android-changed
diff --git a/luni/src/main/native/org_apache_harmony_luni_util_NumberConvert.c b/luni/src/main/native/org_apache_harmony_luni_util_NumberConvert.c
index 70761fb..496fe6f 100644
--- a/luni/src/main/native/org_apache_harmony_luni_util_NumberConvert.c
+++ b/luni/src/main/native/org_apache_harmony_luni_util_NumberConvert.c
@@ -271,21 +271,13 @@ Java_org_apache_harmony_luni_util_NumberConverter_bigIntDigitGeneratorInstImpl (
 
   fid = (*env)->GetFieldID (env, clazz, "firstK", "I");
   (*env)->SetIntField (env, inst, fid, firstK);
-
 }
 
-/*
- * JNI registration
- */
 static JNINativeMethod gMethods[] = {
-    /* NAME,                          SIGNATURE,               FUNCPTR */
     { "bigIntDigitGeneratorInstImpl", "(JIZZI)V"              ,
         Java_org_apache_harmony_luni_util_NumberConverter_bigIntDigitGeneratorInstImpl },
 };
-
-int register_org_apache_harmony_luni_util_NumberConvert(JNIEnv *env)
-{
-    return jniRegisterNativeMethods(env,
-               "org/apache/harmony/luni/util/NumberConverter",
+int register_org_apache_harmony_luni_util_NumberConvert(JNIEnv *env) {
+    return jniRegisterNativeMethods(env, "org/apache/harmony/luni/util/NumberConverter",
                 gMethods, NELEM(gMethods));
 }
diff --git a/luni/src/main/native/org_apache_harmony_luni_util_fltparse.c b/luni/src/main/native/org_apache_harmony_luni_util_fltparse.c
index 80f2bee..daef934 100644
--- a/luni/src/main/native/org_apache_harmony_luni_util_fltparse.c
+++ b/luni/src/main/native/org_apache_harmony_luni_util_fltparse.c
@@ -589,19 +589,13 @@ Java_org_apache_harmony_luni_util_FloatingPointParser_parseDblImpl (JNIEnv * env
   return 0.0;
 }
 
-/*
- * JNI registration
- */
 static JNINativeMethod gMethods[] = {
-    /* NAME,          SIGNATURE,                FUNCPTR */
     { "parseFltImpl", "(Ljava/lang/String;I)F",
         Java_org_apache_harmony_luni_util_FloatingPointParser_parseFltImpl },
     { "parseDblImpl", "(Ljava/lang/String;I)D",
         Java_org_apache_harmony_luni_util_FloatingPointParser_parseDblImpl },
 };
-int register_org_apache_harmony_luni_util_fltparse(JNIEnv *env)
-{
-    return jniRegisterNativeMethods(env,
-               "org/apache/harmony/luni/util/FloatingPointParser",
+int register_org_apache_harmony_luni_util_fltparse(JNIEnv *env) {
+    return jniRegisterNativeMethods(env, "org/apache/harmony/luni/util/FloatingPointParser",
                 gMethods, NELEM(gMethods));
 }