diff options
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/java/class.c | 8 | ||||
| -rw-r--r-- | gcc/java/expr.c | 4 | ||||
| -rw-r--r-- | gcc/java/jcf-io.c | 2 | ||||
| -rw-r--r-- | gcc/java/jcf-parse.c | 2 | ||||
| -rw-r--r-- | gcc/java/verify-impl.c | 8 |
6 files changed, 23 insertions, 11 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 4b1c9ec..fab3bab 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,13 @@ +2007-07-25 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * class.c (java_treetreehash_hash, java_treetreehash_compare): + Constify. + * expr.c (type_assertion_eq): Likewise. + * jcf-io.c (compare_path): Likewise. + * jcf-parse.c (cmpstringp): Likewise. + * verify-impl.c (get_one_type, compute_argument_types, + compute_return_type): Likewise. + 2007-07-16 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> PR target/32462 diff --git a/gcc/java/class.c b/gcc/java/class.c index 9038121..97d9ba1 100644 --- a/gcc/java/class.c +++ b/gcc/java/class.c @@ -3048,15 +3048,17 @@ static int java_treetreehash_compare (const void *, const void *); static hashval_t java_treetreehash_hash (const void *k_p) { - struct treetreehash_entry *k = (struct treetreehash_entry *) k_p; + const struct treetreehash_entry *const k + = (const struct treetreehash_entry *) k_p; return JAVA_TREEHASHHASH_H (k->key); } static int java_treetreehash_compare (const void * k1_p, const void * k2_p) { - struct treetreehash_entry * k1 = (struct treetreehash_entry *) k1_p; - tree k2 = (tree) k2_p; + const struct treetreehash_entry *const k1 + = (const struct treetreehash_entry *) k1_p; + const_tree const k2 = (const_tree) k2_p; return (k1->key == k2); } diff --git a/gcc/java/expr.c b/gcc/java/expr.c index 81bf8bd..db15062 100644 --- a/gcc/java/expr.c +++ b/gcc/java/expr.c @@ -419,8 +419,8 @@ pop_type (tree type) static int type_assertion_eq (const void * k1_p, const void * k2_p) { - type_assertion k1 = *(type_assertion *)k1_p; - type_assertion k2 = *(type_assertion *)k2_p; + const type_assertion k1 = *(const type_assertion *)k1_p; + const type_assertion k2 = *(const type_assertion *)k2_p; return (k1.assertion_code == k2.assertion_code && k1.op1 == k2.op1 && k1.op2 == k2.op2); diff --git a/gcc/java/jcf-io.c b/gcc/java/jcf-io.c index 10de9d2..3a5018ac 100644 --- a/gcc/java/jcf-io.c +++ b/gcc/java/jcf-io.c @@ -293,7 +293,7 @@ static int compare_path (const void *key, const void *entry) { return strcmp ((const char *) key, - (*((const struct dirent **) entry))->d_name); + (*((const struct dirent *const*) entry))->d_name); } /* Returns nonzero if ENTRY names a .java or .class file. */ diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c index 9411119..196a7e9 100644 --- a/gcc/java/jcf-parse.c +++ b/gcc/java/jcf-parse.c @@ -166,7 +166,7 @@ cmpstringp (const void *p1, const void *p2) pointers to char", but strcmp() arguments are "pointers to char", hence the following cast plus dereference */ - return strcmp(*(char **) p1, *(char **) p2); + return strcmp(*(const char *const*) p1, *(const char *const*) p2); } /* Create an array of strings, one for each source file that we've diff --git a/gcc/java/verify-impl.c b/gcc/java/verify-impl.c index 886dfe7..1efcf68 100644 --- a/gcc/java/verify-impl.c +++ b/gcc/java/verify-impl.c @@ -2078,8 +2078,8 @@ check_method_constant (int index, bool is_interface, method_name, method_signature); } -static char * -get_one_type (char *p, type *t) +static const char * +get_one_type (const char *p, type *t) { const char *start = p; vfy_jclass k; @@ -2131,7 +2131,7 @@ static void compute_argument_types (vfy_string signature, type *types) { int i; - char *p = (char *) vfy_string_bytes (signature); + const char *p = vfy_string_bytes (signature); /* Skip `('. */ ++p; @@ -2144,7 +2144,7 @@ compute_argument_types (vfy_string signature, type *types) static type compute_return_type (vfy_string signature) { - char *p = (char *) vfy_string_bytes (signature); + const char *p = vfy_string_bytes (signature); type t; while (*p != ')') ++p; |