[svn-r8417] Purpose:

    Code cleanup

Description:
    Remove "NEW_HYPERSLAB_API" code from release branch, since it was leftover
from when we branched the 1.6 branch from the main development trunk and will
never be activated in the 1.6 branch.  (And I'm tired of maintaining it in
both branches when I'm optimizing the library :-)

Platforms tested:
    FreeBSD 4.9 (sleipnir)
    Linux 2.4 (verbena) w/FORTRAN
    too minor to require full h5committest

3 files changed, 0 insertions, 449 deletions

diff --git a/fortran/src/H5Sf.c b/fortran/src/H5Sf.c
index ae3a201..25d8585 100644
--- a/fortran/src/H5Sf.c
+++ b/fortran/src/H5Sf.c
@@ -810,141 +810,6 @@ DONE:
   if(c_block != NULL) HDfree(c_block);
   return ret_value;
 }
-#ifdef NEW_HYPERSLAB_API
-/*----------------------------------------------------------------------------
- * Name:        h5scombine_hyperslab_c
- * Purpose:     Call H5Scombine_hyperslab 
- * Inputs:      space_id - identifier of the dataspace 
- *              operator - defines how the new selection is combined
- *              start - offset of start of hyperslab 
- *              count - number of blocks included in the hyperslab
- *              stride - hyperslab stride (interval between blocks)
- *              block - size of block in the hyperslab
- * Outputs:     hyper_id - identifier for the new dataspace
- * Returns:     0 on success, -1 on failure
- * Programmer:  Elena Pourmal
- *              Monday, October 7, 2002
- * Modifications:
- *---------------------------------------------------------------------------*/
-
-int_f 
-nh5scombine_hyperslab_c ( hid_t_f *space_id , int_f *op, hssize_t_f *start, hsize_t_f *count, hsize_t_f *stride, hsize_t_f *block, hid_t_f *hyper_id)
-{
-  int ret_value = -1;
-  hid_t c_space_id;
-  hid_t c_hyper_id;
-  hssize_t *c_start = NULL;
-  hsize_t *c_count = NULL;
-  hsize_t *c_stride = NULL;
-  hsize_t *c_block = NULL; 
-
-  H5S_seloper_t c_op;
-  herr_t  status;
-  int rank;
-  int i;
-
-  rank = H5Sget_simple_extent_ndims(*space_id);
-  if (rank < 0 ) return ret_value;
-  c_start = (hssize_t *)HDmalloc(sizeof(hssize_t)*rank);
-  if (c_start == NULL) goto DONE;
-
-  c_count = (hsize_t *)HDmalloc(sizeof(hsize_t)*rank);
-  if (c_count == NULL) goto DONE;
-
-  c_stride = (hsize_t *)HDmalloc(sizeof(hsize_t)*rank);
-  if (c_stride == NULL) goto DONE;
-
-  c_block = (hsize_t *)HDmalloc(sizeof(hsize_t)*rank);
-  if (c_block == NULL) goto DONE;
-
-
-  /*
-   * Reverse dimensions due to C-FORTRAN storage order.
-   */
-
-  for (i=0; i < rank; i++) {
-      int t= (rank - i) - 1;
-      c_start[i] = (hssize_t)start[t];
-      c_count[i] = (hsize_t)count[t];
-      c_stride[i] = (hsize_t)stride[t];
-      c_block[i] = (hsize_t)block[t];
-  }
-
-   c_op = (H5S_seloper_t)*op;
-
-  c_space_id = (hid_t)*space_id;
-  c_hyper_id = H5Scombine_hyperslab(c_space_id, c_op, c_start, c_stride, c_count, c_block);
-  if ( c_hyper_id < 0  ) goto DONE;
-  *hyper_id = (hid_t_f)c_hyper_id;
-  ret_value = 0;
-DONE:
-  if(c_start != NULL) HDfree(c_start);
-  if(c_count != NULL) HDfree(c_count);
-  if(c_stride!= NULL) HDfree(c_stride);
-  if(c_block != NULL) HDfree(c_block);
-  return ret_value;
-}
-/*----------------------------------------------------------------------------
- * Name:        h5scombine_select_c
- * Purpose:     Call H5Scombine_ select
- * Inputs:      space1_id - identifier of the first dataspace 
- *              operator - defines how the new selection is combined
- *              space2_id - identifier of the second dataspace 
- * Outputs:     ds_id   - identifier for the new dataspace
- * Returns:     0 on success, -1 on failure
- * Programmer:  Elena Pourmal
- *              Monday, October 7, 2002
- * Modifications:
- *---------------------------------------------------------------------------*/
-
-int_f 
-nh5scombine_select_c ( hid_t_f *space1_id , int_f *op, hid_t_f *space2_id, hid_t_f *ds_id)
-{
-  int ret_value = -1;
-  hid_t c_space1_id;
-  hid_t c_space2_id;
-  hid_t c_ds_id;
-  H5S_seloper_t c_op;
-
-  c_op = (H5S_seloper_t)*op;
-
-  c_space1_id = (hid_t)*space1_id;
-  c_space2_id = (hid_t)*space2_id;
-  c_ds_id = H5Scombine_select(c_space1_id, c_op, c_space2_id);
-  if ( c_ds_id < 0  ) return ret_value;
-  *ds_id = (hid_t_f)c_ds_id;
-  ret_value = 0;
-  return ret_value;
-}
-/*----------------------------------------------------------------------------
- * Name:        h5sselect_select_c
- * Purpose:     Call H5Sselect_ select
- * Inputs:      space1_id - identifier of the first dataspace  to modify
- *              operator - defines how the new selection is combined
- *              space2_id - identifier of the second dataspace 
- * Returns:     0 on success, -1 on failure
- * Programmer:  Elena Pourmal
- *              Monday, October 7, 2002
- * Modifications:
- *---------------------------------------------------------------------------*/
-
-int_f 
-nh5sselect_select_c ( hid_t_f *space1_id , int_f *op, hid_t_f *space2_id)
-{
-  int ret_value = -1;
-  hid_t c_space1_id;
-  hid_t c_space2_id;
-  H5S_seloper_t c_op;
-
-  c_op = (H5S_seloper_t)*op;
-
-  c_space1_id = (hid_t)*space1_id;
-  c_space2_id = (hid_t)*space2_id;
-  if( H5Sselect_select(c_space1_id, c_op, c_space2_id)< 0) return ret_value;
-  ret_value = 0;
-  return ret_value;
-}
-#endif /*NEW_HYPERSLAB_API*/
 /*----------------------------------------------------------------------------
  * Name:        h5sget_select_type_c
  * Purpose:     Call H5Sget_select_type
diff --git a/fortran/src/H5Sff.f90 b/fortran/src/H5Sff.f90
index 1657b39..9f96dc9 100644
--- a/fortran/src/H5Sff.f90
+++ b/fortran/src/H5Sff.f90
@@ -1577,308 +1577,6 @@
  
           END SUBROUTINE h5sselect_hyperslab_f
 !----------------------------------------------------------------------
-! Name:		h5scombine_hyperslab_f 
-!
-! Purpose:	Combine a hyperslab selection with the current 
-!               selection for a dataspace 
-!
-! Inputs:  
-!		space_id	- dataspace of selection to use 
-!		operator	- flag, valid values are:
-!				  H5S_SELECT_NOOP_F 
-!				  H5S_SELECT_SET_F 
-!				  H5S_SELECT_OR_F 
-!				  H5S_SELECT_AND_F 
-!				  H5S_SELECT_XOR_F 
-!				  H5S_SELECT_NOTB_F 
-!				  H5S_SELECT_NOTA_F 
-!				  H5S_SELECT_APPEND_F 
-!				  H5S_SELECT_PREPEND_F 
-!		start		- array with hyperslab offsets
-!		count		- number of blocks included in the 
-!				  hyperslab
-! Outputs:  
-!               hyper_id        - identifier for the new hyperslab
-!		hdferr:		- error code		
-!				 	Success:  0
-!				 	Failure: -1   
-! Optional parameters:
-!		stride		- array with hyperslab strides
-!		block		- array with hyperslab block sizes 
-!
-! Programmer:	Elena Pourmal
-!		October 7, 2002
-!
-! Modifications: 	
-!
-! Comment:	Commented out until 1.6 ? 10/08/2002	
-!----------------------------------------------------------------------
-
-!          SUBROUTINE h5scombine_hyperslab_f(space_id, operator, start, count, &
-!                                            hyper_id,  hdferr, stride, block) 
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5scombine_hyperslab_f
-!DEC$endif
-!
-!            IMPLICIT NONE
-!            INTEGER(HID_T), INTENT(IN) :: space_id ! Dataspace identifier 
-!            INTEGER, INTENT(IN) :: operator     ! Flag, valid values are:
-						!  H5S_SELECT_NOOP_F 
-						!  H5S_SELECT_SET_F 
-						!  H5S_SELECT_OR_F 
-						!  H5S_SELECT_AND_F 
-						!  H5S_SELECT_XOR_F 
-						!  H5S_SELECT_NOTB_F 
-						!  H5S_SELECT_NOTA_F 
-						!  H5S_SELECT_APPEND_F 
-						!  H5S_SELECT_PREPEND_F 
-                                                !  
-!            INTEGER(HSSIZE_T), DIMENSION(*), INTENT(IN) :: start
-                                          ! Starting coordinates of the hyperslab 
-!            INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: count 
-                                          ! Number of blocks to select 
-                                          ! from dataspace 
-!            INTEGER(HID_T), INTENT(OUT) :: hyper_id ! New hyperslab identifier 
-!            INTEGER, INTENT(OUT) :: hdferr     ! Error code
-!            INTEGER(HSIZE_T), DIMENSION(:), OPTIONAL, INTENT(IN) :: stride
-                                          ! Array of how many elements to move
-                                          ! in each direction
-!            INTEGER(HSIZE_T), DIMENSION(:), OPTIONAL, INTENT(IN) :: block 
-                                          ! Sizes of element block
-!            INTEGER(HSIZE_T), DIMENSION(:), ALLOCATABLE :: def_block 
-!            INTEGER(HSIZE_T), DIMENSION(:), ALLOCATABLE :: def_stride
-!            INTEGER :: rank
-!            INTEGER :: error1, error2 
-
-!            INTERFACE
-!              INTEGER FUNCTION h5scombine_hyperslab_c(space_id, operator, &
-!                               start, count, stride, block, hyper_id)
-!              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5SCOMBINE_HYPERSLAB_C'::h5scombine_hyperslab_c
-              !DEC$ ENDIF
-!              INTEGER(HID_T), INTENT(IN) :: space_id
-!              INTEGER, INTENT(IN) :: operator
-!              INTEGER(HSSIZE_T), DIMENSION(*), INTENT(IN) :: start
-!              INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: count
-!              INTEGER(HSIZE_T), DIMENSION(*), OPTIONAL, INTENT(IN) :: stride
-!              INTEGER(HSIZE_T), DIMENSION(*), OPTIONAL, INTENT(IN) :: block 
-!              INTEGER(HID_T), INTENT(OUT) :: hyper_id
-!              END FUNCTION h5scombine_hyperslab_c
-!            END INTERFACE
-
-!            if (present(stride).and. present(block)) then
-!            hdferr = h5scombine_hyperslab_c(space_id, operator, start, count, &
-!                                           stride, block, hyper_id)
-!            return
-!            endif
-            ! Case of optional parameters.
-            !
-            ! Find the rank of the dataspace to allocate memery for
-            ! default stride and block arrays.
-            !
-!            CALL h5sget_simple_extent_ndims_f(space_id, rank, hdferr)
-!            if( hdferr .EQ. -1) return
-            !
-!            if (present(stride).and. .not.present(block)) then
-!            allocate(def_block(rank), stat=error1)
-!                if (error1.NE.0) then
-!                    hdferr = -1
-!                    return
-!                endif
-!            def_block = 1
-!            hdferr = h5scombine_hyperslab_c(space_id, operator, start, count, &
-!                                           stride, def_block, hyper_id)
-!            deallocate(def_block)
-!            return
-!            endif
-
-!            if (.not.present(stride).and. present(block)) then
-!            allocate(def_stride(rank), stat=error2)
-!                if (error2.NE.0) then
-!                    hdferr = -1
-!                    return
-!                endif
-!            def_stride = 1
-!            hdferr = h5scombine_hyperslab_c(space_id, operator, start, count, &
-!                                           def_stride, block, hyper_id)
-!            deallocate(def_stride)
-!            return
-!            endif
-!            allocate(def_block(rank), stat=error1)
-!            allocate(def_stride(rank), stat=error2)
-!                if ((error1.NE.0) .OR. (error2.NE.0)) then
-!                    hdferr = -1
-!                    return
-!                endif
-!            def_block = 1
-!            def_stride = 1
-!            hdferr = h5scombine_hyperslab_c(space_id, operator, start, count, &
-!                                           def_stride, def_block, hyper_id)
-!            deallocate(def_block)
-!            deallocate(def_stride)
- 
-!          END SUBROUTINE h5scombine_hyperslab_f
-
-!----------------------------------------------------------------------
-! Name:		h5scombine_select_f 
-!
-! Purpose:	Combine two hyperslab selections with an operation 
-!               and return a dataspace with resulting selection.
-!
-! Inputs:  
-!		space1_id	- dataspace of selection to use 
-!		operator	- flag, valid values are:
-!				  H5S_SELECT_NOOP_F 
-!				  H5S_SELECT_SET_F 
-!				  H5S_SELECT_OR_F 
-!				  H5S_SELECT_AND_F 
-!				  H5S_SELECT_XOR_F 
-!				  H5S_SELECT_NOTB_F 
-!				  H5S_SELECT_NOTA_F 
-!				  H5S_SELECT_APPEND_F 
-!				  H5S_SELECT_PREPEND_F 
-!		space2_id	- dataspace of selection to use 
-! Outputs:  
-!               ds_id           - idataspace identifier with the new selection
-!		hdferr:		- error code		
-!				 	Success:  0
-!				 	Failure: -1   
-! Optional parameters:		- NONE
-!
-! Programmer:	Elena Pourmal
-!		October 7, 2002
-!
-! Modifications: 	
-!
-! Comment: commented out until 1.6 release(?) 10/08/2002		
-!----------------------------------------------------------------------
-
-!          SUBROUTINE h5scombine_select_f(space1_id, operator, space2_id, &
-!                                            ds_id,  hdferr) 
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5scombine_select_f
-!DEC$endif
-!
-!            IMPLICIT NONE
-!            INTEGER(HID_T), INTENT(IN) :: space1_id ! First dataspace identifier 
-!            INTEGER(HID_T), INTENT(IN) :: space2_id ! Second dataspace identifier 
-!            INTEGER, INTENT(IN) :: operator     ! Flag, valid values are:
-						!  H5S_SELECT_NOOP_F 
-						!  H5S_SELECT_SET_F 
-						!  H5S_SELECT_OR_F 
-						!  H5S_SELECT_AND_F 
-						!  H5S_SELECT_XOR_F 
-						!  H5S_SELECT_NOTB_F 
-						!  H5S_SELECT_NOTA_F 
-						!  H5S_SELECT_APPEND_F 
-						!  H5S_SELECT_PREPEND_F 
-                                                !  
-!            INTEGER(HID_T), INTENT(OUT) :: ds_id ! New dataspace identifier 
-!            INTEGER, INTENT(OUT) :: hdferr     ! Error code
-!
-!            INTERFACE
-!              INTEGER FUNCTION h5scombine_select_c(space1_id, operator, &
-!                               space2_id, ds_id)
-!              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5SCOMBINE_SELECT_C'::h5scombine_select_c
-              !DEC$ ENDIF
-!              INTEGER(HID_T), INTENT(IN) :: space1_id
-!              INTEGER(HID_T), INTENT(IN) :: space2_id
-!              INTEGER, INTENT(IN) :: operator
-!              INTEGER(HID_T), INTENT(OUT) :: ds_id
-!              END FUNCTION h5scombine_select_c
-!            END INTERFACE
-
-!            hdferr = h5scombine_select_c(space1_id, operator, space2_id, &
-!                                         ds_id)
-!            return
- 
-!          END SUBROUTINE h5scombine_select_f
-
-!----------------------------------------------------------------------
-! Name:		h5sselect_select_f 
-!
-! Purpose:	Refine a hyperslab selection with an operation 
-!               using second hyperslab
-!
-! Inputs:  
-!		space1_id	- dataspace of selection  to modify
-!		operator	- flag, valid values are:
-!				  H5S_SELECT_NOOP_F 
-!				  H5S_SELECT_SET_F 
-!				  H5S_SELECT_OR_F 
-!				  H5S_SELECT_AND_F 
-!				  H5S_SELECT_XOR_F 
-!				  H5S_SELECT_NOTB_F 
-!				  H5S_SELECT_NOTA_F 
-!				  H5S_SELECT_APPEND_F 
-!				  H5S_SELECT_PREPEND_F 
-!		space2_id	- dataspace of selection to use 
-!				  
-! Outputs:  
-!		hdferr:		- error code		
-!				 	Success:  0
-!				 	Failure: -1   
-! Optional parameters:		- NONE
-!
-! Programmer:	Elena Pourmal
-!		October 7, 2002
-!
-! Modifications: 	
-!
-! Comment:Commented out until 1.6 release(?) 10/08/2002 EIP		
-!----------------------------------------------------------------------
-
-!          SUBROUTINE h5sselect_select_f(space1_id, operator, space2_id, &
-!                                        hdferr) 
-!
-!This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
-!DEC$attributes dllexport :: h5sselect_select_f
-!DEC$endif
-!
-!            IMPLICIT NONE
-!            INTEGER(HID_T), INTENT(INOUT) :: space1_id ! Dataspace identifier to
-                                                       ! modify 
-!            INTEGER(HID_T), INTENT(IN) :: space2_id ! Second dataspace identifier 
-!            INTEGER, INTENT(IN) :: operator     ! Flag, valid values are:
-						!  H5S_SELECT_NOOP_F 
-						!  H5S_SELECT_SET_F 
-						!  H5S_SELECT_OR_F 
-						!  H5S_SELECT_AND_F 
-						!  H5S_SELECT_XOR_F 
-						!  H5S_SELECT_NOTB_F 
-						!  H5S_SELECT_NOTA_F 
-						!  H5S_SELECT_APPEND_F 
-						!  H5S_SELECT_PREPEND_F 
-                                                !  
-!            INTEGER, INTENT(OUT) :: hdferr     ! Error code
-
-!            INTERFACE
-!              INTEGER FUNCTION h5sselect_select_c(space1_id, operator, &
-!                               space2_id)
-!              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !MS$ATTRIBUTES C,reference,alias:'_H5SSELECT_SELECT_C'::h5sselect_select_c
-              !DEC$ ENDIF
-!              INTEGER(HID_T), INTENT(INOUT) :: space1_id
-!              INTEGER(HID_T), INTENT(IN) :: space2_id
-!              INTEGER, INTENT(IN) :: operator
-!              END FUNCTION h5sselect_select_c
-!            END INTERFACE
-
-!            hdferr = h5sselect_select_c(space1_id, operator, space2_id)
-!            return
- 
-!          END SUBROUTINE h5sselect_select_f
-
-!----------------------------------------------------------------------
 ! Name:		h5sget_select_type_f 
 !
 ! Purpose:	Retrieve the type of selection
diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h
index e5c0a9c..d4d9be2 100644
--- a/fortran/src/H5f90proto.h
+++ b/fortran/src/H5f90proto.h
@@ -113,9 +113,6 @@ H5_DLL int_f nh5fflush_c (hid_t_f *obj_id, int_f *scope);
 #   define nh5sextent_copy_c        FNAME(H5SEXTENT_COPY_C)
 #   define nh5sset_extent_none_c    FNAME(H5SSET_EXTENT_NONE_C)
 #   define nh5sselect_hyperslab_c   FNAME(H5SSELECT_HYPERSLAB_C)
-#   define nh5scombine_hyperslab_c   FNAME(H5SCOMBINE_HYPERSLAB_C)
-#   define nh5scombine_select_c   FNAME(H5SCOMBINE_SELECT_C)
-#   define nh5sselect_select_c   FNAME(H5SSELECT_SELECT_C)
 #   define nh5sget_select_type_c   FNAME(H5SGET_SELECT_TYPE_C)
 #   define nh5sselect_elements_c    FNAME(H5SSELECT_ELEMENTS_C)
 #else                                              /* !DF_CAPFNAMES */
@@ -143,9 +140,6 @@ H5_DLL int_f nh5fflush_c (hid_t_f *obj_id, int_f *scope);
 #   define nh5sextent_copy_c        FNAME(h5sextent_copy_c)
 #   define nh5sset_extent_none_c    FNAME(h5sset_extent_none_c)
 #   define nh5sselect_hyperslab_c   FNAME(h5sselect_hyperslab_c)
-#   define nh5scombine_hyperslab_c   FNAME(h5scombine_hyperslab_c)
-#   define nh5scombine_select_c   FNAME(h5scombine_select_c)
-#   define nh5sselect_select_c   FNAME(h5sselect_select_c)
 #   define nh5sget_select_type_c   FNAME(h5sget_select_type_c)
 #   define nh5sselect_elements_c    FNAME(h5sselect_elements_c)
 #endif                                             /* DF_CAPFNAMES */
@@ -197,12 +191,6 @@ H5_DLL int_f nh5sset_extent_none_c ( hid_t_f *space_id );
 
 H5_DLL int_f nh5sselect_hyperslab_c ( hid_t_f *space_id , int_f *op, hssize_t_f *start, hsize_t_f *count, hsize_t_f *stride, hsize_t_f *block);
 
-H5_DLL int_f nh5scombine_hyperslab_c ( hid_t_f *space_id , int_f *op, hssize_t_f *start, hsize_t_f *count, hsize_t_f *stride, hsize_t_f *block, hid_t_f *hyper_id);
-
-H5_DLL int_f nh5scombine_select_c ( hid_t_f *space1_id , int_f *op, hid_t_f *space2_id, hid_t_f *ds_id);
-
-H5_DLL int_f nh5sselect_select_c ( hid_t_f *space1_id , int_f *op, hid_t_f *space2_id);
-
 H5_DLL int_f nh5sget_select_type_c ( hid_t_f *space_id , int_f *op);
 
 H5_DLL int_f nh5sselect_elements_c ( hid_t_f *space_id , int_f *op, size_t_f *nelements, hssize_t_f *coord);