PatchSet 7753 Date: 2008/02/15 19:10:37 Author: robilad Branch: HEAD Tag: (none) Log: removed closeJarFile function
2008-02-15 Dalibor Topic <[EMAIL PROTECTED]> * kaffe/kaffevm/jar.h, kaffe/kaffevm/jar.c (closeJarFile): Removed. * libraries/clib/zip/ZipFile.c (java_util_zip_ZipFile_closeZipFile0), kaffe/kaffeh/support.c (kaffeh_findClass): Use zzip_closedir directly. Members: ChangeLog:1.5253->1.5254 kaffe/kaffeh/support.c:1.59->1.60 kaffe/kaffevm/jar.c:1.46->1.47 kaffe/kaffevm/jar.h:1.12->1.13 libraries/clib/zip/ZipFile.c:1.3->1.4 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.5253 kaffe/ChangeLog:1.5254 --- kaffe/ChangeLog:1.5253 Fri Feb 15 18:59:32 2008 +++ kaffe/ChangeLog Fri Feb 15 19:10:37 2008 @@ -1,5 +1,12 @@ 2008-02-15 Dalibor Topic <[EMAIL PROTECTED]> + * kaffe/kaffevm/jar.h, kaffe/kaffevm/jar.c (closeJarFile): Removed. + + * libraries/clib/zip/ZipFile.c (java_util_zip_ZipFile_closeZipFile0), + kaffe/kaffeh/support.c (kaffeh_findClass): Use zzip_closedir directly. + +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), Index: kaffe/kaffe/kaffeh/support.c diff -u kaffe/kaffe/kaffeh/support.c:1.59 kaffe/kaffe/kaffeh/support.c:1.60 --- kaffe/kaffe/kaffeh/support.c:1.59 Fri Feb 15 18:59:34 2008 +++ kaffe/kaffe/kaffeh/support.c Fri Feb 15 19:10:39 2008 @@ -880,13 +880,13 @@ jentry = lookupJarFile(jfile, superName); if (jentry == 0) { - closeJarFile(jfile); + zzip_closedir(jfile); continue; } buf = getDataJarFile(jentry); if (buf == NULL) { - closeJarFile(jfile); + zzip_closedir(jfile); continue; } @@ -908,7 +908,7 @@ hand.type = CP_INVALID; free(buf); - closeJarFile(jfile); + zzip_closedir(jfile); return; } } Index: kaffe/kaffe/kaffevm/jar.c diff -u kaffe/kaffe/kaffevm/jar.c:1.46 kaffe/kaffe/kaffevm/jar.c:1.47 --- kaffe/kaffe/kaffevm/jar.c:1.46 Fri Feb 15 18:59:35 2008 +++ kaffe/kaffe/kaffevm/jar.c Fri Feb 15 19:10:39 2008 @@ -40,11 +40,6 @@ return -1; } -void closeJarFile(ZZIP_DIR *jf) -{ - zzip_closedir(jf); -} - ZZIP_FILE *lookupJarFile(ZZIP_DIR *jf, zzip_char_t *entry_name) { return zzip_file_open(jf, entry_name, 0); Index: kaffe/kaffe/kaffevm/jar.h diff -u kaffe/kaffe/kaffevm/jar.h:1.12 kaffe/kaffe/kaffevm/jar.h:1.13 --- kaffe/kaffe/kaffevm/jar.h:1.12 Fri Feb 15 18:59:35 2008 +++ kaffe/kaffe/kaffevm/jar.h Fri Feb 15 19:10:40 2008 @@ -20,12 +20,6 @@ #include <zzip/zzip.h> /** - * Close a jarFile structure that was created with openJarFile. - * - * @param jf The jarFile structure as returned by openJarFile. - */ -void closeJarFile(ZZIP_DIR *jf); -/** * Lookup a file stored in the given jarFile. * * @param jf The jarFile in which to search for the given file. Index: kaffe/libraries/clib/zip/ZipFile.c diff -u kaffe/libraries/clib/zip/ZipFile.c:1.3 kaffe/libraries/clib/zip/ZipFile.c:1.4 --- kaffe/libraries/clib/zip/ZipFile.c:1.3 Fri Feb 15 18:59:35 2008 +++ kaffe/libraries/clib/zip/ZipFile.c Fri Feb 15 19:10:40 2008 @@ -61,7 +61,7 @@ void java_util_zip_ZipFile_closeZipFile0(struct Horg_kaffe_util_Ptr* zip) { - closeJarFile((ZZIP_DIR*)zip); + zzip_closedir((ZZIP_DIR*)zip); } jint _______________________________________________ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe