aboutsummaryrefslogtreecommitdiff
path: root/gcc/java/jcf-io.c
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2008-06-24 12:46:59 +0000
committerTom Tromey <tromey@gcc.gnu.org>2008-06-24 12:46:59 +0000
commitf02a84d9bea57d5ea8bc688a52c4ad568811d0e3 (patch)
tree354f09c5b595364bbe3a120012deb913cb611a72 /gcc/java/jcf-io.c
parentf9993944a43c65e41b64d93b5a1cb9f2e9160a94 (diff)
downloadgcc-f02a84d9bea57d5ea8bc688a52c4ad568811d0e3.zip
gcc-f02a84d9bea57d5ea8bc688a52c4ad568811d0e3.tar.gz
gcc-f02a84d9bea57d5ea8bc688a52c4ad568811d0e3.tar.bz2
jcf-path.c (jcf_path_init): Don't name variable 'try'.
* jcf-path.c (jcf_path_init): Don't name variable 'try'. * expr.c (add_type_assertion): Rename argument. (build_java_arrayaccess): Don't name variable 'throw'. (ARRAY_NEW_MULTI): Don't name variable 'class'. * jcf-io.c (find_class): Don't name variable 'class'. * mangle.c (compression_table_add): Don't name variable 'new'. * constants.c (cpool_for_class): Rename argument. (alloc_constant_fieldref): Likewise. * jcf-parse.c (handle_innerclass_attribute): Don't name variable 'class'. (read_class): Likewise. (parse_zip_file_entries): Likewise. (process_zip_dir): Likewise. * decl.c (java_mark_class_local): Rename argument. * class.c (GEN_TABLE): Use type_name, not typename. (gen_indirect_dispatch_tables): Likewise. (add_field): Rename argument. (is_compiled_class): Likewise. (safe_layout_class): Likewise. (emit_assertion_table): Likewise. * typeck.c (has_method): Rename argument. From-SVN: r137069
Diffstat (limited to 'gcc/java/jcf-io.c')
-rw-r--r--gcc/java/jcf-io.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/gcc/java/jcf-io.c b/gcc/java/jcf-io.c
index fb8f756..5212097 100644
--- a/gcc/java/jcf-io.c
+++ b/gcc/java/jcf-io.c
@@ -1,6 +1,6 @@
/* Utility routines for finding and reading Java(TM) .class files.
Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2005,
- 2006, 2007 Free Software Foundation, Inc.
+ 2006, 2007, 2008 Free Software Foundation, Inc.
This file is part of GCC.
@@ -448,7 +448,7 @@ const char *
find_class (const char *classname, int classname_length, JCF *jcf)
{
int fd;
- int i, k, class = -1;
+ int i, k, klass = -1;
struct stat class_buf;
char *dep_file;
void *entry;
@@ -478,7 +478,7 @@ find_class (const char *classname, int classname_length, JCF *jcf)
for (entry = jcf_path_start (); entry != NULL; entry = jcf_path_next (entry))
{
const char *path_name = jcf_path_name (entry);
- if (class != 0)
+ if (klass != 0)
{
int dir_len;
@@ -521,12 +521,12 @@ find_class (const char *classname, int classname_length, JCF *jcf)
else
continue;
}
- class = caching_stat(buffer, &class_buf);
+ klass = caching_stat(buffer, &class_buf);
}
}
dep_file = buffer;
- if (!class)
+ if (!klass)
{
SOURCE_FRONTEND_DEBUG ((stderr, "[Class selected: %s]\n",
classname+classname_length-