[kaffe] CVS kaffe (robilad): warning fixes for alpha-linux
Kaffe CVS
cvs-commits at kaffe.org
Fri Mar 25 14:15:59 PST 2005
PatchSet 5604
Date: 2005/03/25 22:09:50
Author: robilad
Branch: HEAD
Tag: (none)
Log:
warning fixes for alpha-linux
2005-03-25 Bryan Østergaard <kloeri at gentoo.org>
Warning fixes for alpha-linux.
* kaffe/kaffeh/kaffeh-support.h,
kaffe/kaffeh/support.c: (addCode, addLineNumbers,
addLocalVariables, addCheckedExceptions): Use size_t
instead of uint32 for len parameter.
* kaffe/kaffevm/classMethod.c,
kaffe/kaffevm/classMethod.h: (addInnerClasses) Use size_t
instead of uint32 for len parameter.
* kaffe/kaffevm/code.c,
kaffe/kaffevm/code.h: (addCode, addLineNumbers,
addLocalVariables, addCheckedExceptions) Use size_t
instead of uint32 for len parameter.
2005-03-25 Dalibor Topic <robilad at kaffe.org>
* kaffe/kaffevm/readClass.c (readAttributes):
Cast len to size_t to avoid new warnings on 64 bit platforms.
Members:
ChangeLog:1.3776->1.3777
kaffe/kaffeh/kaffeh-support.h:1.7->1.8
kaffe/kaffeh/support.c:1.47->1.48
kaffe/kaffevm/classMethod.c:1.138->1.139
kaffe/kaffevm/classMethod.h:1.78->1.79
kaffe/kaffevm/code.c:1.18->1.19
kaffe/kaffevm/code.h:1.6->1.7
kaffe/kaffevm/readClass.c:1.23->1.24
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3776 kaffe/ChangeLog:1.3777
--- kaffe/ChangeLog:1.3776 Fri Mar 25 16:42:37 2005
+++ kaffe/ChangeLog Fri Mar 25 22:09:50 2005
@@ -1,3 +1,26 @@
+2005-03-25 Bryan Østergaard <kloeri at gentoo.org>
+
+ Warning fixes for alpha-linux.
+
+ * kaffe/kaffeh/kaffeh-support.h,
+ kaffe/kaffeh/support.c: (addCode, addLineNumbers,
+ addLocalVariables, addCheckedExceptions): Use size_t
+ instead of uint32 for len parameter.
+
+ * kaffe/kaffevm/classMethod.c,
+ kaffe/kaffevm/classMethod.h: (addInnerClasses) Use size_t
+ instead of uint32 for len parameter.
+
+ * kaffe/kaffevm/code.c,
+ kaffe/kaffevm/code.h: (addCode, addLineNumbers,
+ addLocalVariables, addCheckedExceptions) Use size_t
+ instead of uint32 for len parameter.
+
+2005-03-25 Dalibor Topic <robilad at kaffe.org>
+
+ * kaffe/kaffevm/readClass.c (readAttributes):
+ Cast len to size_t to avoid new warnings on 64 bit platforms.
+
2005-03-25 Wolfgang Baer <WBaer at gmx.de>,
Arnaud Vandyck <avdyk at gnu.org>
Index: kaffe/kaffe/kaffeh/kaffeh-support.h
diff -u kaffe/kaffe/kaffeh/kaffeh-support.h:1.7 kaffe/kaffe/kaffeh/kaffeh-support.h:1.8
--- kaffe/kaffe/kaffeh/kaffeh-support.h:1.7 Mon Mar 29 21:08:30 2004
+++ kaffe/kaffe/kaffeh/kaffeh-support.h Fri Mar 25 22:09:52 2005
@@ -28,10 +28,10 @@
extern void kaffeh_findClass(const char *nm);
/* support.c */
-extern bool addCode(Method* m, uint32 len, classFile* fp, errorInfo *einfo);
-extern bool addLineNumbers(Method* m, uint32 len, classFile* fp, errorInfo *info);
-extern bool addLocalVariables(Method* m, uint32 len, classFile* fp, errorInfo *info);
-extern bool addCheckedExceptions(Method* m, uint32 len, classFile* fp, errorInfo *info);
+extern bool addCode(Method* m, size_t len, classFile* fp, errorInfo *einfo);
+extern bool addLineNumbers(Method* m, size_t len, classFile* fp, errorInfo *info);
+extern bool addLocalVariables(Method* m, size_t len, classFile* fp, errorInfo *info);
+extern bool addCheckedExceptions(Method* m, size_t len, classFile* fp, errorInfo *info);
/* sig.c */
extern const char* translateSig(const char*, const char**, int*);
Index: kaffe/kaffe/kaffeh/support.c
diff -u kaffe/kaffe/kaffeh/support.c:1.47 kaffe/kaffe/kaffeh/support.c:1.48
--- kaffe/kaffe/kaffeh/support.c:1.47 Wed Dec 22 00:22:02 2004
+++ kaffe/kaffe/kaffeh/support.c Fri Mar 25 22:09:52 2005
@@ -270,7 +270,7 @@
}
bool
-addInnerClasses(Hjava_lang_Class* c UNUSED, uint32 len, classFile* fp,
+addInnerClasses(Hjava_lang_Class* c UNUSED, size_t len, classFile* fp,
errorInfo *einfo UNUSED)
{
/* checkBufSize() done in caller. */
@@ -711,7 +711,7 @@
}
bool
-addCode(Method* m, uint32 len, classFile* fp, errorInfo *einfo UNUSED)
+addCode(Method* m, size_t len, classFile* fp, errorInfo *einfo UNUSED)
{
/* Don't try dereferencing m! */
assert(m == (Method*)1);
@@ -722,7 +722,7 @@
}
bool
-addLineNumbers(Method* m, uint32 len, classFile* fp, errorInfo *info UNUSED)
+addLineNumbers(Method* m, size_t len, classFile* fp, errorInfo *info UNUSED)
{
/* Don't try dereferencing m! */
assert(m == (Method*)1);
@@ -733,7 +733,7 @@
}
bool
-addLocalVariables(Method* m, uint32 len, classFile* fp, errorInfo *info UNUSED)
+addLocalVariables(Method* m, size_t len, classFile* fp, errorInfo *info UNUSED)
{
/* Don't try dereferencing m! */
assert(m == (Method*)1);
@@ -744,7 +744,7 @@
}
bool
-addCheckedExceptions(Method* m, uint32 len, classFile* fp,
+addCheckedExceptions(Method* m, size_t len, classFile* fp,
errorInfo *info UNUSED)
{
/* Don't try dereferencing m! */
Index: kaffe/kaffe/kaffevm/classMethod.c
diff -u kaffe/kaffe/kaffevm/classMethod.c:1.138 kaffe/kaffe/kaffevm/classMethod.c:1.139
--- kaffe/kaffe/kaffevm/classMethod.c:1.138 Sun Mar 13 18:14:29 2005
+++ kaffe/kaffe/kaffevm/classMethod.c Fri Mar 25 22:09:52 2005
@@ -1010,7 +1010,7 @@
* Read in InnerClasses declares for a class
*/
bool
-addInnerClasses(Hjava_lang_Class* c, uint32 len UNUSED, classFile* fp,
+addInnerClasses(Hjava_lang_Class* c, size_t len UNUSED, classFile* fp,
errorInfo *einfo)
{
int i;
Index: kaffe/kaffe/kaffevm/classMethod.h
diff -u kaffe/kaffe/kaffevm/classMethod.h:1.78 kaffe/kaffe/kaffevm/classMethod.h:1.79
--- kaffe/kaffe/kaffevm/classMethod.h:1.78 Fri Mar 11 16:41:52 2005
+++ kaffe/kaffe/kaffevm/classMethod.h Fri Mar 25 22:09:52 2005
@@ -523,7 +523,7 @@
Hjava_lang_Class* setupClass(Hjava_lang_Class*, constIndex,
constIndex, u2, Hjava_lang_ClassLoader*, errorInfo*);
bool addSourceFile(Hjava_lang_Class* c, int idx, errorInfo*);
-bool addInnerClasses(Hjava_lang_Class* c, uint32 len, struct classFile* fp, errorInfo *info);
+bool addInnerClasses(Hjava_lang_Class* c, size_t len, struct classFile* fp, errorInfo *info);
int startMethods(Hjava_lang_Class*, u2 methct, errorInfo*);
Method* addMethod(Hjava_lang_Class*, u2 access_flags,
u2 name_index, u2 signature_index, errorInfo*);
Index: kaffe/kaffe/kaffevm/code.c
diff -u kaffe/kaffe/kaffevm/code.c:1.18 kaffe/kaffe/kaffevm/code.c:1.19
--- kaffe/kaffe/kaffevm/code.c:1.18 Fri Dec 17 17:47:35 2004
+++ kaffe/kaffe/kaffevm/code.c Fri Mar 25 22:09:53 2005
@@ -25,7 +25,7 @@
#include "exception.h"
bool
-addCode(Method* m, uint32 len UNUSED, classFile* fp, errorInfo *einfo)
+addCode(Method* m, size_t len UNUSED, classFile* fp, errorInfo *einfo)
{
bool retval = false;
Code c;
@@ -127,7 +127,7 @@
* Read in line numbers assocated with code.
*/
bool
-addLineNumbers(Method* m, uint32 len UNUSED, classFile* fp, errorInfo *info)
+addLineNumbers(Method* m, size_t len UNUSED, classFile* fp, errorInfo *info)
{
lineNumbers* lines;
int i;
@@ -170,7 +170,7 @@
}
bool
-addLocalVariables(Method *m, uint32 len UNUSED, classFile *fp, errorInfo *info)
+addLocalVariables(Method *m, size_t len UNUSED, classFile *fp, errorInfo *info)
{
constants *pool = CLASS_CONSTANTS(m->class);
localVariables *lv;
@@ -239,7 +239,7 @@
* Read in (checked) exceptions declared for a method
*/
bool
-addCheckedExceptions(Method* m, uint32 len UNUSED, classFile* fp,
+addCheckedExceptions(Method* m, size_t len UNUSED, classFile* fp,
errorInfo *info)
{
int i;
Index: kaffe/kaffe/kaffevm/code.h
diff -u kaffe/kaffe/kaffevm/code.h:1.6 kaffe/kaffe/kaffevm/code.h:1.7
--- kaffe/kaffe/kaffevm/code.h:1.6 Mon Mar 8 21:21:08 2004
+++ kaffe/kaffe/kaffevm/code.h Fri Mar 25 22:09:53 2005
@@ -52,13 +52,13 @@
struct _methods;
struct classFile;
-bool addCode(struct _methods*, uint32, struct classFile*,
+bool addCode(struct _methods*, size_t, struct classFile*,
errorInfo *info);
-bool addLineNumbers(struct _methods*, uint32, struct classFile*,
+bool addLineNumbers(struct _methods*, size_t, struct classFile*,
errorInfo *info);
-bool addLocalVariables(struct _methods*, uint32, struct classFile *,
+bool addLocalVariables(struct _methods*, size_t, struct classFile *,
errorInfo *info);
-bool addCheckedExceptions(struct _methods*, uint32,
+bool addCheckedExceptions(struct _methods*, size_t,
struct classFile*, errorInfo *info);
#endif
Index: kaffe/kaffe/kaffevm/readClass.c
diff -u kaffe/kaffe/kaffevm/readClass.c:1.23 kaffe/kaffe/kaffevm/readClass.c:1.24
--- kaffe/kaffe/kaffevm/readClass.c:1.23 Mon Dec 20 02:12:53 2004
+++ kaffe/kaffe/kaffevm/readClass.c Fri Mar 25 22:09:53 2005
@@ -236,21 +236,21 @@
);
if (utf8ConstEqual(name, Code_name)
&& (thingType == READATTR_METHOD)) {
- if (! addCode((Method*)thing, len, fp, einfo)) {
+ if (! addCode((Method*)thing, (size_t) len, fp, einfo)) {
return false;
}
}
else if (utf8ConstEqual(name, LineNumberTable_name)
&& (thingType == READATTR_METHOD)) {
if (!addLineNumbers((Method*)thing,
- len, fp, einfo)) {
+ (size_t) len, fp, einfo)) {
return false;
}
}
else if (utf8ConstEqual(name, LocalVariableTable_name)
&& (thingType == READATTR_METHOD)) {
if (!addLocalVariables((Method*)thing,
- len, fp, einfo)) {
+ (size_t) len, fp, einfo)) {
return false;
}
}
@@ -262,7 +262,7 @@
else if (utf8ConstEqual(name, Exceptions_name)
&& (thingType == READATTR_METHOD)) {
if (!addCheckedExceptions((Method*)thing,
- len, fp, einfo)) {
+ (size_t) len, fp, einfo)) {
return false;
}
}
@@ -276,7 +276,7 @@
else if (utf8ConstEqual(name, InnerClasses_name)
&& (thingType == READATTR_CLASS)) {
if(! addInnerClasses((Hjava_lang_Class*)thing,
- len, fp, einfo)) {
+ (size_t) len, fp, einfo)) {
return false;
}
}
More information about the kaffe
mailing list