diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2005-08-13 20:53:35 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2005-08-13 20:53:35 (GMT) |
commit | 6b45f5172ccb4311e0be9ae15da3758abb6b0e67 (patch) | |
tree | 5a7a112fe7a8a98c6fecb45b513789d15962eb3d /fortran/src/H5Df.c | |
parent | 6562465a2c2a58cfbc2f47bf60bb538f7a783933 (diff) | |
download | hdf5-6b45f5172ccb4311e0be9ae15da3758abb6b0e67.zip hdf5-6b45f5172ccb4311e0be9ae15da3758abb6b0e67.tar.gz hdf5-6b45f5172ccb4311e0be9ae15da3758abb6b0e67.tar.bz2 |
[svn-r11245] Purpose:
Code cleanup
Description:
Trim trailing whitespace, which is making 'diff'ing the two branches
difficult.
Solution:
Ran this script in each directory:
foreach f (*.[ch] *.cpp)
sed 's/[[:blank:]]*$//' $f > sed.out && mv sed.out $f
end
Platforms tested:
FreeBSD 4.11 (sleipnir)
Too minor to require h5committest
Diffstat (limited to 'fortran/src/H5Df.c')
-rw-r--r-- | fortran/src/H5Df.c | 264 |
1 files changed, 132 insertions, 132 deletions
diff --git a/fortran/src/H5Df.c b/fortran/src/H5Df.c index d8abc88..68ff852 100644 --- a/fortran/src/H5Df.c +++ b/fortran/src/H5Df.c @@ -18,9 +18,9 @@ /*---------------------------------------------------------------------------- * Name: h5dcreate_c - * Purpose: Call H5Dcreate to create a dataset - * Inputs: loc_id - file or group identifier - * name - name of the dataset + * Purpose: Call H5Dcreate to create a dataset + * Inputs: loc_id - file or group identifier + * name - name of the dataset * namelen - name length * type_id - datatype identifier * space_id - dataspace identifier @@ -42,7 +42,7 @@ nh5dcreate_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_ hid_t c_space_id; hid_t c_dset_id; hid_t c_crt_prp; - + /* * Define creation property */ @@ -52,7 +52,7 @@ nh5dcreate_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_ * Convert FORTRAN name to C name */ c_namelen = *namelen; - c_name = (char *)HD5f2cstring(name, c_namelen); + c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return ret_value; /* @@ -69,13 +69,13 @@ nh5dcreate_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *type_id, hid_ DONE: HDfree(c_name); return ret_value; -} +} /*---------------------------------------------------------------------------- * Name: h5dopen_c - * Purpose: Call H5Dopen to open a dataset - * Inputs: loc_id - file or group identifier - * name - name of the dataset + * Purpose: Call H5Dopen to open a dataset + * Inputs: loc_id - file or group identifier + * name - name of the dataset * namelen - name length * Outputs: dset_id - dataset identifier * Returns: 0 on success, -1 on failure @@ -99,7 +99,7 @@ nh5dopen_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *dset_id) * Convert FORTRAN name to C name */ c_namelen = *namelen; - c_name = (char *)HD5f2cstring(name, c_namelen); + c_name = (char *)HD5f2cstring(name, c_namelen); if (c_name == NULL) return ret_value; /* @@ -115,12 +115,12 @@ nh5dopen_c (hid_t_f *loc_id, _fcd name, int_f *namelen, hid_t_f *dset_id) DONE: HDfree(c_name); return ret_value; -} +} /*---------------------------------------------------------------------------- * Name: h5dwritec_c - * Purpose: Call h5dwrite_c to write a dataset of characters - * Inputs: dset_id - dataset identifier + * Purpose: Call h5dwrite_c to write a dataset of characters + * Inputs: dset_id - dataset identifier * mem_type_id - memory datatype identifier * mem_space_id - memory dataspace identifier * file_space_id - memory dataspace identifier @@ -136,7 +136,7 @@ int_f nh5dwritec_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, _fcd buf, hsize_t_f *dims) { int ret_value = -1; - + /* * Call h5dwrite_c function. */ @@ -147,8 +147,8 @@ nh5dwritec_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid /*---------------------------------------------------------------------------- * Name: h5dwrite_c - * Purpose: Call H5Dwrite to write a dataset - * Inputs: dset_id - dataset identifier + * Purpose: Call H5Dwrite to write a dataset + * Inputs: dset_id - dataset identifier * mem_type_id - memory datatype identifier * mem_space_id - memory dataspace identifier * file_space_id - memory dataspace identifier @@ -175,7 +175,7 @@ nh5dwrite_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_ * Define transfer property */ c_xfer_prp = (hid_t)*xfer_prp; - + /* * Call H5Dwrite function. */ @@ -188,19 +188,19 @@ nh5dwrite_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_ if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} /*---------------------------------------------------------------------------- * Name: h5dwrite_ref_obj_c * Purpose: Call H5Dwrite to write a dataset of object references - * Inputs: dset_id - dataset identifier + * Inputs: dset_id - dataset identifier * mem_type_id - memory datatype identifier * mem_space_id - memory dataspace identifier * file_space_id - memory dataspace identifier * xfer_pr - identifier of transfer property list * buf - data buffer with references to the objects. - * n - number of references to be stored. + * n - number of references to be stored. * Returns: 0 on success,e-1 on failure * Programmer: Elena Pourmal * Tuesday, May 14, 2002 @@ -233,9 +233,9 @@ nh5dwrite_ref_obj_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_ if ( buf_c != NULL ) { for (i = 0; i < n; i++) HDmemcpy(&buf_c[i], &buf[i], sizeof(haddr_t)); - } + } else return ret_value; - + /* * Call H5Dwrite function. */ @@ -253,13 +253,13 @@ nh5dwrite_ref_obj_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_ /*---------------------------------------------------------------------------- * Name: h5dwrite_ref_reg_c * Purpose: Call H5Dwrite to write a dataset of dataset region references - * Inputs: dset_id - dataset identifier + * Inputs: dset_id - dataset identifier * mem_type_id - memory datatype identifier * mem_space_id - memory dataspace identifier * file_space_id - memory dataspace identifier * xfer_pr - identifier of transfer property list * buf - data buffer with references to the objects. - * n - number of references to be stored. + * n - number of references to be stored. * Returns: 0 on success, -1 on failure * Programmer: Elena Pourmal * Tuesday, May 14, 2002 @@ -284,7 +284,7 @@ nh5dwrite_ref_reg_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_ * Define transfer property */ c_xfer_prp = (hid_t)*xfer_prp; - + /* * Allocate temporary buffer and copy references from Fortran. */ @@ -294,10 +294,10 @@ nh5dwrite_ref_reg_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_ HDmemcpy(&buf_c[i], buf, H5R_DSET_REG_REF_BUF_SIZE); buf = buf + REF_REG_BUF_LEN_F; } - } + } else return ret_value; - - + + /* * Call H5Dwrite function. */ @@ -310,14 +310,14 @@ nh5dwrite_ref_reg_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_ if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} /*---------------------------------------------------------------------------- * Name: h5dreadc_c - * Purpose: Call h5dread_c to read a dataset of characters - * Inputs: dset_id - dataset identifier + * Purpose: Call h5dread_c to read a dataset of characters + * Inputs: dset_id - dataset identifier * mem_type_id - memory datatype identifier * mem_space_id - memory dataspace identifier * file_space_id - memory dataspace identifier @@ -333,7 +333,7 @@ int_f nh5dreadc_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, _fcd buf, hsize_t_f *dims) { int ret_value = -1; - + /* * Call h5dread_c function. */ @@ -344,8 +344,8 @@ nh5dreadc_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_ /*---------------------------------------------------------------------------- * Name: h5dread_c - * Purpose: Call H5Draed to read a dataset - * Inputs: dset_id - dataset identifier + * Purpose: Call H5Draed to read a dataset + * Inputs: dset_id - dataset identifier * mem_type_id - memory datatype identifier * mem_space_id - memory dataspace identifier * file_space_id - memory dataspace identifier @@ -372,7 +372,7 @@ nh5dread_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t * Define transfer property */ c_xfer_prp = (hid_t)*xfer_prp; - + /* * Call H5Dread function. */ @@ -390,13 +390,13 @@ nh5dread_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_id, hid_t /*---------------------------------------------------------------------------- * Name: h5dread_ref_obj_c * Purpose: Call H5Dread to read a dataset of object references - * Inputs: dset_id - dataset identifier + * Inputs: dset_id - dataset identifier * mem_type_id - memory datatype identifier * mem_space_id - memory dataspace identifier * file_space_id - memory dataspace identifier * xfer_pr - identifier of transfer property list * buf - data buffer to store references to the objects. - * n - number of references to be stored. + * n - number of references to be stored. * Returns: 0 on success, -1 on failure * Programmer: Elena Pourmal * Wednesday, May 15, 2002 @@ -420,7 +420,7 @@ nh5dread_ref_obj_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_i * Define transfer property */ c_xfer_prp = (hid_t)*xfer_prp; - + /* * Allocate temporary buffer. */ @@ -440,7 +440,7 @@ nh5dread_ref_obj_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_i HDmemcpy(&buf[i], &buf_c[i], sizeof(haddr_t)); } if ( buf_c != NULL ) HDfree(buf_c); - } + } if (ret < 0) return ret_value; ret_value = 0; return ret_value; @@ -449,13 +449,13 @@ nh5dread_ref_obj_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_i /*---------------------------------------------------------------------------- * Name: h5dread_ref_reg_c * Purpose: Call H5Dread to read a dataset of dataset region references - * Inputs: dset_id - dataset identifier + * Inputs: dset_id - dataset identifier * mem_type_id - memory datatype identifier * mem_space_id - memory dataspace identifier * file_space_id - memory dataspace identifier * xfer_pr - identifier of transfer property list * buf - data buffer to store references to the objects. - * n - number of references to be stored. + * n - number of references to be stored. * Returns: 0 on success, -1 on failure * Programmer: Elena Pourmal * Wednesday, May 15, 2002 @@ -479,7 +479,7 @@ nh5dread_ref_reg_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_i * Define transfer property */ c_xfer_prp = (hid_t)*xfer_prp; - + /* * Allocate temporary buffer. */ @@ -497,20 +497,20 @@ nh5dread_ref_reg_c (hid_t_f *dset_id, hid_t_f *mem_type_id, hid_t_f *mem_space_i for (i = 0; i < n; i++) { HDmemcpy(buf, &buf_c[i], H5R_DSET_REG_REF_BUF_SIZE); buf = buf + REF_REG_BUF_LEN_F; - } + } } if ( buf_c != NULL ) HDfree(buf_c); - } + } if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} /*---------------------------------------------------------------------------- * Name: h5dclose_c - * Purpose: Call H5Dclose to close a dataset + * Purpose: Call H5Dclose to close a dataset * Inputs: dset_id - identifier of the dataset to be closed * Returns: 0 on success, -1 on failure * Programmer: Elena Pourmal @@ -530,7 +530,7 @@ nh5dclose_c ( hid_t_f *dset_id ) /*---------------------------------------------------------------------------- * Name: h5dget_space_c - * Purpose: Call H5Dget_space to obtain dataspace of a dataset + * Purpose: Call H5Dget_space to obtain dataspace of a dataset * Inputs: dset_id - identifier of the dataset * Outputs: space_id - identifier of the dataset's dataspace * Returns: 0 on success, -1 on failure @@ -539,14 +539,14 @@ nh5dclose_c ( hid_t_f *dset_id ) * Modifications: *---------------------------------------------------------------------------*/ -int_f +int_f nh5dget_space_c ( hid_t_f *dset_id , hid_t_f *space_id) { int ret_value = -1; hid_t c_dset_id; hid_t c_space_id; - - c_dset_id = (hid_t)*dset_id; + + c_dset_id = (hid_t)*dset_id; c_space_id = H5Dget_space(c_dset_id); if(c_space_id < 0 ) return ret_value; ret_value = 0; @@ -556,7 +556,7 @@ nh5dget_space_c ( hid_t_f *dset_id , hid_t_f *space_id) /*---------------------------------------------------------------------------- * Name: h5dget_type_c - * Purpose: Call H5Dget_type to obtain datatype of a dataset + * Purpose: Call H5Dget_type to obtain datatype of a dataset * Inputs: dset_id - identifier of the dataset * Outputs: type_id - identifier of the dataset's datatype * Returns: 0 on success, -1 on failure @@ -565,13 +565,13 @@ nh5dget_space_c ( hid_t_f *dset_id , hid_t_f *space_id) * Modifications: *---------------------------------------------------------------------------*/ -int_f +int_f nh5dget_type_c ( hid_t_f *dset_id , hid_t_f *type_id) { int ret_value = -1; hid_t c_dset_id; hid_t c_type_id; - + c_dset_id = (hid_t)*dset_id; c_type_id = H5Dget_type(c_dset_id); @@ -585,7 +585,7 @@ nh5dget_type_c ( hid_t_f *dset_id , hid_t_f *type_id) /*---------------------------------------------------------------------------- * Name: h5dget_create_plist_c * Purpose: Call H5Dget_create_plist to obtain creation property list - * of a dataset + * of a dataset * Inputs: dset_id - identifier of the dataset * Outputs: plist_id - identifier of he dataset creation property list * Returns: 0 on success, -1 on failure @@ -594,13 +594,13 @@ nh5dget_type_c ( hid_t_f *dset_id , hid_t_f *type_id) * Modifications: *---------------------------------------------------------------------------*/ -int_f +int_f nh5dget_create_plist_c ( hid_t_f *dset_id , hid_t_f *plist_id) { int ret_value = -1; hid_t c_dset_id; hid_t c_plist_id; - + c_dset_id = (hid_t)*dset_id; c_plist_id = H5Dget_create_plist(c_dset_id); @@ -614,16 +614,16 @@ nh5dget_create_plist_c ( hid_t_f *dset_id , hid_t_f *plist_id) /*---------------------------------------------------------------------------- * Name: h5dextend_c - * Purpose: Call H5Dextend to extend dataset with unlimited dimensions - * Inputs: dset_id - identifier of the dataset - * Outputs: dims - array with the dimension sizes + * Purpose: Call H5Dextend to extend dataset with unlimited dimensions + * Inputs: dset_id - identifier of the dataset + * Outputs: dims - array with the dimension sizes * Returns: 0 on success, -1 on failure * Programmer: Elena Pourmal * Thursday, August 19, 1999 * Modifications: *---------------------------------------------------------------------------*/ -int_f +int_f nh5dextend_c ( hid_t_f *dset_id , hsize_t_f *dims) { int ret_value = -1; @@ -647,9 +647,9 @@ nh5dextend_c ( hid_t_f *dset_id , hsize_t_f *dims) /* * Reverse dimensions due to C-FORTRAN storage order. */ - for (i=0; i < rank; i++) + for (i=0; i < rank; i++) c_dims[i] = dims[rank - i - 1]; - + status = H5Dextend(c_dset_id, c_dims); if ( status >= 0 ) ret_value = 0; @@ -659,9 +659,9 @@ nh5dextend_c ( hid_t_f *dset_id , hsize_t_f *dims) /*---------------------------------------------------------------------------- * Name: nh5dget_storage_size_c - * Purpose: Call H5Dget_storage_size to return the amount of storage + * Purpose: Call H5Dget_storage_size to return the amount of storage * required for a dataset - * Inputs: dset_id - identifier of the dataset + * Inputs: dset_id - identifier of the dataset * Outputs: size - the amount of storage required for a dataset * Returns: 0 on success, -1 on failure * Programmer: Elena Pourmal @@ -669,7 +669,7 @@ nh5dextend_c ( hid_t_f *dset_id , hsize_t_f *dims) * Modifications: *---------------------------------------------------------------------------*/ -int_f +int_f nh5dget_storage_size_c ( hid_t_f *dset_id , hsize_t_f *size) { int ret_value = -1; @@ -687,9 +687,9 @@ nh5dget_storage_size_c ( hid_t_f *dset_id , hsize_t_f *size) /*---------------------------------------------------------------------------- * Name: nh5dvlen_get_max_len_c * Purpose: Get the maximum size of the VL dataset element - * Inputs: dset_id - identifier of the dataset + * Inputs: dset_id - identifier of the dataset * type_id - datatype identifier - * space_id - dataspace identifier + * space_id - dataspace identifier * Outputs: len - maximum length of the VL dataset element * Returns: 0 on success, -1 on failure * Programmer: Elena Pourmal @@ -697,7 +697,7 @@ nh5dget_storage_size_c ( hid_t_f *dset_id , hsize_t_f *size) * Modifications: *---------------------------------------------------------------------------*/ -int_f +int_f nh5dvlen_get_max_len_c ( hid_t_f *dset_id , hid_t_f *type_id, hid_t_f *space_id, size_t_f *len) { int ret_value = -1; @@ -714,20 +714,20 @@ nh5dvlen_get_max_len_c ( hid_t_f *dset_id , hid_t_f *type_id, hid_t_f *space_id c_type_id = (hid_t)*type_id; c_space_id = (hid_t)*space_id; - num_elem = H5Sget_select_npoints(c_space_id); + num_elem = H5Sget_select_npoints(c_space_id); if( num_elem < 0) return ret_value; - c_buf = (hvl_t *)malloc(sizeof(hvl_t)*(size_t)num_elem); + c_buf = (hvl_t *)malloc(sizeof(hvl_t)*(size_t)num_elem); if (c_buf == NULL) return ret_value; status = H5Dread(c_dset_id, c_type_id, H5S_ALL, c_space_id, H5P_DEFAULT, c_buf); if(status < 0) goto DONE; - + c_len = 0; - for (i=0; i < num_elem; i++) c_len = H5_MAX(c_len, c_buf[i].len); + for (i=0; i < num_elem; i++) c_len = H5_MAX(c_len, c_buf[i].len); *len = (size_t_f)c_len; H5Dvlen_reclaim(c_type_id, c_space_id, H5P_DEFAULT, c_buf); ret_value = 0; - + DONE: free(c_buf); @@ -735,11 +735,11 @@ DONE: } /*---------------------------------------------------------------------------- * Name: nh5dwrite_vl_integer_c - * Purpose: Write variable length dataset - * Inputs: dset_id - identifier of the dataset + * Purpose: Write variable length dataset + * Inputs: dset_id - identifier of the dataset * mem_type_id - datatype identifier - * mem_space_id - dataspace identifier - * file_space_id - file dataspace identifier + * mem_space_id - dataspace identifier + * file_space_id - file dataspace identifier * xfer - file transfer property * buf - data buffer * dims - one-demnsional array of size 2 @@ -752,7 +752,7 @@ DONE: * Modifications: *---------------------------------------------------------------------------*/ -int_f +int_f nh5dwrite_vl_integer_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, int_f *buf, hsize_t_f *dims, size_t_f *len) { int ret_value = -1; @@ -768,7 +768,7 @@ nh5dwrite_vl_integer_c ( hid_t_f *dset_id , hid_t_f *mem_type_id, hid_t_f *mem_ hvl_t *c_buf; hsize_t i; hsize_t num_elem; - + max_len = (size_t)dims[0]; num_elem = dims[1]; @@ -778,14 +778,14 @@ nh5dwrite_vl_integer_c ( hid_t_f *dset_id , hid_t_f *mem_type_id, hid_t_f *mem_ c_file_space_id = (hid_t)*file_space_id; c_xfer_prp = (hid_t)*xfer_prp; - c_buf = (hvl_t *)malloc((size_t)num_elem * sizeof(hvl_t)); + c_buf = (hvl_t *)malloc((size_t)num_elem * sizeof(hvl_t)); if (c_buf == NULL) return ret_value; - tmp = (int_f *)buf; + tmp = (int_f *)buf; for (i=0; i < num_elem; i++) { - c_buf[i].len = (size_t)len[i]; + c_buf[i].len = (size_t)len[i]; c_buf[i].p = tmp; tmp = tmp + max_len; - } + } /* * Call H5Dwrite function. */ @@ -800,11 +800,11 @@ DONE: /*---------------------------------------------------------------------------- * Name: nh5dread_vl_integer_c - * Purpose: Read variable length dataset - * Inputs: dset_id - identifier of the dataset + * Purpose: Read variable length dataset + * Inputs: dset_id - identifier of the dataset * mem_type_id - datatype identifier - * mem_space_id - dataspace identifier - * file_space_id - file dataspace identifier + * mem_space_id - dataspace identifier + * file_space_id - file dataspace identifier * xfer - file transfer property * dims - one-demnsional array of size 2 * dims[0] = MAXLENGTH @@ -817,7 +817,7 @@ DONE: * Modifications: *---------------------------------------------------------------------------*/ -int_f +int_f nh5dread_vl_integer_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, int_f *buf, hsize_t_f *dims, size_t_f *len) { int ret_value = -1; @@ -832,7 +832,7 @@ nh5dread_vl_integer_c ( hid_t_f *dset_id , hid_t_f *mem_type_id, hid_t_f *mem_s hvl_t *c_buf; size_t i; hssize_t num_elem; - + c_dset_id = (hid_t)*dset_id; c_mem_type_id = (hid_t)*mem_type_id; c_mem_space_id = (hid_t)*mem_space_id; @@ -840,10 +840,10 @@ nh5dread_vl_integer_c ( hid_t_f *dset_id , hid_t_f *mem_type_id, hid_t_f *mem_s c_xfer_prp = (hid_t)*xfer_prp; max_len = (size_t)dims[0]; - num_elem = H5Sget_select_npoints(c_mem_space_id); + num_elem = H5Sget_select_npoints(c_mem_space_id); if(num_elem != dims[1]) return ret_value; - c_buf = (hvl_t *)malloc((size_t)num_elem * sizeof(hvl_t)); + c_buf = (hvl_t *)malloc((size_t)num_elem * sizeof(hvl_t)); if (c_buf == NULL) return ret_value; /* * Call H5Dread function. @@ -851,7 +851,7 @@ nh5dread_vl_integer_c ( hid_t_f *dset_id , hid_t_f *mem_type_id, hid_t_f *mem_s status = H5Dread(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, c_buf); if ( status < 0 ) goto DONE; for (i=0; i < num_elem; i++) { - len[i] = (size_t_f)c_buf[i].len; + len[i] = (size_t_f)c_buf[i].len; memcpy(&buf[i*max_len], c_buf[i].p, c_buf[i].len*sizeof(int_f)); } H5Dvlen_reclaim(c_mem_type_id, c_mem_space_id, H5P_DEFAULT, c_buf); @@ -864,13 +864,13 @@ DONE: /*---------------------------------------------------------------------------- * Name: nh5dwrite_vl_string_c * Purpose: Write variable length strings from Fortran program - * Inputs: dset_id - identifier of the dataset + * Inputs: dset_id - identifier of the dataset * mem_type_id - datatype identifier - * mem_space_id - dataspace identifier - * file_space_id - file dataspace identifier + * mem_space_id - dataspace identifier + * file_space_id - file dataspace identifier * xfer - file transfer property * buf - data buffer - * dims - one-demnsional array of size 2 + * dims - one-demnsional array of size 2 * dims[0] = number of strings of size max_len * len - array of strings lengths * Returns: 0 on success, -1 on failure @@ -879,7 +879,7 @@ DONE: * Modifications: *---------------------------------------------------------------------------*/ -int_f +int_f nh5dwrite_vl_string_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, _fcd buf, hsize_t_f *dims, size_t_f *len) { int ret_value = -1; @@ -895,7 +895,7 @@ nh5dwrite_vl_string_c( hid_t_f *dset_id , hid_t_f *mem_type_id, hid_t_f *mem_sp char **c_buf; hsize_t i; hsize_t num_elem; - + max_len = (size_t)dims[0]; num_elem = dims[1]; @@ -908,7 +908,7 @@ nh5dwrite_vl_string_c( hid_t_f *dset_id , hid_t_f *mem_type_id, hid_t_f *mem_sp /* * Allocate arra of character pointers */ - c_buf = (char **)malloc((size_t)num_elem * sizeof(char *)); + c_buf = (char **)malloc((size_t)num_elem * sizeof(char *)); if (c_buf == NULL) return ret_value; /* Copy data to long C string */ @@ -923,7 +923,7 @@ nh5dwrite_vl_string_c( hid_t_f *dset_id , hid_t_f *mem_type_id, hid_t_f *mem_sp for (i=0; i < num_elem; i++) { c_buf[i] = (char *) malloc((size_t)len[i]+1); memcpy(c_buf[i], tmp_p, (size_t)len[i]); - c_buf[i][len[i]] = '\0'; + c_buf[i][len[i]] = '\0'; tmp_p = tmp_p + max_len; } @@ -943,12 +943,12 @@ DONE: /*---------------------------------------------------------------------------- * Name: nh5dread_vl_string_c * Purpose: Read variable length strings from Fortran program - * Inputs: dset_id - identifier of the dataset + * Inputs: dset_id - identifier of the dataset * mem_type_id - datatype identifier - * mem_space_id - dataspace identifier - * file_space_id - file dataspace identifier + * mem_space_id - dataspace identifier + * file_space_id - file dataspace identifier * xfer - file transfer property - * dims - one-demnsional array of size 2 + * dims - one-demnsional array of size 2 * dims[0] = number of strings of size max_len * Output: buf - data buffer * len - array of strings lengths @@ -958,7 +958,7 @@ DONE: * Modifications: *---------------------------------------------------------------------------*/ -int_f +int_f nh5dread_vl_string_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, _fcd buf, hsize_t_f *dims, size_t_f *len) { int ret_value = -1; @@ -974,7 +974,7 @@ nh5dread_vl_string_c( hid_t_f *dset_id , hid_t_f *mem_type_id, hid_t_f *mem_spa char **c_buf; hsize_t i; hsize_t num_elem; - + max_len = (size_t)dims[0]; num_elem = dims[1]; @@ -987,7 +987,7 @@ nh5dread_vl_string_c( hid_t_f *dset_id , hid_t_f *mem_type_id, hid_t_f *mem_spa /* * Allocate array of character pointers */ - c_buf = (char **)malloc((size_t)num_elem * sizeof(char *)); + c_buf = (char **)malloc((size_t)num_elem * sizeof(char *)); if (c_buf == NULL) return ret_value; /* @@ -1017,11 +1017,11 @@ nh5dread_vl_string_c( hid_t_f *dset_id , hid_t_f *mem_type_id, hid_t_f *mem_spa /*---------------------------------------------------------------------------- * Name: nh5dwrite_vl_real_c - * Purpose: Write variable length dataset - * Inputs: dset_id - identifier of the dataset + * Purpose: Write variable length dataset + * Inputs: dset_id - identifier of the dataset * mem_type_id - datatype identifier - * mem_space_id - dataspace identifier - * file_space_id - file dataspace identifier + * mem_space_id - dataspace identifier + * file_space_id - file dataspace identifier * xfer - file transfer property * buf - data buffer * dims - one-demnsional array of size 2 @@ -1034,7 +1034,7 @@ nh5dread_vl_string_c( hid_t_f *dset_id , hid_t_f *mem_type_id, hid_t_f *mem_spa * Modifications: *---------------------------------------------------------------------------*/ -int_f +int_f nh5dwrite_vl_real_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, real_f *buf, hsize_t_f *dims, size_t_f *len) { int ret_value = -1; @@ -1050,7 +1050,7 @@ nh5dwrite_vl_real_c ( hid_t_f *dset_id , hid_t_f *mem_type_id, hid_t_f *mem_spa hvl_t *c_buf; hsize_t i; hsize_t num_elem; - + max_len = (size_t)dims[0]; num_elem = dims[1]; @@ -1060,14 +1060,14 @@ nh5dwrite_vl_real_c ( hid_t_f *dset_id , hid_t_f *mem_type_id, hid_t_f *mem_spa c_file_space_id = (hid_t)*file_space_id; c_xfer_prp = (hid_t)*xfer_prp; - c_buf = (hvl_t *)malloc((size_t)num_elem * sizeof(hvl_t)); + c_buf = (hvl_t *)malloc((size_t)num_elem * sizeof(hvl_t)); if (c_buf == NULL) return ret_value; - tmp = (real_f *)buf; + tmp = (real_f *)buf; for (i=0; i < num_elem; i++) { - c_buf[i].len = (size_t)len[i]; + c_buf[i].len = (size_t)len[i]; c_buf[i].p = tmp; tmp = tmp + max_len; - } + } /* * Call H5Dwrite function. */ @@ -1082,11 +1082,11 @@ DONE: /*---------------------------------------------------------------------------- * Name: nh5dread_vl_real_c - * Purpose: Read variable length dataset - * Inputs: dset_id - identifier of the dataset + * Purpose: Read variable length dataset + * Inputs: dset_id - identifier of the dataset * mem_type_id - datatype identifier - * mem_space_id - dataspace identifier - * file_space_id - file dataspace identifier + * mem_space_id - dataspace identifier + * file_space_id - file dataspace identifier * xfer - file transfer property * dims - one-demnsional array of size 2 * dims[0] = MAXLENGTH @@ -1099,7 +1099,7 @@ DONE: * Modifications: *---------------------------------------------------------------------------*/ -int_f +int_f nh5dread_vl_real_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, real_f *buf, hsize_t_f *dims, size_t_f *len) { int ret_value = -1; @@ -1114,7 +1114,7 @@ nh5dread_vl_real_c ( hid_t_f *dset_id , hid_t_f *mem_type_id, hid_t_f *mem_spac hvl_t *c_buf; size_t i; hssize_t num_elem; - + c_dset_id = (hid_t)*dset_id; c_mem_type_id = (hid_t)*mem_type_id; c_mem_space_id = (hid_t)*mem_space_id; @@ -1122,10 +1122,10 @@ nh5dread_vl_real_c ( hid_t_f *dset_id , hid_t_f *mem_type_id, hid_t_f *mem_spac c_xfer_prp = (hid_t)*xfer_prp; max_len = (size_t)dims[0]; - num_elem = H5Sget_select_npoints(c_mem_space_id); + num_elem = H5Sget_select_npoints(c_mem_space_id); if(num_elem != dims[1]) return ret_value; - c_buf = (hvl_t *)malloc((size_t)num_elem * sizeof(hvl_t)); + c_buf = (hvl_t *)malloc((size_t)num_elem * sizeof(hvl_t)); if (c_buf == NULL) return ret_value; /* * Call H5Dread function. @@ -1133,10 +1133,10 @@ nh5dread_vl_real_c ( hid_t_f *dset_id , hid_t_f *mem_type_id, hid_t_f *mem_spac status = H5Dread(c_dset_id, c_mem_type_id, c_mem_space_id, c_file_space_id, c_xfer_prp, c_buf); if ( status <0 ) goto DONE; for (i=0; i < num_elem; i++) { - len[i] = (size_t_f)c_buf[i].len; + len[i] = (size_t_f)c_buf[i].len; memcpy(&buf[i*max_len], c_buf[i].p, c_buf[i].len*sizeof(real_f)); } - + H5Dvlen_reclaim(c_mem_type_id, c_mem_space_id, H5P_DEFAULT, c_buf); ret_value = 0; DONE: @@ -1161,7 +1161,7 @@ int_f nh5dfillc_c (_fcd fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, _fcd buf, hid_t_f *mem_type_id) { int ret_value = -1; - + /* * Call h5dfill_c function. */ @@ -1195,7 +1195,7 @@ nh5dfill_c (void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * c_fill_type_id = (hid_t)*fill_type_id; c_mem_type_id = (hid_t)*mem_type_id; c_space_id = (hid_t)*space_id; - + /* * Call H5Dfill function. */ @@ -1204,7 +1204,7 @@ nh5dfill_c (void * fill_value, hid_t_f *fill_type_id, hid_t_f *space_id, void * if (ret < 0) return ret_value; ret_value = 0; return ret_value; -} +} /*---------------------------------------------------------------------------- * Name: h5dget_space_status_c @@ -1226,7 +1226,7 @@ nh5dget_space_status_c ( hid_t_f *dset_id, int_f *flag) H5D_space_status_t c_flag; c_dset_id = (hid_t)*dset_id; - + /* * Call H5Dget_space_status */ @@ -1236,5 +1236,5 @@ nh5dget_space_status_c ( hid_t_f *dset_id, int_f *flag) *flag = (int_f)c_flag; ret_value = 0; return ret_value; -} +} |