diff options
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/jvmti.cc | 18 |
2 files changed, 14 insertions, 11 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index b76d6e7c214..340d74c39c2 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2007-02-12 Keith Seitz <keiths@redhat.com> + + * jvmti.cc (_Jv_JVMTI_GetStackTrace): Remove cast + from jthread to Thread *; it is no longer needed. + (_Jv_JVMTI_GetFrameCount): Likewise. + Fix small formatting typo. + 2007-02-12 Tom Tromey <tromey@redhat.com> * sources.am, Makefile.in: Rebuilt. diff --git a/libjava/jvmti.cc b/libjava/jvmti.cc index 815bee54aca..37e6727f6ad 100644 --- a/libjava/jvmti.cc +++ b/libjava/jvmti.cc @@ -256,7 +256,7 @@ _Jv_JVMTI_GetAllThreads(MAYBE_UNUSED jvmtiEnv *env, jint *thread_cnt, static jvmtiError JNICALL _Jv_JVMTI_GetFrameCount (MAYBE_UNUSED jvmtiEnv *env, jthread thread, - jint* frame_count) + jint *frame_count) { REQUIRE_PHASE (env, JVMTI_PHASE_LIVE); @@ -265,12 +265,10 @@ _Jv_JVMTI_GetFrameCount (MAYBE_UNUSED jvmtiEnv *env, jthread thread, using namespace java::lang; THREAD_DEFAULT_TO_CURRENT (thread); - - Thread *thr = reinterpret_cast<Thread *> (thread); - THREAD_CHECK_VALID (thr); - THREAD_CHECK_IS_ALIVE (thr); + THREAD_CHECK_VALID (thread); + THREAD_CHECK_IS_ALIVE (thread); - _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (thr->frame); + _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (thread->frame); (*frame_count) = frame->depth (); return JVMTI_ERROR_NONE; } @@ -826,10 +824,8 @@ _Jv_JVMTI_GetStackTrace (MAYBE_UNUSED jvmtiEnv *env, jthread thread, using namespace java::lang; THREAD_DEFAULT_TO_CURRENT (thread); - - Thread *thr = reinterpret_cast<Thread *> (thread); - THREAD_CHECK_VALID (thr); - THREAD_CHECK_IS_ALIVE (thr); + THREAD_CHECK_VALID (thread); + THREAD_CHECK_IS_ALIVE (thread); jvmtiError jerr = env->GetFrameCount (thread, frame_count); if (jerr != JVMTI_ERROR_NONE) @@ -843,7 +839,7 @@ _Jv_JVMTI_GetStackTrace (MAYBE_UNUSED jvmtiEnv *env, jthread thread, ILLEGAL_ARGUMENT (start_depth >= (*frame_count)); ILLEGAL_ARGUMENT (start_depth < (-(*frame_count))); - _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (thr->frame); + _Jv_Frame *frame = reinterpret_cast<_Jv_Frame *> (thread->frame); // If start_depth is negative use this to determine at what depth to start // the trace by adding it to the length of the call stack. This allows the |