[kaffe] CVS kaffe (dalibor): Misc. small warning fixes

Kaffe CVS cvs-commits at kaffe.org
Mon Mar 29 14:06:02 PST 2004


PatchSet 4596 
Date: 2004/03/29 21:39:13
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Misc. small warning fixes

Members: 
	ChangeLog:1.2173->1.2174 
	kaffe/kaffevm/classMethod.c:1.115->1.116 
	kaffe/kaffevm/external.c:1.53->1.54 
	kaffe/kaffevm/jni.c:1.103->1.104 
	kaffe/kaffevm/support.h:1.29->1.30 
	kaffe/kaffevm/jit3/constpool.c:1.7->1.8 
	kaffe/kaffevm/jit3/icode.c:1.37->1.38 
	kaffe/kaffevm/systems/unix-jthreads/jthread.h:1.52->1.53 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2173 kaffe/ChangeLog:1.2174
--- kaffe/ChangeLog:1.2173	Mon Mar 29 21:31:26 2004
+++ kaffe/ChangeLog	Mon Mar 29 21:39:13 2004
@@ -1,5 +1,9 @@
 2004-03-29  Adam Heath <doogie at debian.org>
 
+	Misc. small warning fixes.
+
+2004-03-29  Adam Heath <doogie at debian.org>
+
 	* kaffe/kaffevm/jni_i.h:
 	New file.
 
Index: kaffe/kaffe/kaffevm/classMethod.c
diff -u kaffe/kaffe/kaffevm/classMethod.c:1.115 kaffe/kaffe/kaffevm/classMethod.c:1.116
--- kaffe/kaffe/kaffevm/classMethod.c:1.115	Mon Mar  8 21:21:07 2004
+++ kaffe/kaffe/kaffevm/classMethod.c	Mon Mar 29 21:39:14 2004
@@ -80,7 +80,7 @@
 #endif
 
 /* set a class's alloc_type field */
-void
+static void
 determineAllocType(Hjava_lang_Class *class)
 {
         if (StringClass != 0 && instanceof(StringClass, class)) {
Index: kaffe/kaffe/kaffevm/external.c
diff -u kaffe/kaffe/kaffevm/external.c:1.53 kaffe/kaffe/kaffevm/external.c:1.54
--- kaffe/kaffe/kaffevm/external.c:1.53	Thu Mar 25 17:53:04 2004
+++ kaffe/kaffe/kaffevm/external.c	Mon Mar 29 21:39:14 2004
@@ -43,13 +43,12 @@
 #define LT_NON_POSIX_NAMESPACE
 #include "ltdl.h"
 #include "feedback.h"
+#include "jni_i.h"
 
 #ifdef __riscos__
 #include <unixlib/local.h>
 #endif
 
-extern void Kaffe_KNI_wrapper(Method* xmeth, void* func);
-
 #ifndef STUB_PREFIX
 #define STUB_PREFIX ""
 #define STUB_PREFIX_LEN 0
@@ -140,8 +139,6 @@
 #endif
 
 static char *libraryPath = "";
-
-extern jint Kaffe_JNI_native(Method*);
 
 extern JavaVM Kaffe_JavaVM;
 
Index: kaffe/kaffe/kaffevm/jni.c
diff -u kaffe/kaffe/kaffevm/jni.c:1.103 kaffe/kaffe/kaffevm/jni.c:1.104
--- kaffe/kaffe/kaffevm/jni.c:1.103	Mon Mar  8 21:21:08 2004
+++ kaffe/kaffe/kaffevm/jni.c	Mon Mar 29 21:39:14 2004
@@ -46,6 +46,7 @@
 #include "feedback.h"
 #endif
 #include "jvmpi_kaffe.h"
+#include "jni_i.h"
 
 /*
  * Define the version of JNI we support.
@@ -240,7 +241,7 @@
  * Everything from Kaffe_GetVersion to Kaffe_GetJavaVM
  * should be bracketed with BEGIN and END _EXCEPTION_HANDLING.
  */
-static void
+static void NONRETURNING
 Kaffe_FatalError(JNIEnv* env, const char* mess)
 {
 	kprintf(stderr, "FATAL ERROR: %s\n", mess);
@@ -4076,7 +4077,7 @@
 	xmeth->accflags |= ACC_JNI;
 }
 
-void
+static void
 Kaffe_KNI_wrapper(Method* xmeth, void* func)
 {
 	SET_METHOD_NATIVECODE(xmeth, func);
Index: kaffe/kaffe/kaffevm/support.h
diff -u kaffe/kaffe/kaffevm/support.h:1.29 kaffe/kaffe/kaffevm/support.h:1.30
--- kaffe/kaffe/kaffevm/support.h:1.29	Mon Mar 29 20:24:30 2004
+++ kaffe/kaffe/kaffevm/support.h	Mon Mar 29 21:39:14 2004
@@ -109,7 +109,6 @@
 
 extern void		setProperty(void*, char*, char*);
 extern char*		getEngine(void);
-extern void		classname2pathname(const char*, char*);
 extern void		pathname2classname(const char*, char*);
 extern jvalue		do_execute_java_method(void*, const char*, const char*, struct _methods*, int, ...);
 extern jvalue		do_execute_java_method_v(void*, const char*, const char*, struct _methods*, int, va_list);
@@ -119,7 +118,6 @@
 extern struct Hjava_lang_Object* execute_java_constructor(const char*, struct Hjava_lang_ClassLoader*, struct Hjava_lang_Class*, const char*, ...);
 extern struct Hjava_lang_Object* execute_java_constructor_v(const char*, struct Hjava_lang_ClassLoader*, struct Hjava_lang_Class*, const char*, va_list);
 extern jlong		currentTime(void);
-extern void		addNativeMethod(const char*, void*);
 
 extern void	callMethodA(struct _methods*, void*, void*, jvalue*, jvalue*, int);
 extern void	callMethodV(struct _methods*, void*, void*, va_list, jvalue*);
Index: kaffe/kaffe/kaffevm/jit3/constpool.c
diff -u kaffe/kaffe/kaffevm/jit3/constpool.c:1.7 kaffe/kaffe/kaffevm/jit3/constpool.c:1.8
--- kaffe/kaffe/kaffevm/jit3/constpool.c:1.7	Sun Sep 21 18:18:19 2003
+++ kaffe/kaffe/kaffevm/jit3/constpool.c	Mon Mar 29 21:39:15 2004
@@ -122,7 +122,7 @@
 	"label",
 };
 
-void
+static void
 printConstant(FILE *file, constpool *cp)
 {
 	fprintf(file, "%08x: (%s) ", cp->at, constpoolTypeNames[cp->type]);
Index: kaffe/kaffe/kaffevm/jit3/icode.c
diff -u kaffe/kaffe/kaffevm/jit3/icode.c:1.37 kaffe/kaffe/kaffevm/jit3/icode.c:1.38
--- kaffe/kaffe/kaffevm/jit3/icode.c:1.37	Thu Mar 25 17:53:04 2004
+++ kaffe/kaffe/kaffevm/jit3/icode.c	Mon Mar 29 21:39:15 2004
@@ -96,7 +96,6 @@
 #endif
 
 #if defined(HAVE_spill_ref)
-void HAVE_spill_ref(sequence*);
 
 void
 spill_ref(SlotData* src)
@@ -109,7 +108,6 @@
 #endif
 
 #if defined(HAVE_reload_ref)
-void HAVE_reload_ref(sequence*);
 
 void
 reload_ref(SlotData* dst)
Index: kaffe/kaffe/kaffevm/systems/unix-jthreads/jthread.h
diff -u kaffe/kaffe/kaffevm/systems/unix-jthreads/jthread.h:1.52 kaffe/kaffe/kaffevm/systems/unix-jthreads/jthread.h:1.53
--- kaffe/kaffe/kaffevm/systems/unix-jthreads/jthread.h:1.52	Mon Mar 29 20:24:31 2004
+++ kaffe/kaffe/kaffevm/systems/unix-jthreads/jthread.h	Mon Mar 29 21:39:16 2004
@@ -202,7 +202,7 @@
 /*
  * sleep for time milliseconds
  */
-void 	jthread_sleep(jlong time);
+void 	jthread_sleep(jlong millis);
 
 /* 
  * return the current thread 




More information about the kaffe mailing list