summaryrefslogtreecommitdiffstats
path: root/src/H5I.c
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-05-10 22:38:04 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-05-10 22:38:04 (GMT)
commit67ba6cb57d84dd34c69930d469ae445697b49731 (patch)
tree49002cb88becbee67313922fc1c8060500e452db /src/H5I.c
parent83d37604d35c55971aa03c4acb59826e9a4a3abe (diff)
downloadhdf5-67ba6cb57d84dd34c69930d469ae445697b49731.zip
hdf5-67ba6cb57d84dd34c69930d469ae445697b49731.tar.gz
hdf5-67ba6cb57d84dd34c69930d469ae445697b49731.tar.bz2
[svn-r27045] Renamed H5_ASSIGN_OVERFLOW() to H5_CHECKED_ASSIGN() and re-ordered
the arguments to be in a more logical order. Tested on: h5committest
Diffstat (limited to 'src/H5I.c')
-rw-r--r--src/H5I.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5I.c b/src/H5I.c
index eb34d6e..528be81 100644
--- a/src/H5I.c
+++ b/src/H5I.c
@@ -433,7 +433,7 @@ H5Inmembers(H5I_type_t type, hsize_t *num_members)
if((members = H5I_nmembers(type)) < 0)
HGOTO_ERROR(H5E_ATOM, H5E_CANTCOUNT, FAIL, "can't compute number of members")
- H5_ASSIGN_OVERFLOW(*num_members, members, int64_t, hsize_t);
+ H5_CHECKED_ASSIGN(*num_members, hsize_t, members, int64_t);
} /* end if */
done:
@@ -460,7 +460,7 @@ int64_t
H5I_nmembers(H5I_type_t type)
{
H5I_id_type_t *type_ptr = NULL;
- int ret_value;
+ int64_t ret_value;
FUNC_ENTER_NOAPI(FAIL)
@@ -470,7 +470,7 @@ H5I_nmembers(H5I_type_t type)
HGOTO_DONE(0);
/* Set return value */
- H5_ASSIGN_OVERFLOW(ret_value, type_ptr->id_count, uint64_t, int64_t);
+ H5_CHECKED_ASSIGN(ret_value, int64_t, type_ptr->id_count, uint64_t);
done:
FUNC_LEAVE_NOAPI(ret_value)