test/hotspot/jtreg/vmTestbase/nsk/jvmti/SetEnvironmentLocalStorage/setenvstor002/setenvstor002.cpp

rev 52100 : 8212082: Remove the NSK_CPP_STUB macros for remaining vmTestbase/jvmti/[sS]*
Summary:
Reviewed-by:

*** 71,82 ****
   * @returns NSK_FALSE if any error occured.
   */
  static int setEnvStorage(jvmtiEnv* jvmti, StorageStructure* storage, const char where[]) {
  
      NSK_DISPLAY1("Set local storage for current JVMTI env: 0x%p\n", (void*)storage);
!     if (!NSK_JVMTI_VERIFY(
!             NSK_CPP_STUB2(SetEnvironmentLocalStorage, jvmti, storage))) {
          return NSK_FALSE;
      }
      NSK_DISPLAY0("  ... ok\n");
      return NSK_TRUE;
  }
--- 71,81 ----
   * @returns NSK_FALSE if any error occured.
   */
  static int setEnvStorage(jvmtiEnv* jvmti, StorageStructure* storage, const char where[]) {
  
      NSK_DISPLAY1("Set local storage for current JVMTI env: 0x%p\n", (void*)storage);
!     if (!NSK_JVMTI_VERIFY(jvmti->SetEnvironmentLocalStorage(storage))) {
          return NSK_FALSE;
      }
      NSK_DISPLAY0("  ... ok\n");
      return NSK_TRUE;
  }
*** 87,98 ****
   */
  static int checkEnvStorage(jvmtiEnv* jvmti, StorageStructure* initialStorage, const char where[]) {
      StorageStructure* storage = NULL;
  
      NSK_DISPLAY0("Get local storage for current JVMTI env\n");
!     if (!NSK_JVMTI_VERIFY(
!             NSK_CPP_STUB2(GetEnvironmentLocalStorage, jvmti, (void**)&storage))) {
          return NSK_FALSE;
      }
      NSK_DISPLAY1("  ... got storage: 0x%p\n", (void*)storage);
  
      if (storage != initialStorage) {
--- 86,96 ----
   */
  static int checkEnvStorage(jvmtiEnv* jvmti, StorageStructure* initialStorage, const char where[]) {
      StorageStructure* storage = NULL;
  
      NSK_DISPLAY0("Get local storage for current JVMTI env\n");
!     if (!NSK_JVMTI_VERIFY(jvmti->GetEnvironmentLocalStorage((void**)&storage))) {
          return NSK_FALSE;
      }
      NSK_DISPLAY1("  ... got storage: 0x%p\n", (void*)storage);
  
      if (storage != initialStorage) {
*** 219,231 ****
          jvmtiEventCallbacks eventCallbacks;
  
          memset(&eventCallbacks, 0, sizeof(eventCallbacks));
          eventCallbacks.VMInit = callbackVMInit;
          eventCallbacks.VMDeath = callbackVMDeath;
!         if (!NSK_JVMTI_VERIFY(
!                 NSK_CPP_STUB3(SetEventCallbacks, jvmti,
!                                     &eventCallbacks, sizeof(eventCallbacks)))) {
              return JNI_ERR;
          }
  
      }
  
--- 217,227 ----
          jvmtiEventCallbacks eventCallbacks;
  
          memset(&eventCallbacks, 0, sizeof(eventCallbacks));
          eventCallbacks.VMInit = callbackVMInit;
          eventCallbacks.VMDeath = callbackVMDeath;
!         if (!NSK_JVMTI_VERIFY(jvmti->SetEventCallbacks(&eventCallbacks, sizeof(eventCallbacks)))) {
              return JNI_ERR;
          }
  
      }