mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-07 16:37:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r25440] Fixed type conversion in h5pset_fill_value and fixed for

Browse Source 
nh5pget_fill_valuec_c we call the wrong function
ret_value = nh5pset_fill_value_c(prp_id, type_id, _fcdtocp(fillvalue))

HDFFV-8879

Tested: jam( intel, gnu)
This commit is contained in:
Scot Breitenfeld 2014-07-21 10:09:56 -05:00
parent 453f9d7b20
commit 7595d00ae5
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
fortran/src/H5Pf.c
View File

@ -483,19 +483,21 @@ nh5pset_fill_value_double_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
/****if* H5Pf/h5pget_fill_valuec_c /****if* H5Pf/h5pget_fill_valuec_c
* NAME * NAME
* h5pget_fill_valuec_c * h5pget_fill_valuec_c
* PURPOSE * PURPOSE
* Call h5pget_fill_value_c to a character fill value * Call h5pget_fill_value_c to a character fill value
* INPUTS * INPUTS
* prp_id - property list identifier * prp_id - property list identifier
* type_id - datatype identifier (fill value is of type type_id) * type_id - datatype identifier (fill value is of type type_id)
* fillvalue - character value * fillvalue - character value
* RETURNS * RETURNS
* 0 on success, -1 on failure * 0 on success, -1 on failure
* Saturday, August 14, 1999
* AUTHOR * AUTHOR
* Elena Pourmal * Elena Pourmal
* Saturday, August 14, 1999
* HISTORY * HISTORY
* Fixed wrong call to C wrapper, was nh5pset_fill_value_c, changed
* to nh5pget_fill_value_c. MSB - 7/21/2014
* *
* SOURCE * SOURCE
*/ */
@ -506,27 +508,27 @@ nh5pget_fill_valuec_c (hid_t_f *prp_id, hid_t_f *type_id, _fcd fillvalue)
int ret_value = -1; int ret_value = -1;
/* /*
* Call h5pget_fill_value_c function. * Call h5pget_fill_value_c function.
*/ */
ret_value = nh5pset_fill_value_c(prp_id, type_id, _fcdtocp(fillvalue)); ret_value = nh5pget_fill_value_c(prp_id, type_id, _fcdtocp(fillvalue));
return ret_value; return ret_value;
} }
/****if* H5Pf/h5pget_fill_value_c /****if* H5Pf/h5pget_fill_value_c
* NAME * NAME
* h5pget_fill_value_c * h5pget_fill_value_c
* PURPOSE * PURPOSE
* Call H5Pget_fill_value to set a fillvalue for a dataset * Call H5Pget_fill_value to set a fillvalue for a dataset
* INPUTS * INPUTS
* prp_id - property list identifier * prp_id - property list identifier
* type_id - datatype identifier (fill value is of type type_id) * type_id - datatype identifier (fill value is of type type_id)
* fillvalue - fillvalue * fillvalue - fillvalue
* RETURNS * RETURNS
* 0 on success, -1 on failure * 0 on success, -1 on failure
* AUTHOR * AUTHOR
* Elena Pourmal * Elena Pourmal
* Saturday, August 14, 1999 * Saturday, August 14, 1999
* SOURCE * SOURCE
*/ */
int_f int_f
@ -542,7 +544,7 @@ nh5pget_fill_value_c (hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue)
* Call H5Pget_fill_value function. * Call H5Pget_fill_value function.
*/ */
c_prp_id = (hid_t)*prp_id; c_prp_id = (hid_t)*prp_id;
c_type_id = (int)*type_id; c_type_id = (hid_t)*type_id;
ret = H5Pget_fill_value(c_prp_id, c_type_id, fillvalue); ret = H5Pget_fill_value(c_prp_id, c_type_id, fillvalue);
if (ret < 0) return ret_value; if (ret < 0) return ret_value;