Merge branch 'H5B__assert_lives' of https://github.com/derobins/hdf5 …

…into H5B__assert_lives

.github/workflows/nvhpc-cmake.yml

@@ -28,7 +28,7 @@ jobs:
 
       - name: Install NVHPC
         shell: bash
-        run: |          
+        run: |
           curl https://developer.download.nvidia.com/hpc-sdk/ubuntu/DEB-GPG-KEY-NVIDIA-HPC-SDK | sudo gpg --dearmor -o /usr/share/keyrings/nvidia-hpcsdk-archive-keyring.gpg
           echo 'deb [signed-by=/usr/share/keyrings/nvidia-hpcsdk-archive-keyring.gpg] https://developer.download.nvidia.com/hpc-sdk/ubuntu/amd64 /' | sudo tee /etc/apt/sources.list.d/nvhpc.list
           sudo apt-get update -y

config/cmake/HDFCompilerFlags.cmake

@@ -375,7 +375,6 @@ if (HDF5_ENABLE_DEBUG_APIS)
       H5D_DEBUG
       H5D_CHUNK_DEBUG
       H5F_DEBUG
-      H5I_DEBUG
       H5MM_DEBUG
       H5O_DEBUG
       H5S_DEBUG

configure.ac

@@ -2572,8 +2572,8 @@ AC_SUBST([INTERNAL_DEBUG_OUTPUT])
 ## too specialized or have huge performance hits. These
 ## are not listed in the "all" packages list.
 ##
-## all_packages="AC,B2,D,F,FA,FL,FS,I,MM,O,S,T,Z"
-all_packages="AC,B2,CX,D,F,I,MM,O,S,T,Z"
+## all_packages="AC,B2,D,F,FA,FL,FS,MM,O,S,T,Z"
+all_packages="AC,B2,CX,D,F,MM,O,S,T,Z"
 
 case "X-$INTERNAL_DEBUG_OUTPUT" in
   X-yes|X-all)

fortran/src/H5Eff.F90

@@ -712,7 +712,7 @@ INTEGER(C_INT) FUNCTION H5Ewalk(err_stack, direction, op, op_data) &
        END FUNCTION H5Ewalk
     END INTERFACE
 
-    hdferr = INT(H5Ewalk(err_stack, direction, op, op_data))
+    hdferr = INT(H5Ewalk(err_stack, INT(direction, C_INT), op, op_data))
 
   END SUBROUTINE h5ewalk_f
 

fortran/test/tH5E_F03.F90

@@ -201,10 +201,10 @@ SUBROUTINE test_error(total_error)
   ! ** SET THE CUSTOMIZED PRINTING OF ERROR STACK **
 
   ! set the customized error handling routine
-  func = c_funloc(my_hdf5_error_handler)
+  func = C_FUNLOC(my_hdf5_error_handler)
 
   ! set the data sent to the customized routine
-  f_ptr = c_loc(my_hdf5_error_handler_data)
+  f_ptr = C_LOC(my_hdf5_error_handler_data)
 
   CALL H5Eset_auto_f(1, error, H5E_DEFAULT_F, func, f_ptr)
   CALL check("H5Eset_auto_f", error, total_error)
@@ -280,8 +280,8 @@ SUBROUTINE test_error_stack(total_error)
   func = "FUNC"//C_NULL_CHAR
   line = 99
 
-  ptr1 = C_LOC(file)
-  ptr2 = C_LOC(func)
+  ptr1 = C_LOC(file(1:1))
+  ptr2 = C_LOC(func(1:1))
   ptr3 = C_LOC(line)
 
   CALL h5ecreate_stack_f(estack_id, error)

src/H5Iint.c

@@ -373,15 +373,6 @@ H5I__mark_node(void *_info, void H5_ATTR_UNUSED *key, void *_udata)
             /* Discard the future object */
             if ((info->discard_cb)(info->u.object) < 0) {
                 if (udata->force) {
-#ifdef H5I_DEBUG
-                    if (H5DEBUG(I)) {
-                        fprintf(H5DEBUG(I),
-                                "H5I: discard type=%d obj=%p "
-                                "failure ignored\n",
-                                (int)udata->type_info->cls->type, info->u.c_object);
-                    }
-#endif /* H5I_DEBUG */
-
                     /* Indicate node should be removed from list */
                     mark = true;
                 }
@@ -396,15 +387,6 @@ H5I__mark_node(void *_info, void H5_ATTR_UNUSED *key, void *_udata)
             if (udata->type_info->cls->free_func &&
                 (udata->type_info->cls->free_func)(info->u.object, H5_REQUEST_NULL) < 0) {
                 if (udata->force) {
-#ifdef H5I_DEBUG
-                    if (H5DEBUG(I)) {
-                        fprintf(H5DEBUG(I),
-                                "H5I: free type=%d obj=%p "
-                                "failure ignored\n",
-                                (int)udata->type_info->cls->type, info->u.c_object);
-                    }
-#endif /* H5I_DEBUG */
-
                     /* Indicate node should be removed from list */
                     mark = true;
                 }