PatchSet 7752
Date: 2008/02/15 18:59:32
Author: robilad
Branch: HEAD
Tag: (none)
Log:
removed openJarFile function
2008-02-15 Dalibor Topic <[EMAIL PROTECTED]>
* kaffe/kaffevm/jar.h, kaffe/kaffevm/jar.c (openJarFile): Removed.
* libraries/clib/zip/ZipFile.c (java_util_zip_ZipFile_openZipFile0),
kaffe/kaffevm/findInJar.c (findClassInJar),
kaffe/kaffeh/support.c (kaffeh_findClass): Use zzip_opendir directly.
Members:
ChangeLog:1.5252->1.5253
kaffe/kaffeh/support.c:1.58->1.59
kaffe/kaffevm/findInJar.c:1.78->1.79
kaffe/kaffevm/jar.c:1.45->1.46
kaffe/kaffevm/jar.h:1.11->1.12
libraries/clib/zip/ZipFile.c:1.2->1.3
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5252 kaffe/ChangeLog:1.5253
--- kaffe/ChangeLog:1.5252 Fri Feb 15 01:50:44 2008
+++ kaffe/ChangeLog Fri Feb 15 18:59:32 2008
@@ -1,5 +1,13 @@
2008-02-15 Dalibor Topic <[EMAIL PROTECTED]>
+ * kaffe/kaffevm/jar.h, kaffe/kaffevm/jar.c (openJarFile): Removed.
+
+ * libraries/clib/zip/ZipFile.c (java_util_zip_ZipFile_openZipFile0),
+ kaffe/kaffevm/findInJar.c (findClassInJar),
+ kaffe/kaffeh/support.c (kaffeh_findClass): Use zzip_opendir directly.
+
+2008-02-15 Dalibor Topic <[EMAIL PROTECTED]>
+
* TODO: Updated.
2008-02-15 Dalibor Topic <[EMAIL PROTECTED]>
Index: kaffe/kaffe/kaffeh/support.c
diff -u kaffe/kaffe/kaffeh/support.c:1.58 kaffe/kaffe/kaffeh/support.c:1.59
--- kaffe/kaffe/kaffeh/support.c:1.58 Tue Jan 22 14:41:00 2008
+++ kaffe/kaffe/kaffeh/support.c Fri Feb 15 18:59:34 2008
@@ -33,6 +33,8 @@
#include <sys/types.h>
#endif /* defined(HAVE_SYS_TYPES_H) */
+#include <zzip/zzip.h>
+
#if defined(__WIN32__) || defined (__amigaos__)
#define PATHSEP ';'
#else
@@ -868,7 +870,7 @@
Hjava_lang_Class tmpClass;
/* JAR file */
- jfile = openJarFile(superName);
+ jfile = zzip_opendir(superName);
if (jfile == 0) {
continue;
}
Index: kaffe/kaffe/kaffevm/findInJar.c
diff -u kaffe/kaffe/kaffevm/findInJar.c:1.78
kaffe/kaffe/kaffevm/findInJar.c:1.79
--- kaffe/kaffe/kaffevm/findInJar.c:1.78 Mon Jan 21 02:03:32 2008
+++ kaffe/kaffe/kaffevm/findInJar.c Fri Feb 15 18:59:35 2008
@@ -41,6 +41,8 @@
#include <sys/types.h>
#endif /* defined(HAVE_SYS_TYPES_H) */
+#include <zzip/zzip.h>
+
#ifdef __riscos__
#include <unixlib/local.h>
#endif
@@ -216,7 +218,7 @@
DBG(CLASSLOOKUP, dprintf("Opening JAR file %s for %s\n", ptr->path,
cname); );
if (ptr->u.jar == 0) {
- ptr->u.jar = openJarFile(ptr->path);
+ ptr->u.jar = zzip_opendir(ptr->path);
if (ptr->u.jar == 0) {
break;
}
Index: kaffe/kaffe/kaffevm/jar.c
diff -u kaffe/kaffe/kaffevm/jar.c:1.45 kaffe/kaffe/kaffevm/jar.c:1.46
--- kaffe/kaffe/kaffevm/jar.c:1.45 Mon Jan 21 01:04:37 2008
+++ kaffe/kaffe/kaffevm/jar.c Fri Feb 15 18:59:35 2008
@@ -40,11 +40,6 @@
return -1;
}
-ZZIP_DIR *openJarFile(zzip_char_t *name)
-{
- return zzip_opendir(name);
-}
-
void closeJarFile(ZZIP_DIR *jf)
{
zzip_closedir(jf);
Index: kaffe/kaffe/kaffevm/jar.h
diff -u kaffe/kaffe/kaffevm/jar.h:1.11 kaffe/kaffe/kaffevm/jar.h:1.12
--- kaffe/kaffe/kaffevm/jar.h:1.11 Mon Jan 21 01:04:37 2008
+++ kaffe/kaffe/kaffevm/jar.h Fri Feb 15 18:59:35 2008
@@ -20,13 +20,6 @@
#include <zzip/zzip.h>
/**
- * Attempt to open the given JAR file.
- *
- * @param filename The full path to JAR file on the file system.
- * @return A zip dir structure or NULL if something went wrong.
- */
-ZZIP_DIR *openJarFile(zzip_char_t *filename);
-/**
* Close a jarFile structure that was created with openJarFile.
*
* @param jf The jarFile structure as returned by openJarFile.
Index: kaffe/libraries/clib/zip/ZipFile.c
diff -u kaffe/libraries/clib/zip/ZipFile.c:1.2
kaffe/libraries/clib/zip/ZipFile.c:1.3
--- kaffe/libraries/clib/zip/ZipFile.c:1.2 Thu Jan 31 20:49:47 2008
+++ kaffe/libraries/clib/zip/ZipFile.c Fri Feb 15 18:59:35 2008
@@ -53,7 +53,7 @@
char* str;
str = checkPtr(stringJava2C(fname));
- zip = openJarFile(str);
+ zip = zzip_opendir(str);
gc_free(str);
return ((struct Horg_kaffe_util_Ptr*)zip);
}
_______________________________________________
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
