You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ib...@apache.org on 2008/08/31 01:13:00 UTC
svn commit: r690604 - in /harmony/enhanced/drlvm/trunk/vm:
gc_gen/src/verify/ include/open/ port/src/crash_handler/ port/src/logger/
thread/src/ vmcore/include/ vmcore/src/exception/ vmcore/src/init/
vmcore/src/jit/ vmcore/src/jni/ vmcore/src/jvmti/ vm...
Author: iberezhn
Date: Sat Aug 30 16:12:59 2008
New Revision: 690604
URL: http://svn.apache.org/viewvc?rev=690604&view=rev
Log:
Fixed large amount of warnings appeared on GCC 4.3.1:
'warning: deprecated conversion from string constant to 'char*''
Modified:
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_common.cpp
harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_common.h
harmony/enhanced/drlvm/trunk/vm/include/open/hythread.h
harmony/enhanced/drlvm/trunk/vm/port/src/crash_handler/stack_dump.cpp
harmony/enhanced/drlvm/trunk/vm/port/src/logger/logger.cpp
harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_fat_monitor.c
harmony/enhanced/drlvm/trunk/vm/thread/src/thread_private.h
harmony/enhanced/drlvm/trunk/vm/vmcore/include/ExpandableMemBlock.h
harmony/enhanced/drlvm/trunk/vm/vmcore/include/exceptions.h
harmony/enhanced/drlvm/trunk/vm/vmcore/include/init.h
harmony/enhanced/drlvm/trunk/vm/vmcore/include/ncai_internal.h
harmony/enhanced/drlvm/trunk/vm/vmcore/include/object_handles.h
harmony/enhanced/drlvm/trunk/vm/vmcore/include/vm_threads.h
harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalize.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalizer_thread.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/ref_enqueue_thread.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_shutdown.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/primitives_support.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_extension.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_general.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/Runtime_lnx.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_lang_management_ThreadMXBeanImpl.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/lil.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_modules.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_registers.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_signals.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_thread.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/object/object_handles.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/verify_stack_enumeration.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/crash_dump.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/natives_support.cpp
harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/vm_stats.cpp
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_common.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_common.cpp?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_common.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_common.cpp Sat Aug 30 16:12:59 2008
@@ -209,7 +209,7 @@
}
}
-void verifier_log_start(char* message)
+void verifier_log_start(const char* message)
{
printf("------------------------------%-16s------------------------------\n", message);
}
@@ -217,7 +217,7 @@
void verifier_collect_kind_log(Heap_Verifier* heap_verifier)
{
GC* gc = heap_verifier->gc;
- char* gc_kind;
+ const char* gc_kind;
if(collect_is_minor()){
gc_kind = " minor collection.";
}else if(collect_is_fallback()){
Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_common.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_common.h?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_common.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/verify/verifier_common.h Sat Aug 30 16:12:59 2008
@@ -77,7 +77,7 @@
Boolean verifier_parse_options(Heap_Verifier* heap_verifier, char* options);
void verifier_log_before_gc(Heap_Verifier* heap_verifier);
void verifier_log_after_gc(Heap_Verifier* heap_verifier);
-void verifier_log_start(char* message);
+void verifier_log_start(const char* message);
Boolean verify_rootset_slot(REF* p_ref, Heap_Verifier* heap_verifier);
Modified: harmony/enhanced/drlvm/trunk/vm/include/open/hythread.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/hythread.h?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/hythread.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/hythread.h Sat Aug 30 16:12:59 2008
@@ -168,7 +168,7 @@
extern HY_CFUNC IDATA VMCALL
hythread_park PROTOTYPE((I_64 millis, IDATA nanos));
extern HY_CFUNC IDATA VMCALL
-hythread_monitor_init_with_name PROTOTYPE((hythread_monitor_t* handle, UDATA flags, char* name));
+hythread_monitor_init_with_name PROTOTYPE((hythread_monitor_t* handle, UDATA flags, const char* name));
extern HY_CFUNC IDATA VMCALL
hythread_monitor_try_enter PROTOTYPE((hythread_monitor_t monitor));
extern HY_CFUNC hythread_t VMCALL
Modified: harmony/enhanced/drlvm/trunk/vm/port/src/crash_handler/stack_dump.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/port/src/crash_handler/stack_dump.cpp?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/port/src/crash_handler/stack_dump.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/port/src/crash_handler/stack_dump.cpp Sat Aug 30 16:12:59 2008
@@ -211,8 +211,8 @@
struct sig_name_t
{
- int num;
- char* name;
+ int num;
+ const char* name;
};
static sig_name_t sig_names[] =
Modified: harmony/enhanced/drlvm/trunk/vm/port/src/logger/logger.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/port/src/logger/logger.cpp?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/port/src/logger/logger.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/port/src/logger/logger.cpp Sat Aug 30 16:12:59 2008
@@ -242,8 +242,8 @@
if (NULL == lang) {
return 0; // out of C heap
}
- char* region = "";
- char* variant = "";
+ char* region = NULL;
+ char* variant = NULL;
char* pos = strchr(lang, '_');
if (pos == NULL) {
@@ -262,7 +262,7 @@
variant++;
set:
- portlib->nls_set_locale(portlib, lang, region, variant);
+ portlib->nls_set_locale(portlib, lang, region ? region : "", variant ? variant : "");
free((void*)lang);
return 1;
}
Modified: harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_fat_monitor.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_fat_monitor.c?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_fat_monitor.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_fat_monitor.c Sat Aug 30 16:12:59 2008
@@ -43,7 +43,7 @@
* @see hythread_monitor_destroy
*
*/
-IDATA VMCALL hythread_monitor_init_with_name(hythread_monitor_t *mon_ptr, UDATA flags, char *name) {
+IDATA VMCALL hythread_monitor_init_with_name(hythread_monitor_t *mon_ptr, UDATA flags, const char *name) {
int r;
hythread_monitor_t mon;
Modified: harmony/enhanced/drlvm/trunk/vm/thread/src/thread_private.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/thread/src/thread_private.h?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/thread/src/thread_private.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/thread/src/thread_private.h Sat Aug 30 16:12:59 2008
@@ -160,7 +160,7 @@
UDATA flags;
- char *name;
+ const char *name;
} HyThreadMonitor;
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/ExpandableMemBlock.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/ExpandableMemBlock.h?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/ExpandableMemBlock.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/ExpandableMemBlock.h Sat Aug 30 16:12:59 2008
@@ -33,7 +33,7 @@
if(m_pBlock)
STD_FREE(m_pBlock);
}
- void AppendBlock(char *szBlock, long nLen = -1){
+ void AppendBlock(const char *szBlock, long nLen = -1){
if(!szBlock)return;
if(nLen <= 0)nLen = (long) strlen(szBlock);
if(!nLen)return;
@@ -47,7 +47,7 @@
memcpy((char*)m_pBlock + m_nCurPos, szBlock, nLen);
m_nCurPos += nLen;
}
- void AppendFormatBlock(char *szfmt, ... ){
+ void AppendFormatBlock(const char *szfmt, ... ){
va_list arg;
//char *buf = (char*)calloc(1024, 1);
char buf[1024];
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/exceptions.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/exceptions.h?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/exceptions.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/exceptions.h Sat Aug 30 16:12:59 2008
@@ -261,7 +261,7 @@
// Print the stack trace stored in the exception object to the given file.
void exn_print_stack_trace(FILE* f, jthrowable exc);
-void print_uncaught_exception_message(FILE *f, char* context_message, jthrowable exc);
+void print_uncaught_exception_message(FILE *f, const char* context_message, jthrowable exc);
//**** Native code exception support
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/init.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/init.h?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/init.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/init.h Sat Aug 30 16:12:59 2008
@@ -22,7 +22,7 @@
jint vm_attach_internal(JNIEnv ** p_jni_env, jthread * java_thread,
JavaVM * java_vm, jobject group,
- char * name, jboolean daemon);
+ const char * name, jboolean daemon);
jint vm_init1(JavaVM_Internal * java_vm, JavaVMInitArgs * vm_arguments);
jint vm_init2(JNIEnv * jni_env);
/**
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/ncai_internal.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/ncai_internal.h?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/ncai_internal.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/ncai_internal.h Sat Aug 30 16:12:59 2008
@@ -18,7 +18,7 @@
typedef struct _NcaiRegisterTableItem
{
- char* name; // Register name
+ const char* name; // Register name
jint size; // Register size in bytes
unsigned offset; // Register offset in NcaiRegisters structure
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/object_handles.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/object_handles.h?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/object_handles.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/object_handles.h Sat Aug 30 16:12:59 2008
@@ -212,7 +212,7 @@
// number_handles - Number of handles to allocate space for
// base_var - LIL variable to hold pointer to base of handles structure
// helper_var - LIL variable to use to initialise structure
-LilCodeStub* oh_gen_allocate_handles(LilCodeStub*, unsigned number_handles, char* base_var, char* helper_var);
+LilCodeStub* oh_gen_allocate_handles(LilCodeStub*, unsigned number_handles, const char* base_var, const char* helper_var);
// Calculate the offset of the base of a previously allocated structure to a particular handle
// The base variable (see oh_gen_allocate_handles) plus this offset is the value to use for the handle
@@ -223,7 +223,7 @@
// handle_indx - Index of handle to initialise
// val - LIL operand for the object reference to use to initialise handle
// null_check - If true check for a managed null and store an unmanaged null instead
-LilCodeStub* oh_gen_init_handle(LilCodeStub*, char* base_var, unsigned handle_indx, char* val, bool null_check);
+LilCodeStub* oh_gen_init_handle(LilCodeStub*, const char* base_var, unsigned handle_indx, const char* val, bool null_check);
//////////////////////////////////////////////////////////////////////////
// 20031218: Needed for old stub code
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/include/vm_threads.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/include/vm_threads.h?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/include/vm_threads.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/include/vm_threads.h Sat Aug 30 16:12:59 2008
@@ -110,7 +110,7 @@
*
* @return <code>int</code>
*/
-IDATA jthread_throw_exception(char* name, char* message);
+IDATA jthread_throw_exception(const char* name, const char* message);
/**
* Throws given exception object. Desides whether current thread is unwindable
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions.cpp?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/exception/exceptions.cpp Sat Aug 30 16:12:59 2008
@@ -657,7 +657,7 @@
//////////////////////////////////////////////////////////////////////////
// Uncaught Exceptions
-void print_uncaught_exception_message(FILE * f, char *context_message,
+void print_uncaught_exception_message(FILE * f, const char *context_message,
jthrowable exc)
{
assert(hythread_is_suspend_enabled());
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalize.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalize.cpp?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalize.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalize.cpp Sat Aug 30 16:12:59 2008
@@ -83,13 +83,13 @@
unsigned num_objects;
Lock_Manager objects_lock;
- char* log_domain;
+ const char* log_domain;
void reallocate(unsigned new_capacity);
public:
Object_Queue();
- Object_Queue(char* log_domain);
+ Object_Queue(const char* log_domain);
~Object_Queue(){
STD_FREE(objects);
}
@@ -147,7 +147,7 @@
Object_Queue::Object_Queue("unknown");
}
-Object_Queue::Object_Queue(char* log_domain)
+Object_Queue::Object_Queue(const char* log_domain)
{
objects = 0;
capacity = 0;
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalizer_thread.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalizer_thread.cpp?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalizer_thread.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/finalizer_thread.cpp Sat Aug 30 16:12:59 2008
@@ -204,11 +204,11 @@
{
JavaVM *java_vm = (JavaVM *)args[0];
JNIEnv *jni_env;
- char *name = "finalizer";
+ const char *name = "finalizer";
JavaVMAttachArgs *jni_args = (JavaVMAttachArgs*)STD_MALLOC(sizeof(JavaVMAttachArgs));
jni_args->version = JNI_VERSION_1_2;
- jni_args->name = name;
+ jni_args->name = const_cast<char*>(name);
jni_args->group = (jobject)args[1];
IDATA status = AttachCurrentThreadAsDaemon(java_vm, (void**)&jni_env, jni_args);
assert(status == JNI_OK);
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/ref_enqueue_thread.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/ref_enqueue_thread.cpp?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/ref_enqueue_thread.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/ref_enqueue_thread.cpp Sat Aug 30 16:12:59 2008
@@ -142,11 +142,11 @@
{
JavaVM *java_vm = (JavaVM *)args[0];
JNIEnv *jni_env;
- char *name = "ref handler";
+ const char *name = "ref handler";
JavaVMAttachArgs *jni_args = (JavaVMAttachArgs*)STD_MALLOC(sizeof(JavaVMAttachArgs));
jni_args->version = JNI_VERSION_1_2;
- jni_args->name = name;
+ jni_args->name = const_cast<char*>(name);
jni_args->group = (jobject)args[1];
IDATA status = AttachCurrentThreadAsDaemon(java_vm, (void**)&jni_env, jni_args);
assert(status == JNI_OK);
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp Sat Aug 30 16:12:59 2008
@@ -628,7 +628,7 @@
* @param[in] name thread's name
* @param[in] daemon JNI_TRUE if new thread is a daemon, JNI_FALSE otherwise
*/
-static jint vm_create_jthread(jthread * thread_object, JNIEnv * jni_env, jobject group, char * name, jboolean daemon) {
+static jint vm_create_jthread(jthread * thread_object, JNIEnv * jni_env, jobject group, const char * name, jboolean daemon) {
static Method * constructor = NULL;
const char * descriptor = "(Ljava/lang/ThreadGroup;Ljava/lang/String;JJIZ)V";
jvalue args[7];
@@ -719,7 +719,7 @@
* @param[in] daemon JNI_TRUE if thread is daemon, JNI_FALSE otherwise
* @return JNI_OK on success.
*/
-jint vm_attach_internal(JNIEnv ** p_jni_env, jthread * java_thread, JavaVM * java_vm, jobject group, char * name, jboolean daemon) {
+jint vm_attach_internal(JNIEnv ** p_jni_env, jthread * java_thread, JavaVM * java_vm, jobject group, const char * name, jboolean daemon) {
JNIEnv * jni_env;
hythread_t native_thread;
jint status;
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_properties.cpp Sat Aug 30 16:12:59 2008
@@ -70,12 +70,12 @@
* names separated by PORT_PATH_SEPARATOR. If patch is NULL, no path
* or separator will be prefixed
*/
-static char *compose_full_files_path_names_list(const char *path,
+static const char *compose_full_files_path_names_list(const char *path,
const char **dll_names,
const int names_number,
bool is_dll)
{
- char* full_name = "";
+ const char* full_name = "";
for (int iii = 0; iii < names_number; iii++)
{
const char *tmp = dll_names[iii];
@@ -276,9 +276,9 @@
status = port_user_timezone(&user_tz, prop_pool);
if (APR_SUCCESS != status) {
INFO("Failed to get user timezone from the system. Error code " << status);
- user_tz = "GMT";
+ user_tz = NULL;
}
- properties.set_new("user.timezone", user_tz);
+ properties.set_new("user.timezone", user_tz ? user_tz : "GMT");
/*
* it's possible someone forgot to set this property - set to default of .
@@ -312,7 +312,7 @@
* pass NULL for the pathname as we don't want
* any path pre-pended
*/
- char* path_buf = compose_full_files_path_names_list(NULL, api_dll_files, n_api_dll_files, true);
+ const char* path_buf = compose_full_files_path_names_list(NULL, api_dll_files, n_api_dll_files, true);
properties.set_new("vm.other_natives_dlls", path_buf);
}
@@ -376,11 +376,12 @@
TRACE("setting internal property " << option + 4);
src = strdup(option + 4);
char* name = unquote(src);
- char* value = strchr(src, '=');
- if(value)
+ char* valptr = strchr(src, '=');
+ const char* value;
+ if(valptr)
{
- *value = '\0';
- ++value;
+ *valptr = '\0';
+ value = valptr + 1;
}
else
{
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_shutdown.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_shutdown.cpp?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_shutdown.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_shutdown.cpp Sat Aug 30 16:12:59 2008
@@ -322,7 +322,7 @@
*/
static IDATA vm_interrupt_entry_point(void * data) {
JavaVM * java_vm = (JavaVM *)data;
- JavaVMAttachArgs vm_args = {JNI_VERSION_1_2, "InterruptionHandler", NULL};
+ JavaVMAttachArgs vm_args = {JNI_VERSION_1_2, const_cast<char*>("InterruptionHandler"), NULL};
JNIEnv * jni_env;
jint status = AttachCurrentThread(java_vm, (void **)&jni_env, &vm_args);
@@ -358,7 +358,7 @@
*/
static IDATA vm_dump_entry_point(void * data) {
JavaVM * java_vm = (JavaVM *)data;
- JavaVMAttachArgs vm_args = {JNI_VERSION_1_2, "DumpHandler", NULL};
+ JavaVMAttachArgs vm_args = {JNI_VERSION_1_2, const_cast<char*>("DumpHandler"), NULL};
JNIEnv * jni_env;
jint status = AttachCurrentThread(java_vm, (void **)&jni_env, &vm_args);
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/primitives_support.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/primitives_support.cpp?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/primitives_support.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/primitives_support.cpp Sat Aug 30 16:12:59 2008
@@ -327,7 +327,7 @@
{
char _sig = '\0';
const char* c_ptr = (name);
- char* type = "java/lang/";
+ const char* type = "java/lang/";
while (*type++ == *c_ptr++);
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni.cpp?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jni/jni.cpp Sat Aug 30 16:12:59 2008
@@ -482,7 +482,7 @@
jint JNICALL JNI_CreateJavaVM(JavaVM ** p_vm, JNIEnv ** p_jni_env,
void * args) {
jboolean daemon = JNI_FALSE;
- char * name = "main";
+ const char * name = "main";
JNIEnv * jni_env;
Global_Env * vm_env;
jthread java_thread;
@@ -1527,7 +1527,7 @@
VMEXPORT jint JNICALL DestroyJavaVM(JavaVM * vm)
{
- char * name = "destroy";
+ const char* name = "destroy";
jboolean daemon = JNI_FALSE;
jthread java_thread;
JavaVM_Internal * java_vm;
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_event.cpp Sat Aug 30 16:12:59 2008
@@ -2329,7 +2329,7 @@
jni_env->GetJavaVM(&java_vm);
// attaching native thread to VM
- JavaVMAttachArgs vm_args = {JNI_VERSION_1_2, "TIEventThread", NULL};
+ JavaVMAttachArgs vm_args = {JNI_VERSION_1_2, const_cast<char*>("TIEventThread"), NULL};
jint status = AttachCurrentThreadAsDaemon(java_vm, (void**)&jni_env, &vm_args);
if(status != JNI_OK) {
LDIE(24, "{0} cannot attach current thread" << "jvmti_event_thread_function:");
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_extension.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_extension.cpp?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_extension.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_extension.cpp Sat Aug 30 16:12:59 2008
@@ -37,13 +37,13 @@
static jvmtiParamInfo jvmtiGetNCAIEnvironmentParams[] =
{
{
- "ncai_env_ptr",
+ const_cast<char*>("ncai_env_ptr"),
JVMTI_KIND_OUT,
JVMTI_TYPE_CVOID,
JNI_FALSE
},
{
- "version",
+ const_cast<char*>("version"),
JVMTI_KIND_IN,
JVMTI_TYPE_JINT,
JNI_FALSE
@@ -61,8 +61,8 @@
NULL,
{
jvmtiGetNCAIEnvironment,
- "org.apache.harmony.vm.GetExtensionEnv",
- "Returns the reference to the NCAI function table",
+ const_cast<char*>("org.apache.harmony.vm.GetExtensionEnv"),
+ const_cast<char*>("Returns the reference to the NCAI function table"),
sizeof(jvmtiGetNCAIEnvironmentParams) / sizeof(jvmtiParamInfo),
jvmtiGetNCAIEnvironmentParams,
sizeof(jvmtiGetNCAIEnvironmentErrors) / sizeof(jvmtiError),
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_general.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_general.cpp?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_general.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_general.cpp Sat Aug 30 16:12:59 2008
@@ -411,7 +411,7 @@
CHECK_EVERYTHING();
- char* category = "";
+ const char* category = "";
switch (flag)
{
case JVMTI_VERBOSE_OTHER:
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/Runtime_lnx.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/Runtime_lnx.cpp?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/Runtime_lnx.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/Runtime_lnx.cpp Sat Aug 30 16:12:59 2008
@@ -49,18 +49,18 @@
#include <errno.h>
-static void Error (char *lpszMess, JNIEnv *env, jlongArray la)
+static void Error (const char *lpcszMess, JNIEnv *env, jlongArray la)
{
jboolean jb = true;
jlong *lp = (jlong*)env->GetLongArrayElements(la, &jb);
lp[0] = 0;
env->ReleaseLongArrayElements(la, lp, 0);
- if (lpszMess != NULL) {
- INFO(lpszMess);
+ if (lpcszMess != NULL) {
+ INFO(lpcszMess);
}
}
-static void ThrowError(JNIEnv *env, char *message = 0) {
+static void ThrowError(JNIEnv *env, const char *message = 0) {
jclass jc = env->FindClass((const char *)"java/io/IOException");
env->ThrowNew(jc, message ? message : strerror(errno));
}
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_lang_management_ThreadMXBeanImpl.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_lang_management_ThreadMXBeanImpl.cpp?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_lang_management_ThreadMXBeanImpl.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/native/org_apache_harmony_lang_management_ThreadMXBeanImpl.cpp Sat Aug 30 16:12:59 2008
@@ -358,7 +358,7 @@
TRACE2("management", "ThreadMXBeanImpl_isSuspendedImpl invocation");
IDATA UNUSED status = jthread_get_jvmti_state(thread, &thread_state);
assert(status == TM_ERROR_NONE);
- return thread_state & TM_THREAD_STATE_SUSPENDED;
+ return ((thread_state & TM_THREAD_STATE_SUSPENDED) != 0);
};
/*
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/lil.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/lil.cpp?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/lil.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/lil/lil.cpp Sat Aug 30 16:12:59 2008
@@ -162,7 +162,7 @@
#define hexnum(c) (num(c) || ((c)>='a' && (c)<='f') || ((c)>='A' && (c)<='F'))
#define alphanum(c) (alpha(c) || num(c))
-static void error(const char** src, char* err1, char* err2="")
+static void error(const char** src, const char* err1, const char* err2="")
{
FILE* err_f = stderr;
fprintf(err_f, "lil parse error: %s%s\n\t", err1, err2);
@@ -211,7 +211,7 @@
// This function does not change *src on failure
// (except to skip whitespace),
// and this is needed in some code below
-static bool lil_parse_kw_no_error(const char** src, char* kw)
+static bool lil_parse_kw_no_error(const char** src, const char* kw)
{
lil_skip_ws(src);
unsigned c;
@@ -224,7 +224,7 @@
return true;
}
-static bool lil_parse_kw(const char** src, char* kw)
+static bool lil_parse_kw(const char** src, const char* kw)
{
bool res = lil_parse_kw_no_error(src, kw);
if (!res) error(src, "expected ", kw);
@@ -1902,7 +1902,7 @@
return t1==t2;
}
-static bool lil_print_err(char *s, LilInstruction* i, unsigned inst_number)
+static bool lil_print_err(const char *s, LilInstruction* i, unsigned inst_number)
{
fprintf(stderr, "lil code stub invalid at instruction %d: %s\n ", inst_number, s);
if (i) lil_print_instruction(stdout, i);
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_modules.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_modules.cpp?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_modules.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_modules.cpp Sat Aug 30 16:12:59 2008
@@ -163,7 +163,7 @@
static void ncai_identify_module_is_VM(ncaiModule module)
{
- char* vm_modules[] = {"java", "vmcore", "harmonyvm", "em", "interpreter",
+ const char* vm_modules[] = {"java", "vmcore", "harmonyvm", "em", "interpreter",
"gc_gen", "gc_gen_uncomp", "gc_cc", "vmi", "encoder", "jitrino", "hythr"};
for (size_t i = 0; i < sizeof(vm_modules)/sizeof(vm_modules[0]); i++)
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_registers.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_registers.cpp?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_registers.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_registers.cpp Sat Aug 30 16:12:59 2008
@@ -8,7 +8,7 @@
#include "suspend_checker.h"
#include "open/ncai_thread.h"
-//#include "ncai_utils.h"
+#include "ncai_utils.h"
#include "ncai_internal.h"
#include "ncai_direct.h"
@@ -44,7 +44,13 @@
if (info_ptr == NULL)
return NCAI_ERROR_NULL_POINTER;
- info_ptr->name = g_ncai_reg_table[reg_number].name;
+ size_t namesize = strlen(g_ncai_reg_table[reg_number].name) + 1;
+ char* name = (char*)ncai_alloc(namesize);
+
+ if (name)
+ memcpy(name, g_ncai_reg_table[reg_number].name, namesize);
+
+ info_ptr->name = name;
info_ptr->size = g_ncai_reg_table[reg_number].size;
return NCAI_ERROR_NONE;
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_signals.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_signals.cpp?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_signals.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_signals.cpp Sat Aug 30 16:12:59 2008
@@ -17,16 +17,16 @@
struct st_signal_info
{
- jint signal;
- char* name;
- size_t name_size;
+ jint signal;
+ const char* name;
+ size_t name_size;
};
static size_t ncai_get_signal_count();
static st_signal_info* find_signal(jint sig);
static jint ncai_get_min_signal();
static jint ncai_get_max_signal();
-static char* ncai_get_signal_name(jint signal);
+static const char* ncai_get_signal_name(jint signal);
static size_t ncai_get_signal_name_size(jint signal);
bool ncai_is_signal_in_range(jint signal);
@@ -62,7 +62,7 @@
if (!ncai_is_signal_in_range(signal))
return NCAI_ERROR_ILLEGAL_ARGUMENT;
- char* name = ncai_get_signal_name(signal);
+ const char* name = ncai_get_signal_name(signal);
if (name == NULL)
return NCAI_ERROR_ILLEGAL_ARGUMENT;
@@ -216,7 +216,7 @@
return max_sig_value;
}
-static char* ncai_get_signal_name(jint signal)
+static const char* ncai_get_signal_name(jint signal)
{
st_signal_info* psig = find_signal(signal);
return psig ? psig->name : NULL;
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_thread.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_thread.cpp?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_thread.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/ncai/ncai_thread.cpp Sat Aug 30 16:12:59 2008
@@ -130,7 +130,7 @@
info_ptr->kind = NCAI_THREAD_VM_INTERNAL;
- char* name_int = "native_0x";
+ const char* name_int = "native_0x";
size_t name_len = strlen(name_int) + 4 + 1;
info_ptr->name = (char*)ncai_alloc(name_len);
assert(info_ptr->name);
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/object/object_handles.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/object/object_handles.cpp?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/object/object_handles.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/object/object_handles.cpp Sat Aug 30 16:12:59 2008
@@ -545,7 +545,7 @@
}
-LilCodeStub* oh_gen_allocate_handles(LilCodeStub* cs, unsigned number_handles, char* base_var, char* UNREF helper_var)
+LilCodeStub* oh_gen_allocate_handles(LilCodeStub* cs, unsigned number_handles, const char* base_var, const char* UNREF helper_var)
{
char buf[200];
@@ -587,7 +587,7 @@
return refs_off+handle_indx*sizeof(ManagedObject*);
}
-LilCodeStub* oh_gen_init_handle(LilCodeStub* cs, char* base_var, unsigned handle_indx, char* val, bool null_check)
+LilCodeStub* oh_gen_init_handle(LilCodeStub* cs, const char* base_var, unsigned handle_indx, const char* val, bool null_check)
{
char buf[200];
POINTER_SIZE_INT offset = oh_get_handle_offset(handle_indx);
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp Sat Aug 30 16:12:59 2008
@@ -108,7 +108,7 @@
vm_thread_accessor get_thread_ptr = jthread_get_vm_thread_ptr_stub;
-IDATA jthread_throw_exception(char *name, char *message)
+IDATA jthread_throw_exception(const char *name, const char *message)
{
assert(hythread_is_suspend_enabled());
jobject jthe = exn_create(name);
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/verify_stack_enumeration.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/verify_stack_enumeration.cpp?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/verify_stack_enumeration.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/verify_stack_enumeration.cpp Sat Aug 30 16:12:59 2008
@@ -197,7 +197,7 @@
}
// Let it be literate :)
-static char* num_suffix(int n) {
+static const char* num_suffix(int n) {
if ((n/10)%10 == 1) return "th"; // 10-19
if (n%10 == 1) return "st"; // 1, 21, 31, ... 91
if (n%10 == 2) return "nd"; // 2, 22, 32, ... 92
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/crash_dump.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/crash_dump.cpp?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/crash_dump.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/crash_dump.cpp Sat Aug 30 16:12:59 2008
@@ -428,7 +428,7 @@
if (!memcmp(short_name, PORT_DSO_PREFIX, strlen(PORT_DSO_PREFIX)))
nameptr += strlen(PORT_DSO_PREFIX);
- char* vm_modules[] = {"java", "em", "encoder", "gc_gen", "gc_gen_uncomp", "gc_cc",
+ const char* vm_modules[] = {"java", "em", "encoder", "gc_gen", "gc_gen_uncomp", "gc_cc",
"harmonyvm", "hythr", "interpreter", "jitrino", "vmi"};
for (size_t i = 0; i < sizeof(vm_modules)/sizeof(vm_modules[0]); i++)
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/natives_support.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/natives_support.cpp?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/natives_support.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/natives_support.cpp Sat Aug 30 16:12:59 2008
@@ -88,7 +88,7 @@
// Searches for JNI_OnLoad through given library and calls it
static jint find_call_JNI_OnLoad(NativeLibraryHandle lib_handle)
{
-static char* name_list[] =
+static const char* name_list[] =
{ "JNI_OnLoad"
#ifdef PLATFORM_NT
, "_JNI_OnLoad@8"
@@ -126,7 +126,7 @@
// FIXME unused static
void find_call_JNI_OnUnload(NativeLibraryHandle lib_handle)
{
-static char* name_list[] =
+static const char* name_list[] =
{ "JNI_OnUnload"
#ifdef PLATFORM_NT
, "_JNI_OnUnload@8"
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/vm_stats.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/vm_stats.cpp?rev=690604&r1=690603&r2=690604&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/vm_stats.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/vm_stats.cpp Sat Aug 30 16:12:59 2008
@@ -429,7 +429,7 @@
-static void print_array_distribution(char *caption, uint64 *array)
+static void print_array_distribution(const char *caption, uint64 *array)
{
bool print_distributions = false;
int decade_high, min_size_decade, max_size_decade, i;