[svn-r4312] Purpose:

    Feature shift
Description:
    Take out the v1.2.x compatibility stubs and put in the hooks for v1.4.x
    compatibility when needed.
Platforms tested:
    FreeBSD 4.3 (hawkwind)

1 files changed, 0 insertions, 185 deletions

diff --git a/fortran/src/H5Tf.c b/fortran/src/H5Tf.c
index 06ca00b..67c8d9c 100644
--- a/fortran/src/H5Tf.c
+++ b/fortran/src/H5Tf.c
@@ -1020,62 +1020,6 @@ nh5tget_member_offset_c ( hid_t_f *type_id ,int_f* member_no, size_t_f * offset)
 }
 
 /*----------------------------------------------------------------------------
- * Name:        h5tget_member_dims_c
- * Purpose:     Call H5Tget_member_dims to get number 
- *              of dimensions of the field
- * Inputs:      type_id - identifier of the dataspace 
- *              field_idx - Field index (0-based) of the field 
- *                          dims to retrieve
- * Outputs:     dims -  number of dimensions of the field
- *              field_dims - buffer to store the dimensions of the field
- *              perm - buffer to store the permutation vector of the field
- * Returns:     0 on success, -1 on failure
- * Programmer:  XIANGYANG SU
- *              Thursday, February 3, 2000
- * Modifications: WANT_H5_V1_2_COMPAT added for backward compatibility
- *                November 16, 2000 EP
- *---------------------------------------------------------------------------*/
-
-int_f 
-nh5tget_member_dims_c ( hid_t_f *type_id ,int_f* field_idx, int_f * dims, size_t_f * field_dims, int_f * perm )
-{
-  int ret_value = -1;
-  hid_t c_type_id;
-  int c_dims, i;
-  int* c_perm;
-  size_t * c_field_dims;
-  int c_field_idx;
-
-#ifdef WANT_H5_V1_2_COMPAT
-
-  c_field_dims = (size_t*)malloc(sizeof(size_t)*4);
-  if(!c_field_dims) return ret_value;
-
-  c_perm = (int*)malloc(sizeof(int)*4);
-  if(!c_perm) return ret_value;
-
-  c_type_id = *type_id;
-  c_field_idx = *field_idx;
-  c_dims = H5Tget_member_dims(c_type_id, c_field_idx, c_field_dims, c_perm);
-  if (c_dims < 0) return ret_value;
-
-  *dims = (int_f)c_dims;
-  for(i =0; i < c_dims; i++)
-  {
-      field_dims[c_dims-i-1] = (size_t_f)c_field_dims[i];
-      perm[c_dims-i-1] = (int_f)c_perm[i];
-  }
-
-  ret_value = 0; 
-  HDfree(c_field_dims);
-  HDfree(c_perm);
-
-#endif /* WANT_H5_V1_2_COMPAT */
-
-  return ret_value;
-}
-
-/*----------------------------------------------------------------------------
  * Name:        h5tget_array_dims_c
  * Purpose:     Call H5Tget_array_dims to get  
  *              dimensions of array datatype
@@ -1301,135 +1245,6 @@ nh5tpack_c(hid_t_f * type_id)
   return ret_value;
 } 
 
-/*----------------------------------------------------------------------------
- * Name:        h5tinsert_array_c
- * Purpose:     Call H5Tinsert_array to add a new member to the 
- *              compound datatype parent_id.
- * Inputs:      parent_id - identifier of the parent compound datatype
- *              name - name of the new member
- *              namelen - length of the name
- *              offset - Offset to start of new member within compound datatype
- *              ndims - Dimensionality of new member. Valid values 
- *                      are 0 (zero) through 4 (four).
- *              dims - Size of new member array
- *              member_id - identifier of the datatype of the new member
- *              perm - Pointer to buffer to store the permutation 
- *                     vector of the field
- * Returns:     0 on success, -1 on failure
- * Programmer:  XIANGYANG SU
- *              Thursday, February 3, 2000
- * Modifications: WANT_H5_V1_2_COMPAT added for backward compatibility
- *                November 16, 2000 EP
- *---------------------------------------------------------------------------*/
-int_f
-nh5tinsert_array_c(hid_t_f * parent_id, _fcd name, int_f* namelen, size_t_f* offset, int_f* ndims, size_t_f* dims, hid_t_f* member_id, int_f* perm )
-{
-  int ret_value = -1;
-  hid_t c_parent_id;
-  hid_t c_member_id;
-  int c_ndims;
-  herr_t status;
-  size_t c_offset;
-  size_t * c_dims;
-  char* c_name;
-  int c_namelen;
-  int * c_perm, i;
-
-#ifdef WANT_H5_V1_2_COMPAT
-  c_offset = *offset;   
-  c_dims = (size_t*)malloc(sizeof(size_t)*(*ndims));
-  if(!c_dims) return ret_value;
-
-  c_perm = (int*)malloc(sizeof(int)*(*ndims));
-  if(!c_perm) return ret_value;
-
-  /*
-   * Transpose dimension arrays because of C-FORTRAN storage order
-   */
-  for (i = 0; i < *ndims ; i++) {
-     c_dims[i] =  (size_t)dims[*ndims - i - 1];
-     c_perm[i] = (int)perm[*ndims - i - 1]; 
-  }
-  c_namelen = *namelen;
-  c_name = (char *)HD5f2cstring(name, c_namelen); 
-  if (c_name == NULL) return ret_value;
-  
-  c_parent_id = *parent_id;
-  c_member_id = *member_id;
-  c_ndims = *ndims;
-  status = H5Tinsert_array(c_parent_id, c_name, c_offset,c_ndims, c_dims, c_perm, c_member_id);
-
-  if(status < 0) return ret_value;
-  ret_value = 0;
-
-#endif /* WANT_H5_V1_2_COMPAT */
-  return ret_value;
-
-}
-
-
-/*----------------------------------------------------------------------------
- * Name:        h5tinsert_array_c2
- * Purpose:     Call H5Tinsert_array to add a new member to the 
- *              compound datatype parent_id.
- *              the difference between this function and h5tinsert_array_c
- *              is that this one doesn't take perm array as input 
- * Inputs:      parent_id - identifier of the parent compound datatype
- *              name - name of the new member
- *              namelen - length of the name
- *              offset - Offset to start of new member within compound datatype
- *              ndims - Dimensionality of new member. Valid values 
- *                      are 0 (zero) through 4 (four).
- *              dims - Size of new member array
- *              member_id - identifier of the datatype of the new member
- * Returns:     0 on success, -1 on failure
- * Programmer:  XIANGYANG SU
- *              Thursday, February 3, 2000
- * Modifications: WANT_H5_V1_2_COMPAT added for backward compatibility
- *                November 16, 2000 EP
- *---------------------------------------------------------------------------*/
-int_f
-nh5tinsert_array_c2(hid_t_f * parent_id, _fcd name, int_f* namelen, size_t_f* offset, int_f* ndims, size_t_f* dims, hid_t_f* member_id )
-{
-  int ret_value = -1;
-  hid_t c_parent_id;
-  hid_t c_member_id;
-  int c_ndims;
-  herr_t status;
-  size_t c_offset;
-  size_t * c_dims;
-  char* c_name;
-  int c_namelen;
-  int i;
-
-#ifdef WANT_H5_V1_2_COMPAT
-
-  c_offset = *offset;   
-  c_dims = (size_t*)malloc(sizeof(size_t)*(*ndims));
-  if(!c_dims) return ret_value;
-
-  /*
-   * Transpose dimension arrays because of C-FORTRAN storage order
-   */
-  for (i = 0; i < *ndims ; i++) {
-     c_dims[i] =  (size_t)dims[*ndims - i - 1];
-  }
-  c_namelen = *namelen;
-  c_name = (char *)HD5f2cstring(name, c_namelen); 
-  if (c_name == NULL) return ret_value;
-  
-  c_parent_id = *parent_id;
-  c_member_id = *member_id;
-  c_ndims = *ndims;
-  status = H5Tinsert_array(c_parent_id, c_name, c_offset, c_ndims, c_dims, NULL, c_member_id);
-
-  if(status < 0) return ret_value;
-  ret_value = 0;
-
-#endif /* WANT_H5_V1_2_COMPAT */
-
-  return ret_value;
-
 }
 /*----------------------------------------------------------------------------
  * Name:        h5tarray_create_c