jcf-dump.c (main): Fix error message.

	* jcf-dump.c (main):  Fix error message.
	* jcf-path.c (add_entry):  Style fix.

From-SVN: r24073

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index c597e10af81d8379d0f263a9aa6958a9b6546d55..a6740d7131cef2aff1b9ed9bef79f53c4c65f62e 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec  3 15:08:30 1998  Per Bothner  <bothner@cygnus.com>
+
+       * jcf-dump.c (main):  Fix error message.
+       * jcf-path.c (add_entry):  Style fix.
+
 Wed Dec  2 15:52:25 1998  Alexandre Petit-Bianco  <apbianco@cygnus.com>
 
        * class.c (layout_class_method): Call build_java_argument_signature

diff --git a/gcc/java/jcf-dump.c b/gcc/java/jcf-dump.c
index 1f01c6d08389f5e11812f38a5c7dbea389d7d1d1..40ad9d9afc6a9d097e5216b3b3d9cb7d2b8b8d58 100644 (file)
--- a/gcc/java/jcf-dump.c
+++ b/gcc/java/jcf-dump.c
@@ -820,7 +820,7 @@ DEFUN(main, (argc, argv),
                    break;  /* got to central directory */
                  if (magic != 0x04034b50) /* ZIPMAGIC (little-endian) */
                    {
-                     fprintf (stderr, "bad format of .zip archine\n");
+                     fprintf (stderr, "bad format of .zip/.jar archive\n");
                      exit (FATAL_EXIT_CODE);
                    }
                  JCF_FILL (jcf, 26);

diff --git a/gcc/java/jcf-path.c b/gcc/java/jcf-path.c
index 81da01517b8114b780d5aef107bd1a0d3839e82a..13fed50ca8cc83167c48dac7212b1fe1c7f10a55 100644 (file)
--- a/gcc/java/jcf-path.c
+++ b/gcc/java/jcf-path.c
@@ -141,8 +141,8 @@ add_entry (entp, filename, is_system)
   n->next = NULL;
 
   len = strlen (filename);
-  if (len > 4 && (! strcmp (filename + len - 4, ".zip")
-                 || ! strcmp (filename + len - 4, ".jar")))
+  if (len > 4 && (strcmp (filename + len - 4, ".zip") == 0
+                 || strcmp (filename + len - 4, ".jar") == 0))
     {
       n->flags |= FLAG_ZIP;
       /* If the user uses -classpath then he'll have to include