This patch, committed, fixes an issue with check_jni_methods.sh, and adds also the new header file to the CVS.
Mario 2006-09-27 Mario Torre <[EMAIL PROTECTED]> * scripts/check_jni_methods.sh: removed methods from the ignore list: Java_gnu_java_util_prefs_gconf_GConfNativePeer_finalize_1class Java_gnu_java_util_prefs_gconf_GConfNativePeer_init_1id_1cache Java_gnu_java_util_prefs_gconf_GConfNativePeer_init_1class Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1escape_1key Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1unescape_1key * native/jni/gconf-peer/GConfNativePeer.c: fixed coding style to better follow the GNU style. * include/gnu_java_util_prefs_gconf_GConfNativePeer.h. regenerated header file for GConfNativePeer. -- Lima Software, SO.PR.IND. s.r.l. http://www.limasoftware.net/ pgp key: http://subkeys.pgp.net/ Proud GNU Classpath developer: http://www.classpath.org/ Read About us at: http://planet.classpath.org Please, support open standards: http://opendocumentfellowship.org/petition/ http://www.nosoftwarepatents.com/
### Eclipse Workspace Patch 1.0 #P classpath Index: native/jni/gconf-peer/GConfNativePeer.c =================================================================== RCS file: /sources/classpath/classpath/native/jni/gconf-peer/GConfNativePeer.c,v retrieving revision 1.8 diff -u -r1.8 GConfNativePeer.c --- native/jni/gconf-peer/GConfNativePeer.c 27 Sep 2006 13:52:44 -0000 1.8 +++ native/jni/gconf-peer/GConfNativePeer.c 27 Sep 2006 18:13:31 -0000 @@ -108,8 +108,8 @@ * Method: init_class * Signature: ()V */ -JNIEXPORT void -JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_init_1class +JNIEXPORT void JNICALL +Java_gnu_java_util_prefs_gconf_GConfNativePeer_init_1class (JNIEnv *env, jclass clazz) { if (reference_count == 0) @@ -127,8 +127,8 @@ * Method: init_id_chache * Signature: ()V */ -JNIEXPORT void -JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_init_1id_1cache +JNIEXPORT void JNICALL +Java_gnu_java_util_prefs_gconf_GConfNativePeer_init_1id_1cache (JNIEnv *env, jclass clazz __attribute__ ((unused))) { reference_count++; @@ -530,8 +530,8 @@ * Method: finalize_class * Signature: ()V */ -JNIEXPORT void -JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_finalize_1class +JNIEXPORT void JNICALL +Java_gnu_java_util_prefs_gconf_GConfNativePeer_finalize_1class (JNIEnv *env, jclass clazz __attribute__ ((unused))) { if (reference_count == 0) @@ -558,8 +558,8 @@ * Method: Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1escape_1key * Signature: (Ljava/lang/String;)Z */ -JNIEXPORT jstring -JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1escape_1key +JNIEXPORT jstring JNICALL +Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1escape_1key (JNIEnv *env, jclass clazz __attribute__ ((unused)), jstring plain) { const char *escaped = NULL; @@ -592,8 +592,8 @@ * Method: Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1unescape_1key * Signature: (Ljava/lang/String;)Z */ -JNIEXPORT jstring -JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1unescape_1key +JNIEXPORT jstring JNICALL +Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1unescape_1key (JNIEnv *env, jclass clazz __attribute__ ((unused)), jstring escaped) { const char *plain = NULL; Index: include/gnu_java_util_prefs_gconf_GConfNativePeer.h =================================================================== RCS file: /sources/classpath/classpath/include/gnu_java_util_prefs_gconf_GConfNativePeer.h,v retrieving revision 1.1 diff -u -r1.1 gnu_java_util_prefs_gconf_GConfNativePeer.h --- include/gnu_java_util_prefs_gconf_GConfNativePeer.h 17 Jun 2006 15:53:36 -0000 1.1 +++ include/gnu_java_util_prefs_gconf_GConfNativePeer.h 27 Sep 2006 18:13:30 -0000 @@ -20,8 +20,10 @@ JNIEXPORT jstring JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1get_1string (JNIEnv *env, jclass, jstring); JNIEXPORT jboolean JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1unset (JNIEnv *env, jclass, jstring); JNIEXPORT void JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1suggest_1sync (JNIEnv *env, jclass); -JNIEXPORT jobject JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1gconf_1client_1all_1nodes (JNIEnv *env, jclass, jstring); -JNIEXPORT jobject JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1gconf_1client_1all_1keys (JNIEnv *env, jclass, jstring); +JNIEXPORT jobject JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1all_1nodes (JNIEnv *env, jclass, jstring); +JNIEXPORT jobject JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1all_1keys (JNIEnv *env, jclass, jstring); +JNIEXPORT jstring JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1escape_1key (JNIEnv *env, jclass, jstring); +JNIEXPORT jstring JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1unescape_1key (JNIEnv *env, jclass, jstring); #ifdef __cplusplus } Index: scripts/check_jni_methods.sh =================================================================== RCS file: /sources/classpath/classpath/scripts/check_jni_methods.sh,v retrieving revision 1.14 diff -u -r1.14 check_jni_methods.sh --- scripts/check_jni_methods.sh 27 Sep 2006 13:52:45 -0000 1.14 +++ scripts/check_jni_methods.sh 27 Sep 2006 18:13:31 -0000 @@ -35,11 +35,6 @@ -Java_gnu_java_awt_peer_gtk_GtkMenuComponentPeer_dispose -Java_java_lang_VMSystem_arraycopy -Java_java_lang_VMSystem_identityHashCode --Java_gnu_java_util_prefs_gconf_GConfNativePeer_finalize_1class --Java_gnu_java_util_prefs_gconf_GConfNativePeer_init_1id_1cache --Java_gnu_java_util_prefs_gconf_GConfNativePeer_init_1class --Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1escape_1key --Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1unescape_1key EOF # Compare again silently.