From de83d4725adf72fb9808b30a01a5c4ec05ae8a51 Mon Sep 17 00:00:00 2001 From: bryce Date: Wed, 8 Feb 2006 20:38:13 +0000 Subject: 2006-02-08 Bryce McKinlay * link.cc (_Jv_Linker::print_class_loaded): Declare string constants as "const char *". * verify.cc (verify_fail): Likewise. * gnu/classpath/natSystemProperties.cc (file_encoding): Likewise. * interpret.cc (throw_internal_error, throw_class_format_error): Likewise. * gcj/javaprims.h (_Jv_hashUtf8String, _Jv_Utf8Const::space_needed, _Jv_Utf8Const::init, _Jv_makeUtf8Const): Likewise. * java/lang/Class.h (_Jv_InitPrimClass): Likewise. * include/jvm.h (_Jv_strLengthUtf8, _Jv_makeUtf8Const): Likewise. * defineclass.cc (throw_internal_error, throw_no_class_def_found_error, is_attribute_name): Likewise. * prims.cc (_Jv_strLengthUtf8, _Jv_hashUtf8String, _Jv_Utf8Const::init, _Jv_makeUtf8Const, _Jv_InitPrimClass): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@110767 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/defineclass.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'libjava/defineclass.cc') diff --git a/libjava/defineclass.cc b/libjava/defineclass.cc index c15cc2265d6..03d73a2c266 100644 --- a/libjava/defineclass.cc +++ b/libjava/defineclass.cc @@ -47,11 +47,11 @@ using namespace gcj; // these go in some separate functions, to avoid having _Jv_InitClass // inserted all over the place. -static void throw_internal_error (char *msg) +static void throw_internal_error (const char *msg) __attribute__ ((__noreturn__)); static void throw_no_class_def_found_error (jstring msg) __attribute__ ((__noreturn__)); -static void throw_no_class_def_found_error (char *msg) +static void throw_no_class_def_found_error (const char *msg) __attribute__ ((__noreturn__)); static void throw_class_format_error (jstring msg) __attribute__ ((__noreturn__)); @@ -258,10 +258,10 @@ struct _Jv_ClassReader void read_one_method_attribute (int method); void read_one_code_attribute (int method); void read_one_field_attribute (int field); - void throw_class_format_error (char *msg); + void throw_class_format_error (const char *msg); /** check an utf8 entry, without creating a Utf8Const object */ - bool is_attribute_name (int index, char *name); + bool is_attribute_name (int index, const char *name); /** here goes the class-loader members defined out-of-line */ void handleConstantPool (); @@ -469,7 +469,7 @@ void _Jv_ClassReader::read_fields () } bool -_Jv_ClassReader::is_attribute_name (int index, char *name) +_Jv_ClassReader::is_attribute_name (int index, const char *name) { check_tag (index, JV_CONSTANT_Utf8); int len = get2u (bytes+offsets[index]); @@ -1418,7 +1418,7 @@ void _Jv_ClassReader::handleMethodsEnd () } } -void _Jv_ClassReader::throw_class_format_error (char *msg) +void _Jv_ClassReader::throw_class_format_error (const char *msg) { jstring str; if (def->name != NULL) @@ -1460,7 +1460,7 @@ throw_no_class_def_found_error (jstring msg) } static void -throw_no_class_def_found_error (char *msg) +throw_no_class_def_found_error (const char *msg) { throw_no_class_def_found_error (JvNewStringLatin1 (msg)); } @@ -1474,7 +1474,7 @@ throw_class_format_error (jstring msg) } static void -throw_internal_error (char *msg) +throw_internal_error (const char *msg) { throw new java::lang::InternalError (JvNewStringLatin1 (msg)); } -- cgit v1.2.3