[kaffe] CVS kaffe (robilad): Warning fixes for findInJar
Kaffe CVS
cvs-commits at kaffe.org
Wed Aug 10 12:54:43 PDT 2005
PatchSet 6808
Date: 2005/08/10 19:29:24
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Warning fixes for findInJar
2005-08-09 Andreas Tobler <a.tobler at schweiz.ch>
* kaffe/kaffevm/findInJar.c (findClassInJar CP_ZIPFILE): Fix data type
to avoid compiler signedness warnings.
(findClassInJar CP_DIR): Likewise.
(getManifestMainAttribute): Change to char* to fix compiler warnings.
Members:
ChangeLog:1.4333->1.4334
kaffe/kaffevm/findInJar.c:1.68->1.69
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4333 kaffe/ChangeLog:1.4334
--- kaffe/ChangeLog:1.4333 Wed Aug 10 19:15:54 2005
+++ kaffe/ChangeLog Wed Aug 10 19:29:24 2005
@@ -1,5 +1,12 @@
2005-08-09 Andreas Tobler <a.tobler at schweiz.ch>
+ * kaffe/kaffevm/findInJar.c (findClassInJar CP_ZIPFILE): Fix data type
+ to avoid compiler signedness warnings.
+ (findClassInJar CP_DIR): Likewise.
+ (getManifestMainAttribute): Change to char* to fix compiler warnings.
+
+2005-08-09 Andreas Tobler <a.tobler at schweiz.ch>
+
* libraries/clib/net/PlainDatagramSocketImpl.c
(gnu_java_net_PlainDatagramSocketImpl_send0): Initialize alen.
(gnu_java_net_PlainDatagramSocketImpl_socketGetOption): Likewise for r.
Index: kaffe/kaffe/kaffevm/findInJar.c
diff -u kaffe/kaffe/kaffevm/findInJar.c:1.68 kaffe/kaffe/kaffevm/findInJar.c:1.69
--- kaffe/kaffe/kaffevm/findInJar.c:1.68 Mon May 30 08:54:26 2005
+++ kaffe/kaffe/kaffevm/findInJar.c Wed Aug 10 19:29:35 2005
@@ -66,7 +66,7 @@
#if defined(HANDLE_MANIFEST_CLASSPATH)
static int isEntryInClasspath(const char*);
-static uint8* getManifestMainAttribute(jarFile*, const char*);
+static char* getManifestMainAttribute(jarFile*, const char*);
static void handleManifestClassPath (classpathEntry *);
#endif
@@ -207,7 +207,7 @@
case CP_ZIPFILE:
{
jarEntry* entry;
- char* data;
+ unsigned char* data;
DBG(CLASSLOOKUP, dprintf("Opening JAR file %s for %s\n", ptr->path, cname); );
if (ptr->u.jar == 0) {
@@ -253,8 +253,8 @@
case CP_DIR:
{
struct stat sbuf;
- char* data;
-
+ unsigned char* data;
+
buf = checkPtr(KMALLOC(strlen(ptr->path)
+ strlen(file_separator) + strlen(cname) + 1));
sprintf(buf, "%s%s%s",
@@ -622,13 +622,13 @@
}
-static uint8*
+static char*
getManifestMainAttribute(jarFile* file, const char* attrName)
{
jarEntry* mf;
- uint8* mfdata;
- uint8* attrEntry;
- uint8* ret;
+ char* mfdata;
+ char* attrEntry;
+ char* ret;
size_t i;
int posAttrValue;
@@ -638,7 +638,7 @@
return (NULL);
/* Read it */
- mfdata = getDataJarFile(file, mf);
+ mfdata = (char*)getDataJarFile(file, mf);
if (mfdata == 0)
return (NULL);
More information about the kaffe
mailing list