8 files changed, 9 insertions, 16 deletions
diff --git a/fortran/test/fortranlib_test_1_8.f90 b/fortran/test/fortranlib_test_1_8.f90
index 94f4c6f..320d661 100644
--- a/fortran/test/fortranlib_test_1_8.f90
+++ b/fortran/test/fortranlib_test_1_8.f90
@@ -89,7 +89,7 @@ PROGRAM fortranlibtest
        total_error)
 
   ret_total_error = 0
-  CALL test_h5s_encode(cleanup, ret_total_error)
+  CALL test_h5s_encode(ret_total_error)
   CALL write_test_status(ret_total_error, &
        ' Testing dataspace encoding and decoding', &
        total_error)
@@ -101,7 +101,7 @@ PROGRAM fortranlibtest
        total_error)
 
   ret_total_error = 0
-  CALL test_genprop_basic_class(cleanup, ret_total_error )
+  CALL test_genprop_basic_class(ret_total_error )
   CALL write_test_status(ret_total_error, &
        ' Testing basic generic property list class creation functionality', &
        total_error)
diff --git a/fortran/test/t.h b/fortran/test/t.h
index d315bda..6d6af52 100644
--- a/fortran/test/t.h
+++ b/fortran/test/t.h
@@ -34,7 +34,7 @@ H5_FCTESTDLL int_f nh5_fixname_c
 H5_FCTESTDLL int_f nh5_cleanup_c
 (_fcd base_name, size_t_f *base_namelen, hid_t_f *fapl);
 
-H5_FCTESTDLL void nh5_exit_c
+H5_FCTESTDLL NORETURN void nh5_exit_c
 (int_f *status);
 
 H5_FCTESTDLL void nh5_env_nocleanup_c
diff --git a/fortran/test/tH5A.f90 b/fortran/test/tH5A.f90
index 07ca6da..e3b3b2a 100644
--- a/fortran/test/tH5A.f90
+++ b/fortran/test/tH5A.f90
@@ -129,8 +129,6 @@ CONTAINS
      !data buffers
      !
      INTEGER, DIMENSION(NX,NY) :: data_in
-     LOGICAL :: differ
-
 
      !
      !Initialize data_in buffer
diff --git a/fortran/test/tH5F.f90 b/fortran/test/tH5F.f90
index 931a046..0b3c275 100644
--- a/fortran/test/tH5F.f90
+++ b/fortran/test/tH5F.f90
@@ -141,13 +141,11 @@ CONTAINS
           CALL h5fcreate_f(fix_filename1, H5F_ACC_TRUNC_F, file1_id, error)
                CALL check("h5fcreate_f",error,total_error)
 
-
           !
           !Create group "/G" inside file "mount1.h5".
           !
           CALL h5gcreate_f(file1_id, "/G", gid, error)
                CALL check("h5gcreate_f",error,total_error)
-
           !
           !close file and group identifiers.
           !
diff --git a/fortran/test/tH5MISC_1_8.f90 b/fortran/test/tH5MISC_1_8.f90
index 9b33f8a..efaf594 100644
--- a/fortran/test/tH5MISC_1_8.f90
+++ b/fortran/test/tH5MISC_1_8.f90
@@ -80,7 +80,6 @@ SUBROUTINE dtransform(cleanup, total_error)
   IF(cleanup) CALL h5_cleanup_f("dtransform", H5P_DEFAULT_F, error)
   CALL check("h5_cleanup_f", error, total_error)
 
-
 END SUBROUTINE dtransform
 
 
@@ -91,13 +90,12 @@ END SUBROUTINE dtransform
 !**
 !***************************************************************
 
-SUBROUTINE test_genprop_basic_class(cleanup, total_error)
+SUBROUTINE test_genprop_basic_class(total_error)
 
   USE HDF5 ! This module contains all necessary modules
   USE TH5_MISC
 
   IMPLICIT NONE
-  LOGICAL, INTENT(IN)  :: cleanup
   INTEGER, INTENT(INOUT) :: total_error
 
   INTEGER(HID_T) :: cid1    ! Generic Property class ID 
@@ -181,7 +179,7 @@ SUBROUTINE test_genprop_basic_class(cleanup, total_error)
 
 END SUBROUTINE test_genprop_basic_class
 
-SUBROUTINE test_h5s_encode(cleanup, total_error)
+SUBROUTINE test_h5s_encode(total_error)
 
 !***************************************************************
 !**
@@ -192,7 +190,6 @@ SUBROUTINE test_h5s_encode(cleanup, total_error)
   USE HDF5 ! This module contains all necessary modules
   USE TH5_MISC
   IMPLICIT NONE
-  LOGICAL, INTENT(IN)  :: cleanup
   INTEGER, INTENT(INOUT) :: total_error
 
   INTEGER(hid_t) :: sid1, sid3!	 Dataspace ID		
@@ -469,6 +466,9 @@ SUBROUTINE test_scaleoffset(cleanup, total_error )
   CALL H5Fclose_f(file, error)
   CALL CHECK(" H5Fclose_f", error, total_error)
 
+  IF(cleanup) CALL h5_cleanup_f("h5scaleoffset", H5P_DEFAULT_F, error)
+  CALL check("h5_cleanup_f", error, total_error)
+
 END SUBROUTINE test_scaleoffset
 
 END MODULE TH5MISC_1_8
diff --git a/fortran/test/tH5P.f90 b/fortran/test/tH5P.f90
index 8b48be6..7dcc580 100644
--- a/fortran/test/tH5P.f90
+++ b/fortran/test/tH5P.f90
@@ -450,8 +450,6 @@ SUBROUTINE test_chunk_cache(cleanup, total_error)
   INTEGER(size_t) rdcc_nelmts
   INTEGER(size_t) rdcc_nbytes
   REAL :: rdcc_w0
-  LOGICAL :: differ
-
 
   CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
   IF (error .NE. 0) THEN
diff --git a/fortran/test/tH5T.f90 b/fortran/test/tH5T.f90
index f0efbd3..7822c16 100644
--- a/fortran/test/tH5T.f90
+++ b/fortran/test/tH5T.f90
@@ -112,7 +112,7 @@ CONTAINS
      INTEGER(HID_T) :: decoded_tid1
 
      INTEGER(HID_T) :: fixed_str1, fixed_str2
-     LOGICAL :: are_equal, differ
+     LOGICAL :: are_equal
      INTEGER(SIZE_T), PARAMETER :: str_size = 10 
      INTEGER(SIZE_T) :: query_size
 
diff --git a/fortran/test/tH5VL.f90 b/fortran/test/tH5VL.f90
index f063722..651ca75 100644
--- a/fortran/test/tH5VL.f90
+++ b/fortran/test/tH5VL.f90
@@ -226,7 +226,6 @@ CONTAINS
           INTEGER(SIZE_T)  max_len
           INTEGER(HID_T) ::  vl_type_id
           LOGICAL        ::  vl_flag
-          LOGICAL        ::  differ
 
           !
           ! Initialize the vl_int_data array.