2000-11-11 Anthony Green <green@redhat.com>

	* jcf-parse.c (process_zip_dir): Add finput parameter.
	(jcf_figure_file_type): Call process_zip_dir with appropriate
	argument.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37390 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 0a59c097d0cd061d806f5ea9fdd2e4df4f8fba25..195794483bb49fef7be3cc60893c8c53dc71c374 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-11  Anthony Green  <green@redhat.com>
+
+       * jcf-parse.c (process_zip_dir): Add finput parameter.
+       (jcf_figure_file_type): Call process_zip_dir with appropriate
+       argument.
+
 2000-11-10  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        * decl.c (copy_lang_decl): Use memcpy, not bcopy.

diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index be9e7b958faff53633e3da467745c199a03daba6..82c92ee19462a9f619458e76832ade4f2b07ee50 100644 (file)
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -82,7 +82,7 @@ static struct JCF main_jcf[1];
 /* Declarations of some functions used here.  */
 static tree give_name_to_class PARAMS ((JCF *jcf, int index));
 static void parse_zip_file_entries PARAMS ((void));
-static void process_zip_dir PARAMS ((void));
+static void process_zip_dir PARAMS ((FILE *));
 static void parse_source_file PARAMS ((tree, FILE *));
 static void jcf_parse_source PARAMS ((void));
 static int jcf_figure_file_type PARAMS ((JCF *));
@@ -965,7 +965,8 @@ parse_zip_file_entries (void)
 /* Read all the entries of the zip file, creates a class and a JCF. Sets the
    jcf up for further processing and link it to the created class.  */
 
-static void process_zip_dir()
+static void
+process_zip_dir (FILE *finput)
 {
   int i;
   ZipDirectory *zdir;
@@ -1070,7 +1071,8 @@ DEFUN(jcf_figure_file_type, (jcf),
     {
       localToFile = ALLOC (sizeof (struct ZipFileCache));
       memcpy (localToFile, SeenZipFiles, sizeof (struct ZipFileCache));
-      process_zip_dir ();      /* Register all the class defined there */
+      /* Register all the class defined there.  */
+      process_zip_dir (jcf->read_state);
       return JCF_ZIP;
     }