Trim trailing whitespace

24 files changed, 191 insertions, 191 deletions

diff --git a/fortran/examples/compound_complex_fortran2003.f90 b/fortran/examples/compound_complex_fortran2003.f90
index 6d0f291..9f0cc9f 100644
--- a/fortran/examples/compound_complex_fortran2003.f90
+++ b/fortran/examples/compound_complex_fortran2003.f90
@@ -11,8 +11,8 @@
 !   help@hdfgroup.org.                                                        *
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
-! This example shows how to create an array of a compound datatype which 
-! contains an array of type complex and how to write it to hdf5 
+! This example shows how to create an array of a compound datatype which
+! contains an array of type complex and how to write it to hdf5
 ! and how to read it back into a compound datatype for hdf5.
 !
 
@@ -85,7 +85,7 @@ PROGRAM compound_complex_fortran2003
   ! Open the file and the dataset.
   !
   CALL H5Fopen_f("test.h5", H5F_ACC_RDONLY_F, file_id, error)
-  
+
   CALL H5Dopen_f(file_id, "samples", dset_id, error)
   !
   ! Create the memory data type.
diff --git a/fortran/examples/compound_fortran2003.f90 b/fortran/examples/compound_fortran2003.f90
index 0168177..09e1b04 100644
--- a/fortran/examples/compound_fortran2003.f90
+++ b/fortran/examples/compound_fortran2003.f90
@@ -77,10 +77,10 @@ PROGRAM main
   INTEGER(SIZE_T) :: offset, sizeof_compound
   INTEGER :: hdferr
   TYPE(C_PTR) :: f_ptr
-  
-  INTEGER(SIZE_T) :: type_sizei  ! Size of the integer datatype 
-  INTEGER(SIZE_T) :: type_sizer  ! Size of the real datatype 
-  INTEGER(SIZE_T) :: type_sized  ! Size of the double datatype 
+
+  INTEGER(SIZE_T) :: type_sizei  ! Size of the integer datatype
+  INTEGER(SIZE_T) :: type_sizer  ! Size of the real datatype
+  INTEGER(SIZE_T) :: type_sized  ! Size of the double datatype
   INTEGER(hid_t) :: tid3      ! /* Nested Array Datatype ID	*/
   INTEGER(HSIZE_T), DIMENSION(1) :: tdims1=(/13/)
   !
@@ -133,7 +133,7 @@ PROGRAM main
   !
   ! Write data to the dataset
   !
-  
+
   f_ptr = C_LOC(s1(1))
   CALL H5Dwrite_f(dataset, s1_tid, f_ptr, hdferr)
 
@@ -150,7 +150,7 @@ PROGRAM main
   !
 
   CALL H5Fopen_f(H5FILE_NAME, H5F_ACC_RDONLY_F, file, hdferr)
-  
+
   CALL H5Dopen_f(file, DATASETNAME, dataset,hdferr)
 
   !
diff --git a/fortran/examples/h5_cmprss.f90 b/fortran/examples/h5_cmprss.f90
index 61dd7b0..f543024 100644
--- a/fortran/examples/h5_cmprss.f90
+++ b/fortran/examples/h5_cmprss.f90
@@ -10,17 +10,17 @@
 !   If you do not have access to either file, you may request a copy from     *
 !   help@hdfgroup.org.                                                        *
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-! 
+!
 !  This example illustrates how to create a compressed dataset.
 !  It is used in the HDF5 Tutorial.
-! 
+!
 PROGRAM h5_cmprss
 
-  USE HDF5 ! This module contains all necessary modules 
+  USE HDF5 ! This module contains all necessary modules
 
   IMPLICIT NONE
   !
-  ! The dataset is stored in file "h5_cmprss.h5" 
+  ! The dataset is stored in file "h5_cmprss.h5"
   !
   CHARACTER(LEN=12), PARAMETER :: filename = "h5_cmprss.h5"
   INTEGER, PARAMETER  :: rank = 2   ! Rank of the data set
@@ -33,7 +33,7 @@ PROGRAM h5_cmprss
   INTEGER :: error
   INTEGER(hsize_t), DIMENSION(1:rank) :: dims ! dimensions of data
   INTEGER(hsize_t), DIMENSION(1:rank) :: cdims ! sizes of chunked data
- 
+
   INTEGER :: i,j, numfilt
   INTEGER, DIMENSION(1:dim0,1:dim1) :: buf ! write buffer
   INTEGER, DIMENSION(1:dim0,1:dim1) :: rbuf ! read buffer
@@ -63,15 +63,15 @@ PROGRAM h5_cmprss
   CALL h5screate_simple_f(rank, dims, dataspace_id, error)
   CALL h5pcreate_f(H5P_DATASET_CREATE_F, plist_id, error)
   !
-  ! Dataset must be chunked for compression 
+  ! Dataset must be chunked for compression
   cdims(1:2) = 20
   CALL h5pset_chunk_f(plist_id, 2, cdims, error)
 
   ! Set ZLIB / DEFLATE Compression using compression level 6.
-  ! To use SZIP Compression comment out these lines. 
+  ! To use SZIP Compression comment out these lines.
   CALL h5pset_deflate_f(plist_id, 6, error)
 
-  ! Uncomment these lines to set SZIP Compression 
+  ! Uncomment these lines to set SZIP Compression
   !szip_options_mask = H5_SZIP_NN_OM_F
   !szip_pixels_per_block = 16
   !CALL H5Pset_szip_f(plist_id, szip_options_mask, szip_pixels_per_block, error)
@@ -86,7 +86,7 @@ PROGRAM h5_cmprss
      ENDDO
   ENDDO
 
-  data_dims(1:2) = (/dim0,dim1/) 
+  data_dims(1:2) = (/dim0,dim1/)
   CALL h5dwrite_f(dataset_id, H5T_NATIVE_INTEGER, buf, data_dims, error)
 
   ! Close resources
@@ -99,12 +99,12 @@ PROGRAM h5_cmprss
   CALL h5fopen_f(filename, H5F_ACC_RDONLY_F, file_id, error)
   CALL h5dopen_f(file_id, "Compressed_Data", dataset_id, error)
 
-  ! Retrieve filter information. 
+  ! Retrieve filter information.
   CALL h5dget_create_plist_f(dataset_id, plist_id, error)
-    
+
   CALL h5pget_nfilters_f(plist_id, numfilt, error)
   WRITE(*,'(A, I0)') "Number of filters associated with dataset: ", numfilt
-     
+
   DO i = 1, numfilt
      nelmts = 1
      CALL h5pget_filter_f(plist_id, 0, flags, nelmts, cd_values, &
@@ -121,7 +121,7 @@ PROGRAM h5_cmprss
    ENDDO
   data_dims(1:2) = (/dim0,dim1/)
   CALL h5dread_f(dataset_id, H5T_NATIVE_INTEGER, rbuf, data_dims, error)
-    
+
   CALL h5dclose_f(dataset_id, error)
   CALL h5pclose_f(plist_id, error)
   CALL h5fclose_f(file_id, error)
diff --git a/fortran/examples/h5_extend.f90 b/fortran/examples/h5_extend.f90
index 20b91ff..93bfea8 100644
--- a/fortran/examples/h5_extend.f90
+++ b/fortran/examples/h5_extend.f90
@@ -15,12 +15,12 @@
 
 PROGRAM H5_EXTEND
 
-  USE HDF5 ! This module contains all necessary modules 
+  USE HDF5 ! This module contains all necessary modules
 
   IMPLICIT NONE
 
   !
-  !the dataset is stored in file "extend.h5" 
+  !the dataset is stored in file "extend.h5"
   !
   CHARACTER(LEN=9), PARAMETER :: filename = "extend.h5"
 
@@ -30,11 +30,11 @@ PROGRAM H5_EXTEND
   CHARACTER(LEN=15), PARAMETER :: dsetname = "ExtendibleArray"
   INTEGER :: RANK = 2
 
-  INTEGER(HID_T) :: file_id       ! File identifier 
-  INTEGER(HID_T) :: dset_id       ! Dataset identifier 
-  INTEGER(HID_T) :: dataspace     ! Dataspace identifier 
-  INTEGER(HID_T) :: memspace      ! Memory dataspace identifier 
-  INTEGER(HID_T) :: crp_list      ! Dataset creation property identifier 
+  INTEGER(HID_T) :: file_id       ! File identifier
+  INTEGER(HID_T) :: dset_id       ! Dataset identifier
+  INTEGER(HID_T) :: dataspace     ! Dataspace identifier
+  INTEGER(HID_T) :: memspace      ! Memory dataspace identifier
+  INTEGER(HID_T) :: crp_list      ! Dataset creation property identifier
 
   !
   !dataset dimensions at creation time
@@ -42,7 +42,7 @@ PROGRAM H5_EXTEND
   INTEGER(HSIZE_T), DIMENSION(1:2) :: dims = (/3,3/)
 
   !
-  !data dimensions 
+  !data dimensions
   !
   INTEGER(HSIZE_T), DIMENSION(1:2) :: dimsc = (/2,5/)
   INTEGER(HSIZE_T), DIMENSION(1:2) :: dimsm = (/3,7/)
@@ -50,49 +50,49 @@ PROGRAM H5_EXTEND
   !
   !Maximum dimensions
   !
-  INTEGER(HSIZE_T), DIMENSION(1:2) :: maxdims 
+  INTEGER(HSIZE_T), DIMENSION(1:2) :: maxdims
 
   INTEGER(HSIZE_T), DIMENSION(1:2) :: offset
-  INTEGER(HSIZE_T), DIMENSION(1:2) :: count 
+  INTEGER(HSIZE_T), DIMENSION(1:2) :: count
 
   !
-  ! Variables for reading and writing 
+  ! Variables for reading and writing
   !
-  INTEGER, DIMENSION(1:3,1:3)  :: data1 
+  INTEGER, DIMENSION(1:3,1:3)  :: data1
   INTEGER, DIMENSION(1:21) :: data2 = &
        (/2, 3, 4, 2, 3, 4, 2, 3, 4, 2, 3, 4, 2, 3, 4, 2, 3, 4, 2, 3, 4/)
   INTEGER(HSIZE_T), DIMENSION(1:2) :: data_dims
 
   !
-  !Size of data in the file 
+  !Size of data in the file
   !
   INTEGER(HSIZE_T), DIMENSION(1:2) :: size
 
   !
-  !general purpose integer 
+  !general purpose integer
   !
   INTEGER(HSIZE_T) :: i, j
 
   !
-  !flag to check operation success 
+  !flag to check operation success
   !
-  INTEGER :: error 
+  INTEGER :: error
 
   !
   !Variables used in reading data back
-  !  
+  !
   INTEGER(HSIZE_T), DIMENSION(1:2) :: dimsr, maxdimsr
   INTEGER :: rankr
-  INTEGER, DIMENSION(1:3,1:10)  :: rdata 
+  INTEGER, DIMENSION(1:3,1:10)  :: rdata
 
   !
   !Initialize FORTRAN predifined datatypes
   !
-  CALL h5open_f(error) 
+  CALL h5open_f(error)
 
   !
   !Create a new file using default properties.
-  ! 
+  !
   CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error)
 
   !
@@ -117,7 +117,7 @@ PROGRAM H5_EXTEND
   CALL h5sclose_f(dataspace, error)
 
   !
-  !Fill data array with 1's 
+  !Fill data array with 1's
   !
   DO i = 1, dims(1)
      DO j = 1, dims(2)
@@ -128,7 +128,7 @@ PROGRAM H5_EXTEND
   !
   !Write data array to dataset
   !
-  data_dims(1:2) = (/3,3/) 
+  data_dims(1:2) = (/3,3/)
   CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, data1, data_dims, error)
 
   !
@@ -144,7 +144,7 @@ PROGRAM H5_EXTEND
 
   !
   !Write to 3x7 extended part of dataset
-  !   
+  !
   CALL h5dget_space_f(dset_id, dataspace, error)
   CALL h5sselect_hyperslab_f(dataspace, H5S_SELECT_SET_F, &
        offset, count, error)
@@ -185,7 +185,7 @@ PROGRAM H5_EXTEND
 
   !
   !Get dataspace's dimensions.
-  ! 
+  !
   CALL h5sget_simple_extent_dims_f(dataspace, dimsr, maxdimsr, error)
 
   !
@@ -204,15 +204,15 @@ PROGRAM H5_EXTEND
   CALL h5screate_simple_f(rankr, dimsr, memspace, error)
 
   !
-  !Read data 
+  !Read data
   !
   data_dims(1:2) = (/3,10/)
   CALL H5dread_f(dset_id, H5T_NATIVE_INTEGER, rdata, data_dims, &
        error, memspace, dataspace)
 
-  WRITE(*,'(A)') "Dataset:" 
+  WRITE(*,'(A)') "Dataset:"
   DO i = 1, dimsr(1)
-     WRITE(*,'(100(I0,1X))') rdata(i,1:dimsr(2))    
+     WRITE(*,'(100(I0,1X))') rdata(i,1:dimsr(2))
   END DO
 
   !
diff --git a/fortran/examples/h5_subset.f90 b/fortran/examples/h5_subset.f90
index ab33c86..9bebce5 100644
--- a/fortran/examples/h5_subset.f90
+++ b/fortran/examples/h5_subset.f90
@@ -11,23 +11,23 @@
 !   help@hdfgroup.org.                                                        *
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
-! This example shows how to write and read a hyperslab.  
+! This example shows how to write and read a hyperslab.
 ! It is used in the HDF5 Tutorial.
 !
 
-PROGRAM H5_SUBSET 
+PROGRAM H5_SUBSET
 
-  USE HDF5 ! This module contains all necessary modules 
+  USE HDF5 ! This module contains all necessary modules
 
   IMPLICIT NONE
 
   CHARACTER(LEN=9), PARAMETER :: filename = "subset.h5"  ! File name
   CHARACTER(LEN=8), PARAMETER :: dsetname = "IntArray"   ! Dataset name
 
-  INTEGER(HID_T) :: file_id       ! File identifier 
-  INTEGER(HID_T) :: dset_id       ! Dataset identifier 
-  INTEGER(HID_T) :: dataspace     ! Dataspace identifier 
-  INTEGER(HID_T) :: memspace      ! memspace identifier 
+  INTEGER(HID_T) :: file_id       ! File identifier
+  INTEGER(HID_T) :: dset_id       ! Dataset identifier
+  INTEGER(HID_T) :: dataspace     ! Dataspace identifier
+  INTEGER(HID_T) :: memspace      ! memspace identifier
 
   !
   ! To change the subset size, modify size of dimsm, sdata, dim0_sub,
@@ -35,57 +35,57 @@ PROGRAM H5_SUBSET
   !
   INTEGER(HSIZE_T), DIMENSION(1:2) :: dimsm = (/4,3/) ! Dataset dimensions
   INTEGER, DIMENSION(1:4,1:3) :: sdata                  ! Subset buffer
-  INTEGER :: dim0_sub = 4   
-  INTEGER :: dim1_sub = 3 
+  INTEGER :: dim0_sub = 4
+  INTEGER :: dim1_sub = 3
   INTEGER(HSIZE_T), DIMENSION(1:2) :: count = (/4,3/)  ! Size of hyperslab
   INTEGER(HSIZE_T), DIMENSION(1:2) :: offset = (/2,1/) ! Hyperslab offset
-  INTEGER(HSIZE_T), DIMENSION(1:2) :: stride = (/1,1/) ! Hyperslab stride 
-  INTEGER(HSIZE_T), DIMENSION(1:2) :: block = (/1,1/)  ! Hyperslab block size 
+  INTEGER(HSIZE_T), DIMENSION(1:2) :: stride = (/1,1/) ! Hyperslab stride
+  INTEGER(HSIZE_T), DIMENSION(1:2) :: block = (/1,1/)  ! Hyperslab block size
 
   INTEGER(HSIZE_T), DIMENSION(1:2) :: dimsf = (/10,8/) ! Dataset dimensions
 
 
   INTEGER, DIMENSION(1:10,1:8) :: data     ! Data to write
-  INTEGER, DIMENSION(1:10,1:8) :: rdata    ! Data to read 
+  INTEGER, DIMENSION(1:10,1:8) :: rdata    ! Data to read
 
   INTEGER :: rank = 2      ! Dataset rank ( in file )
   INTEGER :: dim0 = 10     ! Dataset size in file
-  INTEGER :: dim1 = 8 
+  INTEGER :: dim1 = 8
 
-  INTEGER :: i, j 
+  INTEGER :: i, j
 
   INTEGER :: error         ! Error flag
   INTEGER(HSIZE_T), DIMENSION(2) :: data_dims
 
   !
-  ! Write data to the HDF5 file.  
+  ! Write data to the HDF5 file.
   !
 
   !
-  ! Data initialization. 
+  ! Data initialization.
   !
-  DO i = 1, dim0 
+  DO i = 1, dim0
      DO j = 1, dim1
         IF (i .LE. (dim0 / 2)) THEN
-           data(i,j) = 1 
-        ELSE 
-           data(i,j) = 2 
+           data(i,j) = 1
+        ELSE
+           data(i,j) = 2
         END IF
      END DO
   END DO
 
   !
-  ! Initialize FORTRAN interface. 
+  ! Initialize FORTRAN interface.
   !
-  CALL h5open_f(error) 
+  CALL h5open_f(error)
 
   !
   ! Create a new file using default properties.
-  ! 
+  !
   CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error)
 
   !
-  ! Create the data space for the  dataset. 
+  ! Create the data space for the  dataset.
   !
   CALL h5screate_simple_f(rank, dimsf, dataspace, error)
 
@@ -98,12 +98,12 @@ PROGRAM H5_SUBSET
   !
   ! Write the dataset.
   !
-  data_dims(1) = dim0 
-  data_dims(2) = dim1 
+  data_dims(1) = dim0
+  data_dims(2) = dim1
   CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, data, data_dims, error)
 
   !
-  ! Data Written to File 
+  ! Data Written to File
   !
   WRITE(*,'(/,A)') "Original Data Written to File:"
   DO i = 1, dim0
@@ -138,7 +138,7 @@ PROGRAM H5_SUBSET
   !
   CALL h5dget_space_f(dset_id, dataspace, error)
   CALL h5sselect_hyperslab_f(dataspace, H5S_SELECT_SET_F, &
-       offset, count, error, stride, BLOCK) 
+       offset, count, error, stride, BLOCK)
   !
   ! Create memory dataspace.
   !
@@ -148,9 +148,9 @@ PROGRAM H5_SUBSET
   WRITE(*,'(A,/)') "   offset=2x1 stride=1x1 count=4x3 block=1x1"
 
   !
-  ! Write subset to dataset  
+  ! Write subset to dataset
   !
-  data_dims(1:2) = (/dim0_sub, dim1_sub/) 
+  data_dims(1:2) = (/dim0_sub, dim1_sub/)
   CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, sdata, data_dims, error, &
        memspace, dataspace)
 
@@ -158,10 +158,10 @@ PROGRAM H5_SUBSET
   CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, rdata, data_dims, error)
 
   !
-  ! Read entire dataset back 
+  ! Read entire dataset back
   !
   WRITE(*,'(A)') "Data in File after Subset Written:"
-  DO i = 1, dim0 
+  DO i = 1, dim0
     WRITE(*,'(100(1X,I0,1X))') rdata(i,1:dim1)
   END DO
   PRINT *, " "
diff --git a/fortran/examples/nested_derived_type.f90 b/fortran/examples/nested_derived_type.f90
index 68354ac..651830c 100644
--- a/fortran/examples/nested_derived_type.f90
+++ b/fortran/examples/nested_derived_type.f90
@@ -1,4 +1,4 @@
-! 
+!
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 ! Copyright by the Board of Trustees of the University of Illinois.         *
 ! All rights reserved.                                                      *
@@ -82,10 +82,10 @@ PROGRAM main
   INTEGER(SIZE_T) :: offset, sizeof_compound
   INTEGER :: hdferr
   TYPE(C_PTR) :: f_ptr
-  
-  INTEGER(SIZE_T) :: type_sizei  ! Size of the integer datatype 
-  INTEGER(SIZE_T) :: type_sizer  ! Size of the real datatype 
-  INTEGER(SIZE_T) :: type_sized  ! Size of the double datatype 
+
+  INTEGER(SIZE_T) :: type_sizei  ! Size of the integer datatype
+  INTEGER(SIZE_T) :: type_sizer  ! Size of the real datatype
+  INTEGER(SIZE_T) :: type_sized  ! Size of the double datatype
   INTEGER(hid_t) :: tid3      ! /* Nested Array Datatype ID	*/
   INTEGER(HSIZE_T), DIMENSION(1) :: tdims1=(/7/)
   INTEGER(HSIZE_T), DIMENSION(1) :: tdims1a=(/4/)
@@ -136,7 +136,7 @@ PROGRAM main
   !
   ! Write data to the dataset
   !
-  
+
   f_ptr = C_LOC(s1(1))
   CALL H5Dwrite_f(dataset, s1_tid, f_ptr, hdferr)
 
@@ -153,7 +153,7 @@ PROGRAM main
   !
 
   CALL H5Fopen_f(H5FILE_NAME, H5F_ACC_RDONLY_F, file, hdferr)
-  
+
   CALL H5Dopen_f(file, DATASETNAME, dataset,hdferr)
   !
   ! Create a data type for s2
diff --git a/fortran/examples/rwdset_fortran2003.f90 b/fortran/examples/rwdset_fortran2003.f90
index 36ebf0d..f79c8fe 100644
--- a/fortran/examples/rwdset_fortran2003.f90
+++ b/fortran/examples/rwdset_fortran2003.f90
@@ -1,4 +1,4 @@
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !   Copyright by The HDF Group.                                               *
 !   Copyright by the Board of Trustees of the University of Illinois.         *
 !   All rights reserved.                                                      *
@@ -9,12 +9,12 @@
 !   distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
 !   If you do not have access to either file, you may request a copy from     *
 !   help@hdfgroup.org.                                                        *
-! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 !
-! The following example shows how to write and read to/from an existing dataset. 
-! It opens the file created in the previous example, obtains the dataset 
-! identifier, writes the data to the dataset in the file, 
+! The following example shows how to write and read to/from an existing dataset.
+! It opens the file created in the previous example, obtains the dataset
+! identifier, writes the data to the dataset in the file,
 ! then reads the dataset to memory. Uses updated Fortran 2003 interface
 ! with different KINDs of integers and reals.
 !
@@ -22,8 +22,8 @@ PROGRAM RWDSET_FORTRAN2003
 
   USE ISO_C_BINDING
 
-  USE HDF5 ! This module contains all necessary modules 
-        
+  USE HDF5 ! This module contains all necessary modules
+
   IMPLICIT NONE
 
   INTEGER, PARAMETER :: int_kind_1 = SELECTED_INT_KIND(2)  !should map to INTEGER*1 on most modern processors
@@ -42,13 +42,13 @@ PROGRAM RWDSET_FORTRAN2003
   CHARACTER(LEN=6), PARAMETER :: dsetnamer4 = "dsetr4"     ! Dataset name
   CHARACTER(LEN=6), PARAMETER :: dsetnamer8 = "dsetr8"     ! Dataset name
 
-  INTEGER(HID_T) :: file_id       ! File identifier 
-  INTEGER(HID_T) :: dset_id1      ! Dataset identifier  
-  INTEGER(HID_T) :: dset_id4      ! Dataset identifier   
-  INTEGER(HID_T) :: dset_id8      ! Dataset identifier  
-  INTEGER(HID_T) :: dset_id16     ! Dataset identifier  
-  INTEGER(HID_T) :: dset_idr4      ! Dataset identifier   
-  INTEGER(HID_T) :: dset_idr8      ! Dataset identifier 
+  INTEGER(HID_T) :: file_id       ! File identifier
+  INTEGER(HID_T) :: dset_id1      ! Dataset identifier
+  INTEGER(HID_T) :: dset_id4      ! Dataset identifier
+  INTEGER(HID_T) :: dset_id8      ! Dataset identifier
+  INTEGER(HID_T) :: dset_id16     ! Dataset identifier
+  INTEGER(HID_T) :: dset_idr4      ! Dataset identifier
+  INTEGER(HID_T) :: dset_idr8      ! Dataset identifier
 
   INTEGER :: error ! Error flag
   INTEGER :: i
@@ -65,15 +65,15 @@ PROGRAM RWDSET_FORTRAN2003
   REAL(real_kind_7), DIMENSION(1:4), TARGET :: dset_data_r7, data_out_r7
   REAL(real_kind_15), DIMENSION(1:4), TARGET :: dset_data_r15, data_out_r15
 
-  INTEGER(HSIZE_T), DIMENSION(1:1) :: data_dims = (/4/) 
+  INTEGER(HSIZE_T), DIMENSION(1:1) :: data_dims = (/4/)
   INTEGER(HID_T) :: dspace_id     ! Dataspace identifier
-  
+
   TYPE(C_PTR) :: f_ptr
 
   !
   ! Initialize FORTRAN interface.
   !
-  CALL h5open_f(error) 
+  CALL h5open_f(error)
   !
   ! Initialize the dset_data array.
   !
@@ -130,7 +130,7 @@ PROGRAM RWDSET_FORTRAN2003
   !
   ! Read the dataset.
   !
-  ! Read data back into an integer size that is larger then the original size used for 
+  ! Read data back into an integer size that is larger then the original size used for
   ! writing the data
   f_ptr = C_LOC(data_out_i8a(1))
   CALL h5dread_f(dset_id1, h5kind_to_type(int_kind_8,H5_INTEGER_KIND), f_ptr,  error)
@@ -172,5 +172,5 @@ PROGRAM RWDSET_FORTRAN2003
 
 END PROGRAM RWDSET_FORTRAN2003
 
-               
+
 
diff --git a/fortran/examples/testh5fc.sh.in b/fortran/examples/testh5fc.sh.in
index f384909..200f311 100644
--- a/fortran/examples/testh5fc.sh.in
+++ b/fortran/examples/testh5fc.sh.in
@@ -71,13 +71,13 @@ temp_FILES="a.out $applib"
 # An application Main that calls hdf5 and application's own functions.
 cat > $appmain <<EOF
      PROGRAM FILEEXAMPLE
-     USE HDF5 ! This module contains all necessary modules 
-        
+     USE HDF5 ! This module contains all necessary modules
+
      IMPLICIT NONE
 
      CHARACTER(LEN=8), PARAMETER :: filename = "apptmp.h5" ! File name
      INTEGER(HID_T) :: file_id                            ! File identifier
- 
+
      INTEGER     ::   error  ! Error flag
 
      CALL sub1
@@ -86,7 +86,7 @@ cat > $appmain <<EOF
      CALL h5fclose_f(file_id, error)
      CALL h5close_f(error)
      CALL sub2
-     END PROGRAM FILEEXAMPLE 
+     END PROGRAM FILEEXAMPLE
 EOF
 
 # generate prog1
@@ -107,20 +107,20 @@ EOF
 # An HDF5 sample program that calls hdf5 functions.
 cat > $hdf5main <<EOF
      PROGRAM FILEEXAMPLE
-     USE HDF5 ! This module contains all necessary modules 
-        
+     USE HDF5 ! This module contains all necessary modules
+
      IMPLICIT NONE
 
      CHARACTER(LEN=8), PARAMETER :: filename = "apptmp.h5" ! File name
      INTEGER(HID_T) :: file_id                            ! File identifier
- 
+
      INTEGER     ::   error  ! Error flag
 
      CALL h5open_f (error)
      CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error)
      CALL h5fclose_f(file_id, error)
      CALL h5close_f(error)
-     END PROGRAM FILEEXAMPLE 
+     END PROGRAM FILEEXAMPLE
 EOF
 
 
diff --git a/fortran/src/H5Df.c b/fortran/src/H5Df.c
index 827baa1..8ef7936 100644
--- a/fortran/src/H5Df.c
+++ b/fortran/src/H5Df.c
@@ -1286,16 +1286,16 @@ h5dget_access_plist_c (hid_t_f *dset_id, hid_t_f *plist_id)
  * PURPOSE
  *  Call H5Treclaim
  * INPUTS
- *  type_id   - Identifier of the datatype. 
- *  space_id  - Identifier of the dataspace. 
- *  plist_id  - Identifier of the property list used to create the buffer. 
- *  buf       - Pointer to the buffer to be reclaimed.    
+ *  type_id   - Identifier of the datatype.
+ *  space_id  - Identifier of the dataspace.
+ *  plist_id  - Identifier of the property list used to create the buffer.
+ *  buf       - Pointer to the buffer to be reclaimed.
  *
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
  *   M. Scot Breitenfeld
- *  January 15, 2011 
+ *  January 15, 2011
  *
  * SOURCE
 */
diff --git a/fortran/src/H5Ef.c b/fortran/src/H5Ef.c
index 0a2f2a3..6631d3a 100644
--- a/fortran/src/H5Ef.c
+++ b/fortran/src/H5Ef.c
@@ -164,7 +164,7 @@ h5eget_major_c(int_f* error_no, _fcd name, size_t_f* namelen)
     size_t c_namelen = (size_t)*namelen;
     int_f ret_value = 0;
 
-    if(c_namelen > 0) 
+    if(c_namelen > 0)
         c_name = (char *)HDmalloc(c_namelen + 1);
 
     if(!c_name)
@@ -212,7 +212,7 @@ h5eget_minor_c(int_f* error_no, _fcd name, size_t_f* namelen)
     size_t c_namelen = (size_t)*namelen;
     int_f ret_value = 0;
 
-    if(c_namelen > 0) 
+    if(c_namelen > 0)
         c_name = (char *)HDmalloc(c_namelen + 1);
 
     if(!c_name)
@@ -242,7 +242,7 @@ done:
  *  estack_id   - Error stack identifier.
  *  func 	- Function to be called upon an error condition.
  *  client_data - Data passed to the error function.
- *   
+ *
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
diff --git a/fortran/src/H5Ff.c b/fortran/src/H5Ff.c
index 12fb7ed..7123f1d 100644
--- a/fortran/src/H5Ff.c
+++ b/fortran/src/H5Ff.c
@@ -486,11 +486,11 @@ h5fget_obj_count_c ( hid_t_f *file_id , int_f *obj_type, size_t_f * obj_count)
  *  Changed type of max_obj to size_t_f; added parameter for the
  *  number of open objects
  *  Thursday, September 25, 2008 EIP
- *	
+ *
  * SOURCE
 */
 int_f
-h5fget_obj_ids_c ( hid_t_f *file_id , int_f *obj_type, size_t_f *max_objs, 
+h5fget_obj_ids_c ( hid_t_f *file_id , int_f *obj_type, size_t_f *max_objs,
     hid_t_f *obj_ids, size_t_f *num_objs)
 /******/
 {
@@ -693,7 +693,7 @@ h5fget_file_image_c(hid_t_f *file_id, void *buf_ptr, size_t_f *buf_len, size_t_f
     /*
      * Call h5fget_file_image function
      */
-    
+
     if ( (c_buf_req = H5Fget_file_image((hid_t)*file_id, buf_ptr, (size_t)*buf_len)) < 0)
          HGOTO_DONE(FAIL);
 
diff --git a/fortran/src/H5Lf.c b/fortran/src/H5Lf.c
index b5ff7f2..1fee5e8 100644
--- a/fortran/src/H5Lf.c
+++ b/fortran/src/H5Lf.c
@@ -939,7 +939,7 @@ int_f
 h5lget_val_c(hid_t_f *link_loc_id, _fcd link_name, size_t_f *link_namelen, size_t_f *size,
 	      void *linkval_buff, hid_t_f *lapl_id)
 /******/
-{    
+{
     char *c_link_name = NULL; /* Buffer to hold C string */
     int_f ret_value = 0;       /* Return value */
 
diff --git a/fortran/src/H5Of.c b/fortran/src/H5Of.c
index 9780814..edbfcbe 100644
--- a/fortran/src/H5Of.c
+++ b/fortran/src/H5Of.c
@@ -27,7 +27,7 @@ fill_h5o_info_t_f(H5O_info2_t Oinfo, H5O_info_t_f *object_info);
 int_f
 fill_h5o_info_t_f(H5O_info2_t Oinfo, H5O_info_t_f *object_info) {
 
-  /* This function does not used the field parameter because we want 
+  /* This function does not used the field parameter because we want
    * this function to fill the unfilled fields with C's default values.
    */
 
@@ -184,7 +184,7 @@ h5oopen_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id, hid_
  * PURPOSE
  *  Call H5Oclose
  * INPUTS
- *  object_id   - Object identifier  
+ *  object_id   - Object identifier
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
@@ -197,10 +197,10 @@ h5oclose_c ( hid_t_f *object_id )
 /******/
 {
   int_f ret_value=0;          /* Return value */
-  
+
   if (H5Oclose((hid_t)*object_id) < 0)
     HGOTO_DONE(FAIL);
-  
+
  done:
   return ret_value;
 }
@@ -312,7 +312,7 @@ h5oget_info_by_name_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *l
   char *c_name = NULL;          /* Buffer to hold C string */
   int_f ret_value = 0;          /* Return value */
   H5O_info2_t Oinfo;
-  
+
   /*
    * Convert FORTRAN name to C name
    */
@@ -356,7 +356,7 @@ h5oget_info_by_name_c (hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *l
  * SOURCE
 */
 int_f
-h5oget_info_by_idx_c (hid_t_f *loc_id, _fcd  group_name, size_t_f *namelen, 
+h5oget_info_by_idx_c (hid_t_f *loc_id, _fcd  group_name, size_t_f *namelen,
                       int_f *index_field, int_f *order, hsize_t_f *n, hid_t_f *lapl_id, H5O_info_t_f *object_info, int_f *fields)
 /******/
 {
@@ -432,12 +432,12 @@ h5oget_info_c (hid_t_f *object_id, H5O_info_t_f *object_info, int_f *fields)
  *  H5Ocopy_c
  * PURPOSE
  *  Calls H5Ocopy
- * INPUTS  
- *  src_loc_id   - Object identifier indicating the location of the source object to be copied 
- *  src_name     - Name of the source object to be copied 
+ * INPUTS
+ *  src_loc_id   - Object identifier indicating the location of the source object to be copied
+ *  src_name     - Name of the source object to be copied
  *  src_name_len - Length of src_name
- *  dst_loc_id   - Location identifier specifying the destination 
- *  dst_name     - Name to be assigned to the new copy 
+ *  dst_loc_id   - Location identifier specifying the destination
+ *  dst_name     - Name to be assigned to the new copy
  *  dst_name_len - Length of dst_name
  *  ocpypl_id    - Object copy property list
  *  lcpl_id      - Link creation property list for the new hard link
@@ -451,15 +451,15 @@ h5oget_info_c (hid_t_f *object_id, H5O_info_t_f *object_info, int_f *fields)
 */
 int_f
 h5ocopy_c (hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_name_len,
-           hid_t_f *dst_loc_id, _fcd dst_name, size_t_f *dst_name_len, 
+           hid_t_f *dst_loc_id, _fcd dst_name, size_t_f *dst_name_len,
            hid_t_f *ocpypl_id, hid_t_f *lcpl_id )
 /******/
 {
   char *c_src_name = NULL;  /* Buffer to hold C string */
   char *c_dst_name = NULL;  /* Buffer to hold C string */
-  
+
   int_f ret_value = 0;      /* Return value */
-  
+
   /*
    * Convert FORTRAN name to C name
    */
@@ -471,7 +471,7 @@ h5ocopy_c (hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_name_len,
   /*
    * Call H5Ocopy function.
    */
-  if(H5Ocopy( (hid_t)*src_loc_id, c_src_name, (hid_t)*dst_loc_id, c_dst_name, 
+  if(H5Ocopy( (hid_t)*src_loc_id, c_src_name, (hid_t)*dst_loc_id, c_dst_name,
               (hid_t)*ocpypl_id, (hid_t)*lcpl_id) < 0)
     HGOTO_DONE(FAIL);
 
@@ -689,8 +689,8 @@ h5oset_comment_c (hid_t_f *object_id, _fcd comment, size_t_f *commentlen)
  *  Calls H5Oset_comment_by_name
  * INPUTS
  *  object_id  - Identifier of the target object.
- *  name       - Name of the object whose comment is to be set or reset, 
- *  specified as a path relative to loc_id. 
+ *  name       - Name of the object whose comment is to be set or reset,
+ *  specified as a path relative to loc_id.
  *  namelen    - Length of the name.
  *  comment    - The new comment.
  *  commentlen - Length of the comment.
@@ -757,7 +757,7 @@ h5oset_comment_by_name_c (hid_t_f *object_id, _fcd name, size_t_f *namelen,  _fc
  * SOURCE
 */
 int_f
-h5oopen_by_idx_c (hid_t_f *loc_id, _fcd  group_name, size_t_f *group_namelen, 
+h5oopen_by_idx_c (hid_t_f *loc_id, _fcd  group_name, size_t_f *group_namelen,
                   int_f *index_type, int_f *order, hsize_t_f *n, hid_t_f *obj_id, hid_t_f *lapl_id)
 /******/
 {
@@ -765,7 +765,7 @@ h5oopen_by_idx_c (hid_t_f *loc_id, _fcd  group_name, size_t_f *group_namelen,
   int_f ret_value = 0;
   H5_index_t c_index_type;
   H5_iter_order_t c_order;
-  
+
   /*
    * Convert FORTRAN string to C string
    */
@@ -818,13 +818,13 @@ h5oget_comment_c (hid_t_f *object_id, _fcd comment, size_t_f *commentsize,  hssi
   /*
    * Allocate buffer to hold comment name
    */
-  
+
   if(NULL == (c_comment = (char *)HDmalloc(c_commentsize)))
     HGOTO_DONE(FAIL);
 
   /*
    * Call H5Oget_comment function.
-   */ 
+   */
 
   if((*bufsize = (hssize_t_f)H5Oget_comment((hid_t)*object_id, c_comment, (size_t)*commentsize)) < 0)
     HGOTO_DONE(FAIL);
@@ -862,7 +862,7 @@ h5oget_comment_c (hid_t_f *object_id, _fcd comment, size_t_f *commentsize,  hssi
  * SOURCE
 */
 int_f
-h5oget_comment_by_name_c (hid_t_f *loc_id, _fcd name, size_t_f *name_size, 
+h5oget_comment_by_name_c (hid_t_f *loc_id, _fcd name, size_t_f *name_size,
                           _fcd comment, size_t_f *commentsize, size_t_f *bufsize, hid_t_f *lapl_id)
 /******/
 {
@@ -883,13 +883,13 @@ h5oget_comment_by_name_c (hid_t_f *loc_id, _fcd name, size_t_f *name_size,
   /*
    * Allocate buffer to hold comment name
    */
-  
+
   if(NULL == (c_comment = (char *)HDmalloc(c_commentsize)))
     HGOTO_DONE(FAIL);
 
   /*
    * Call H5Oget_comment_by_name function.
-   */ 
+   */
 
   if((c_bufsize = H5Oget_comment_by_name((hid_t)*loc_id, c_name, c_comment, (size_t)*commentsize,(hid_t)*lapl_id )) < 0)
     HGOTO_DONE(FAIL);
diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c
index a931903..7cb3db8 100644
--- a/fortran/src/H5Pf.c
+++ b/fortran/src/H5Pf.c
@@ -1831,7 +1831,7 @@ DONE:
  *  Wednesday, February 23, 2000
  * HISTORY
  *  Changed type of 'offset' from int_f to off_t_f -- MSB January 9, 2012
- *  
+ *
  * SOURCE
 */
 int_f
@@ -3153,7 +3153,7 @@ h5pget_class_name_c(hid_t_f *cls, _fcd name, int_f *name_len)
      char *c_name;
 
      /*
-      * Call H5Pget_class_name function. c_name is allocated by the library, 
+      * Call H5Pget_class_name function. c_name is allocated by the library,
       * has to be freed by application.
       */
      if(NULL == (c_name = H5Pget_class_name((hid_t)*cls)))
@@ -3216,7 +3216,7 @@ DONE:
  *  plist   - property list class identifier
  *  name     - name of the new property
  *  name_len - length of the "name" buffer
- *  Output:  
+ *  Output:
  *  value - property value
  * RETURNS
  *  0 on success, -1 on failure
@@ -5177,7 +5177,7 @@ h5pget_chunk_cache_c(hid_t_f *dapl_id, size_t_f *rdcc_nslots, size_t_f *rdcc_nby
  *
  *  Inputs:
  *  fapl_id - File access property list identifier
- *  buf_ptr - Pointer to the initial file image, 
+ *  buf_ptr - Pointer to the initial file image,
  *  or NULL if no initial file image is desired
  *  buf_len - Size of the supplied buffer, or 0 (zero) if no initial image is desired
  *
@@ -5207,7 +5207,7 @@ h5pset_file_image_c(hid_t_f *fapl_id, void *buf_ptr, size_t_f *buf_len)
  *  Inputs:
  *  fapl_id - File access property list identifier
  *  Outputs:
- *  buf_ptr - Pointer to the initial file image, 
+ *  buf_ptr - Pointer to the initial file image,
  *  or NULL if no initial file image is desired
  *  buf_len - Size of the supplied buffer, or 0 (zero) if no initial image is desired
  *
diff --git a/fortran/src/H5Rf.c b/fortran/src/H5Rf.c
index 6a3181f..df2ded4 100644
--- a/fortran/src/H5Rf.c
+++ b/fortran/src/H5Rf.c
@@ -351,7 +351,7 @@ h5rget_name_ptr_c (hid_t_f *loc_id, int_f *ref_type, void *ref, _fcd name, size_
  * OUTPUTS
  *  obj_type - Type of referenced object. These are defined in H5Opublic.h,
  *  enum H5O_type_t
- *              
+ *
  * RETURNS
  *  0 on success, -1 on failure
  * AUTHOR
diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c
index ced5049..8044b78 100644
--- a/fortran/src/H5_f.c
+++ b/fortran/src/H5_f.c
@@ -101,7 +101,7 @@ h5init_types_c( hid_t_f * types, hid_t_f * floatingtypes, hid_t_f * integertypes
       if (sizeof(int_f) == sizeof(long long)) {
 	if ((types[5] = (hid_t_f)H5Tcopy(H5T_NATIVE_LLONG)) < 0) return ret_value;
     } /*end else */
-    
+
     /* Find appropriate size to store Fortran REAL */
     if(sizeof(real_f)==sizeof(float)) {
       if ((types[6] = (hid_t_f)H5Tcopy(H5T_NATIVE_FLOAT)) < 0) return ret_value;
@@ -230,7 +230,7 @@ h5init_types_c( hid_t_f * types, hid_t_f * floatingtypes, hid_t_f * integertypes
     if ((integertypes[12] = (hid_t_f)H5Tcopy(H5T_STD_U32BE)) < 0) return ret_value;
     if ((integertypes[13] = (hid_t_f)H5Tcopy(H5T_STD_U32LE)) < 0) return ret_value;
     if ((integertypes[14] = (hid_t_f)H5Tcopy(H5T_STD_U64BE)) < 0) return ret_value;
-    if ((integertypes[15] = (hid_t_f)H5Tcopy(H5T_STD_U64LE)) < 0) return ret_value;	
+    if ((integertypes[15] = (hid_t_f)H5Tcopy(H5T_STD_U64LE)) < 0) return ret_value;
     if ((integertypes[17] = (hid_t_f)H5Tcopy(H5T_STD_B8BE)) < 0) return ret_value;
     if ((integertypes[18] = (hid_t_f)H5Tcopy(H5T_STD_B8LE)) < 0) return ret_value;
     if ((integertypes[19] = (hid_t_f)H5Tcopy(H5T_STD_B16BE)) < 0) return ret_value;
@@ -359,12 +359,12 @@ h5close_types_c( hid_t_f * types, int_f *lentypes,
  * SOURCE
  */
 int_f
-h5init_flags_c( int_f *h5d_flags, size_t_f *h5d_size_flags, 
+h5init_flags_c( int_f *h5d_flags, size_t_f *h5d_size_flags,
 		int_f *h5e_flags, hid_t_f *h5e_hid_flags, int_f *h5f_flags,
                 int_f *h5fd_flags, hid_t_f *h5fd_hid_flags,
                 int_f *h5g_flags, int_f *h5i_flags, int_f *h5l_flags, int_f *h5o_flags,
-                hid_t_f *h5p_flags, int_f *h5p_flags_int, int_f *h5r_flags, 
-                int_f *h5s_flags, hid_t_f *h5s_hid_flags, hsize_t_f *h5s_hsize_flags, 
+                hid_t_f *h5p_flags, int_f *h5p_flags_int, int_f *h5r_flags,
+                int_f *h5s_flags, hid_t_f *h5s_hid_flags, hsize_t_f *h5s_hsize_flags,
 		int_f *h5t_flags, int_f *h5z_flags, int_f *h5_generic_flags,
                 haddr_t_f *h5_haddr_generic_flags)
 /******/
diff --git a/fortran/src/H5config_f.inc.in b/fortran/src/H5config_f.inc.in
index 8921493..71eb936 100644
--- a/fortran/src/H5config_f.inc.in
+++ b/fortran/src/H5config_f.inc.in
@@ -12,7 +12,7 @@
 ! fortran/src/H5config_f.inc. Generated from fortran/src/H5config_f.inc.in by configure
 
 ! The script to replace the defines in H5config_f.inc.in is
-! located in configure.ac in the Fortran section. 
+! located in configure.ac in the Fortran section.
 
 ! Define if we have parallel support
 #undef HAVE_PARALLEL
@@ -47,7 +47,7 @@
 ! If C has quad precision
 #undef HAVE_FLOAT128
 
-! Define if INTEGER*16 is available 
+! Define if INTEGER*16 is available
 #undef HAVE_Fortran_INTEGER_SIZEOF_16
 
 ! Maximum decimal precision for C
diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h
index fe616d3..695efcd 100644
--- a/fortran/src/H5f90proto.h
+++ b/fortran/src/H5f90proto.h
@@ -160,9 +160,9 @@ H5_FCDLL int_f h5dfill_c(void * fill_value, hid_t_f *fill_type_id, hid_t_f *spac
 H5_FCDLL int_f h5dget_space_status_c( hid_t_f *dset_id, int_f *flag);
 H5_FCDLL int_f h5dcreate_anon_c(hid_t_f *loc_id, hid_t_f *type_id, hid_t_f *space_id,
 				  hid_t_f *dcpl_id, hid_t_f *dapl_id, hid_t_f *dset_id);
-H5_FCDLL int_f h5dwrite_f_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, 
+H5_FCDLL int_f h5dwrite_f_c(hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id,
 				   hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf);
-H5_FCDLL int_f h5dread_f_c( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_space_id, 
+H5_FCDLL int_f h5dread_f_c( hid_t_f *dset_id ,  hid_t_f *mem_type_id, hid_t_f *mem_space_id,
 				   hid_t_f *file_space_id, hid_t_f *xfer_prp, void *buf);
 H5_FCDLL int_f h5dvlen_reclaim_c(hid_t_f *type_id ,  hid_t_f *space_id, hid_t_f *plist_id, void *buf);
 
@@ -323,22 +323,22 @@ H5_FCDLL int_f h5ovisit_c(hid_t_f *group_id, int_f *index_type, int_f *order, H5
 H5_FCDLL int_f h5ovisit_by_name_c(hid_t_f *loc_id,  _fcd object_name, size_t_f *namelen, int_f *index_type, int_f *order,
 				   H5O_iterate2_t op, void *op_data, hid_t_f *lapl_id, int_f *fields );
 H5_FCDLL int_f h5oget_info_c(hid_t_f *object_id, H5O_info_t_f *object_info, int_f *fields);
-H5_FCDLL int_f h5oget_info_by_idx_c(hid_t_f *loc_id, _fcd  group_name, size_t_f *namelen, 
+H5_FCDLL int_f h5oget_info_by_idx_c(hid_t_f *loc_id, _fcd  group_name, size_t_f *namelen,
 				      int_f *index_field, int_f *order, hsize_t_f *n, hid_t_f *lapl_id, H5O_info_t_f *object_info, int_f *fields);
 H5_FCDLL int_f h5oget_info_by_name_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id,
 				       H5O_info_t_f *object_info, int_f *fields);
 H5_FCDLL int_f h5ocopy_c(hid_t_f *src_loc_id, _fcd src_name, size_t_f *src_name_len,
-			   hid_t_f *dst_loc_id, _fcd dst_name, size_t_f *dst_name_len, 
+			   hid_t_f *dst_loc_id, _fcd dst_name, size_t_f *dst_name_len,
 			   hid_t_f *ocpypl_id, hid_t_f *lcpl_id );
 H5_FCDLL int_f h5odecr_refcount_c(hid_t_f *object_id);
 H5_FCDLL int_f h5oincr_refcount_c(hid_t_f *object_id);
 H5_FCDLL int_f h5oexists_by_name_c(hid_t_f *loc_id, _fcd name, size_t_f *namelen, hid_t_f *lapl_id);
 H5_FCDLL int_f h5oset_comment_c(hid_t_f *object_id, _fcd comment, size_t_f *commentlen);
 H5_FCDLL int_f h5oset_comment_by_name_c(hid_t_f *object_id, _fcd name, size_t_f *namelen,  _fcd comment, size_t_f *commentlen, hid_t_f *lapl_id);
-H5_FCDLL int_f h5oopen_by_idx_c(hid_t_f *loc_id, _fcd  group_name, size_t_f *group_namelen, 
+H5_FCDLL int_f h5oopen_by_idx_c(hid_t_f *loc_id, _fcd  group_name, size_t_f *group_namelen,
 				      int_f *index_type, int_f *order, hsize_t_f *n, hid_t_f *obj_id, hid_t_f *lapl_id);
 H5_FCDLL int_f h5oget_comment_c(hid_t_f *object_id, _fcd comment, size_t_f *commentsize, hssize_t_f *bufsize);
-H5_FCDLL int_f h5oget_comment_by_name_c(hid_t_f *loc_id, _fcd name, size_t_f *name_size, 
+H5_FCDLL int_f h5oget_comment_by_name_c(hid_t_f *loc_id, _fcd name, size_t_f *name_size,
 					  _fcd comment, size_t_f *commentsize, size_t_f *bufsize, hid_t_f *lapl_id);
 H5_FCDLL int_f h5otoken_cmp_c(hid_t_f *loc_id, H5O_token_t *token1,
                                 H5O_token_t *token2, int_f *cmp_value);
@@ -528,12 +528,12 @@ H5_FCDLL int_f h5open_c(void);
 H5_FCDLL int_f h5close_c(void);
 H5_FCDLL int_f h5init_types_c(hid_t_f *types, hid_t_f *floatingtypes, hid_t_f *integertypes);
 H5_FCDLL int_f h5close_types_c(hid_t_f *types, int_f *lentypes, hid_t_f *floatingtypes, int_f *floatinglen, hid_t_f *integertypes, int_f *integerlen);
-H5_FCDLL int_f h5init_flags_c( int_f *h5d_flags, size_t_f *h5d_size_flags, 
+H5_FCDLL int_f h5init_flags_c( int_f *h5d_flags, size_t_f *h5d_size_flags,
 		int_f *h5e_flags, hid_t_f *h5e_hid_flags, int_f *h5f_flags,
                 int_f *h5fd_flags, hid_t_f *h5fd_hid_flags,
                 int_f *h5g_flags, int_f *h5i_flags, int_f *h5l_flags, int_f *h5o_flags,
-                hid_t_f *h5p_flags, int_f *h5p_flags_int, int_f *h5r_flags, 
-                int_f *h5s_flags, hid_t_f *h5s_hid_flags, hsize_t_f *h5s_hsize_flags, 
+                hid_t_f *h5p_flags, int_f *h5p_flags_int, int_f *h5r_flags,
+                int_f *h5s_flags, hid_t_f *h5s_hid_flags, hsize_t_f *h5s_hsize_flags,
 		int_f *h5t_flags, int_f *h5z_flags, int_f *h5_generic_flags,
                 haddr_t_f *h5_haddr_generic_flags);
 H5_FCDLL int_f h5init1_flags_c(int_f *h5lib_flags);
diff --git a/fortran/src/H5match_types.c b/fortran/src/H5match_types.c
index ec2d66f..231b90d 100644
--- a/fortran/src/H5match_types.c
+++ b/fortran/src/H5match_types.c
@@ -150,7 +150,7 @@ int main(void)
   int RealKinds[] = H5_FORTRAN_REAL_KINDS;
   int RealKinds_SizeOf[] = H5_FORTRAN_REAL_KINDS_SIZEOF;
   char Real_C_TYPES[10][32];
-  
+
   int FORTRAN_NUM_INTEGER_KINDS=H5_FORTRAN_NUM_INTEGER_KINDS;
   int H5_FORTRAN_NUM_REAL_KINDS;
 #if H5_FORTRAN_HAVE_C_LONG_DOUBLE!=0
@@ -208,13 +208,13 @@ int main(void)
     }
     else if(sizeof(double) == RealKinds_SizeOf[i]) {
       writeTypedef("float", "double", RealKinds[i]);
-      strcpy(Real_C_TYPES[i], "C_DOUBLE"); 
+      strcpy(Real_C_TYPES[i], "C_DOUBLE");
     }
 #if H5_FORTRAN_HAVE_C_LONG_DOUBLE!=0
     else if(sizeof(long double) == RealKinds_SizeOf[i] && found_long_double == 0) {
       writeTypedef("float", "long double", RealKinds[i]);
       strcpy(Real_C_TYPES[i], "C_LONG_DOUBLE");
-      found_long_double = 1; 
+      found_long_double = 1;
     }
 #  ifdef H5_HAVE_FLOAT128
     /* Don't select a higher precision than Fortran can support */
@@ -329,7 +329,7 @@ int main(void)
 /* Defined different KINDs of integers */
 
   fprintf(fort_header,"        INTEGER, DIMENSION(1:%d), PARAMETER :: Fortran_INTEGER_AVAIL_KINDS = (/", FORTRAN_NUM_INTEGER_KINDS);
-  
+
   for(i=0;i<FORTRAN_NUM_INTEGER_KINDS;i++) {
     fprintf(fort_header,"%d",(int)IntKinds[i]);
     if(i==FORTRAN_NUM_INTEGER_KINDS-1) {
@@ -337,7 +337,7 @@ int main(void)
     } else {
       fprintf(fort_header,",");
     }
-    
+
   }
 
   /* real_4, real_8, real_16 */
diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am
index 4009439..f8ef02b 100644
--- a/fortran/src/Makefile.am
+++ b/fortran/src/Makefile.am
@@ -48,7 +48,7 @@ libhdf5_fortran_la_SOURCES=H5f90global.F90 \
           H5f90kit.c H5_f.c H5Af.c H5Df.c H5Ef.c H5Ff.c H5Gf.c           \
           H5If.c H5Lf.c H5Of.c H5Pf.c H5Rf.c H5Sf.c H5Tf.c H5Zf.c HDF5.F90
 
-# HDF5 Fortran library depends on HDF5 Library. 
+# HDF5 Fortran library depends on HDF5 Library.
 libhdf5_fortran_la_LIBADD=$(LIBHDF5)
 
 # h5fc is generated during configure.
diff --git a/fortran/src/h5fc.in b/fortran/src/h5fc.in
index 29ef83f..080f7ff 100644
--- a/fortran/src/h5fc.in
+++ b/fortran/src/h5fc.in
@@ -75,12 +75,12 @@ SHOW="eval"
 FCBASE="@FC@"
 FLINKERBASE="@FC@"
 
-# FCFLAGS and LDFLAGS are reserved for use by the script user.  
+# FCFLAGS and LDFLAGS are reserved for use by the script user.
 # FLAGS brought from the hdf5 build are put in H5BLD_*FLAGS.
 
-# User's FCFLAGS come after their H5BLD counterparts. User's LDFLAGS come just 
-# before clibpath, user's LIBS come after $link_objs and before the hdf5 
-# libraries in $link_args, followed by any external library paths and libraries 
+# User's FCFLAGS come after their H5BLD counterparts. User's LDFLAGS come just
+# before clibpath, user's LIBS come after $link_objs and before the hdf5
+# libraries in $link_args, followed by any external library paths and libraries
 # from AM_LDFLAGS, LDFLAGS, AM_LIBS or LIBS carried in from the hdf5 build.
 # The order of the flags is intended to give precedence to the user's flags.
 H5BLD_FCFLAGS="@AM_FCFLAGS@ @FCFLAGS@"
@@ -358,9 +358,9 @@ if test "x$do_link" = "xyes"; then
   # module. It's okay if they're included twice in the compile line.
   link_args="$link_args $H5BLD_LDFLAGS $H5BLD_LIBS"
 
-  # User's FCFLAGS come after their H5BLD counterparts. User's LDFLAGS come just 
-  # before clibpath, user's LIBS come after $link_objs and before the hdf5 
-  # libraries in $link_args, followed by any external library paths and libraries 
+  # User's FCFLAGS come after their H5BLD counterparts. User's LDFLAGS come just
+  # before clibpath, user's LIBS come after $link_objs and before the hdf5
+  # libraries in $link_args, followed by any external library paths and libraries
   # from AM_LDFLAGS, LDFLAGS, AM_LIBS or LIBS carried in from the hdf5 build.
   # The order of the flags is intended to give precedence to the user's flags.
   $SHOW $FLINKER $FCFLAGS $H5BLD_FCFLAGS $F9XSUFFIXFLAG $LDFLAGS $fmodules $link_objs $LIBS $link_args $shared_link
diff --git a/fortran/test/Makefile.am b/fortran/test/Makefile.am
index f0d7f03..0236e19 100644
--- a/fortran/test/Makefile.am
+++ b/fortran/test/Makefile.am
@@ -91,7 +91,7 @@ tf_gen.F90: H5_test_buildiface$(EXEEXT)
 
 H5_test_buildiface_SOURCES = H5_test_buildiface.F90
 
-# The build of the H5_test_buildiface does not depend on any libraries, so set it 
+# The build of the H5_test_buildiface does not depend on any libraries, so set it
 # to nothing.
 
 H5_test_buildiface_LDADD =
diff --git a/fortran/testpar/hyper.f90 b/fortran/testpar/hyper.f90
index c07636f..605d69b 100644
--- a/fortran/testpar/hyper.f90
+++ b/fortran/testpar/hyper.f90
@@ -135,7 +135,7 @@ SUBROUTINE hyper(length,do_collective,do_chunk, mpi_size, mpi_rank, nerrors)
      ! Collective metadata READ API calling requirement
      CALL h5pset_all_coll_metadata_ops_f(fapl_id, is_coll_true, hdferror)
      CALL check("h5pset_all_coll_metadata_ops_f", hdferror, nerrors)
-   
+
      CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, hdferror, access_prp = fapl_id)
      CALL check("h5fcreate_f", hdferror, nerrors)
 
@@ -144,7 +144,7 @@ SUBROUTINE hyper(length,do_collective,do_chunk, mpi_size, mpi_rank, nerrors)
      CALL check("h5pclose_f", hdferror, nerrors)
      CALL h5fget_access_plist_f(file_id, fapl_id, hdferror)
      CALL check("h5fget_access_plist_f", hdferror, nerrors)
-    
+
      ! verify settings for file access properties
 
      ! Collective metadata writes
diff --git a/fortran/testpar/ptest.f90 b/fortran/testpar/ptest.f90
index 3b07f21..0721244 100644
--- a/fortran/testpar/ptest.f90
+++ b/fortran/testpar/ptest.f90
@@ -18,8 +18,8 @@
 PROGRAM parallel_test
   USE HDF5
   USE MPI
-  USE TH5_MISC 
-  
+  USE TH5_MISC
+
   IMPLICIT NONE
 
   INTEGER :: mpierror                             ! MPI hdferror flag