jvmti.cc (_Jv_JVMTI_GetStackTrace): Remove cast from jthread to Thread *; it is no...

        * jvmti.cc (_Jv_JVMTI_GetStackTrace): Remove cast
        from jthread to Thread *; it is no longer needed.
        (_Jv_JVMTI_GetFrameCount): Likewise.
        Fix small formatting typo.

From-SVN: r121878

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b76d6e7..340d74c 100644 (file)
--- 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 815bee5..37e6727 100644 (file)
--- 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