FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

link.cc (_Jv_Linker::print_class_loaded): Declare string constants as "const char *".

Browse source 
2006-02-08  Bryce McKinlay  <mckinlay@redhat.com>

	* 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.

From-SVN: r110767
This commit is contained in:
Bryce McKinlay 2006-02-08 20:38:13 +00:00 • committed by Bryce McKinlay
parent 8b1753e3ec
commit 2cf94e58cb
10 changed files with 48 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libjava/defineclass.cc
View file

@ -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));
}