[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commit-cp] classpath includeMakefile.am native/jni/gconf-p...
From: |
Mark Wielaard |
Subject: |
[commit-cp] classpath includeMakefile.am native/jni/gconf-p... |
Date: |
Sun, 18 Jun 2006 09:16:44 +0000 |
CVSROOT: /cvsroot/classpath
Module name: classpath
Changes by: Mark Wielaard <mark> 06/06/18 09:16:44
Modified files:
include : Makefile.am
native/jni/gconf-peer: GConfNativePeer.c
. : ChangeLog
Log message:
* include/Makefile.am: gnu_java_util_prefs_gconf_%.h should
depend
on gnu/java/util/prefs/gconf/%.class.
* Java_gnu_java_util_prefs_gconf_GConfNativePeer_init_1class: Fix
chache typo, should be cache.
(Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1gconf_1client_1all_1keys):
Declare tmp early.
(Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1gconf_1client_1all_1nodes):
Likewise.
(Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1remove_1dir):
Don't return a value for void function.
(Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1add_1dir)
Likewise.
(Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1dir_1exists):
Mark clazz as unused. Return JNI_FALSE, not NULL for jboolean
function.
(Java_gnu_java_util_prefs_gconf_GConfNativePeer_finalize_1class):
Mark clazz ad unused.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/include/Makefile.am?cvsroot=classpath&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/classpath/native/jni/gconf-peer/GConfNativePeer.c?cvsroot=classpath&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7866&r2=1.7867
Patches:
Index: include/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/include/Makefile.am,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- include/Makefile.am 17 Jun 2006 15:53:36 -0000 1.65
+++ include/Makefile.am 18 Jun 2006 09:16:43 -0000 1.66
@@ -176,7 +176,7 @@
$(top_srcdir)/include/gnu_javax_sound_midi_dssi_%.h:
$(top_builddir)/$(CLASSDIR)/gnu/javax/sound/midi/dssi/%.class
$(JAVAH) -o $@ gnu.javax.sound.midi.dssi.$*
-$(top_srcdir)/include/gnu_java_util_prefs_gconf_%.h:
$(top_builddir)/$(CLASSDIR)/java/util/prefs/gconf/%.class
+$(top_srcdir)/include/gnu_java_util_prefs_gconf_%.h:
$(top_builddir)/$(CLASSDIR)/gnu/java/util/prefs/gconf/%.class
$(JAVAH) -o $@ gnu.java.util.prefs.gconf.$*
$(top_srcdir)/include/gnu_java_net_VMPlainDatagramSocketImpl.h:
$(top_srcdir)/vm/reference/gnu/java/net/VMPlainDatagramSocketImpl.java
Index: native/jni/gconf-peer/GConfNativePeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gconf-peer/GConfNativePeer.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- native/jni/gconf-peer/GConfNativePeer.c 17 Jun 2006 15:53:37 -0000
1.1
+++ native/jni/gconf-peer/GConfNativePeer.c 18 Jun 2006 09:16:43 -0000
1.2
@@ -111,7 +111,7 @@
(JNIEnv *env, jclass clazz)
{
if (reference_count == 0) {
- Java_gnu_java_util_prefs_gconf_GConfNativePeer_init_1id_1chache
+ Java_gnu_java_util_prefs_gconf_GConfNativePeer_init_1id_1cache
(env, clazz);
return;
}
@@ -160,6 +160,7 @@
const char *dir = NULL;
GError *err = NULL;
GSList *entries = NULL;
+ GSList *tmp;
/* java.util.ArrayList */
jobject jlist = NULL;
@@ -190,7 +191,7 @@
return NULL;
}
- GSList* tmp = entries;
+ tmp = entries;
while (tmp != NULL) {
const char *_val = gconf_entry_get_key(tmp->data);
_val = strrchr (_val, '/'); ++_val;
@@ -219,6 +220,7 @@
const char *dir = NULL;
GError *err = NULL;
GSList *entries = NULL;
+ GSList *tmp;
/* java.util.ArrayList */
jobject jlist = NULL;
@@ -248,7 +250,7 @@
return NULL;
}
- GSList* tmp = entries;
+ tmp = entries;
while (tmp != NULL) {
const char *_val = tmp->data;
_val = strrchr (_val, '/'); ++_val;
@@ -378,9 +380,8 @@
const char *dir = NULL;
dir = JCL_jstring_to_cstring (env, node);
- if (dir == NULL) {
- return NULL;
- }
+ if (dir == NULL)
+ return;
gconf_client_remove_dir (client, dir, NULL);
@@ -399,9 +400,8 @@
const char *dir = NULL;
dir = JCL_jstring_to_cstring (env, node);
- if (dir == NULL) {
- return NULL;
- }
+ if (dir == NULL)
+ return;
/* ignore errors */
gconf_client_add_dir (client, dir, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
@@ -416,15 +416,14 @@
*/
JNIEXPORT jboolean JNICALL
Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1dir_1exists
- (JNIEnv *env, jclass clazz, jstring node)
+ (JNIEnv *env, jclass clazz __attribute__ ((unused)), jstring node)
{
const char *dir = NULL;
jboolean value = JNI_FALSE;
dir = JCL_jstring_to_cstring (env, node);
- if (dir == NULL) {
- return NULL;
- }
+ if (dir == NULL)
+ return value;
/* we ignore errors here */
value = gconf_client_dir_exists (client, dir, NULL);
@@ -441,7 +440,7 @@
*/
JNIEXPORT void
JNICALL Java_gnu_java_util_prefs_gconf_GConfNativePeer_finalize_1class
- (JNIEnv *env, jclass clazz)
+ (JNIEnv *env, jclass clazz __attribute__ ((unused)))
{
if (reference_count == 0) {
/* last reference, free all resources and return */
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7866
retrieving revision 1.7867
diff -u -b -r1.7866 -r1.7867
--- ChangeLog 18 Jun 2006 06:59:24 -0000 1.7866
+++ ChangeLog 18 Jun 2006 09:16:43 -0000 1.7867
@@ -1,3 +1,23 @@
+2006-06-19 Mark Wielaard <address@hidden>
+
+ * include/Makefile.am: gnu_java_util_prefs_gconf_%.h should depend
+ on gnu/java/util/prefs/gconf/%.class.
+ * Java_gnu_java_util_prefs_gconf_GConfNativePeer_init_1class: Fix
+ chache typo, should be cache.
+
(Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1gconf_1client_1all_1keys):
+ Declare tmp early.
+
(Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1gconf_1client_1all_1nodes):
+ Likewise.
+
(Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1remove_1dir):
+ Don't return a value for void function.
+ (Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1add_1dir)
+ Likewise.
+
(Java_gnu_java_util_prefs_gconf_GConfNativePeer_gconf_1client_1dir_1exists):
+ Mark clazz as unused. Return JNI_FALSE, not NULL for jboolean
+ function.
+ (Java_gnu_java_util_prefs_gconf_GConfNativePeer_finalize_1class):
+ Mark clazz ad unused.
+
2006-06-18 Raif S. Naffah <address@hidden>
* gnu/java/security/hash/Whirlpool.java: Source formatting.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [commit-cp] classpath includeMakefile.am native/jni/gconf-p...,
Mark Wielaard <=