summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/java/ChangeLog5
-rw-r--r--gcc/java/jcf-dump.c2
-rw-r--r--gcc/java/jcf-path.c4
3 files changed, 8 insertions, 3 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index c597e10af81..a6740d7131c 100644
--- 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 1f01c6d0838..40ad9d9afc6 100644
--- 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 81da01517b8..13fed50ca8c 100644
--- 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