summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorRaymond Lu <songyulu@hdfgroup.org>2008-09-26 19:45:43 (GMT)
committerRaymond Lu <songyulu@hdfgroup.org>2008-09-26 19:45:43 (GMT)
commit501e01d388a575bf5c0be70013f6d13b2419784d (patch)
treec9189926ebbf956cc762b40707eff02c204bf273 /test
parentd711cb1a3bd542359dd429d34d3dcaee335c82b7 (diff)
downloadhdf5-501e01d388a575bf5c0be70013f6d13b2419784d.zip
hdf5-501e01d388a575bf5c0be70013f6d13b2419784d.tar.gz
hdf5-501e01d388a575bf5c0be70013f6d13b2419784d.tar.bz2
[svn-r15707] I changed the return values of H5Fget_obj_ids and H5Fget_obj_count to ssize_t and modified
C++ and Fortran API functions. This is for bug #1245. Tested on kagiso - I've tested the same change using h5committest.
Diffstat (limited to 'test')
-rw-r--r--test/mount.c2
-rw-r--r--test/tfile.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/test/mount.c b/test/mount.c
index 4a9592f..9f07123 100644
--- a/test/mount.c
+++ b/test/mount.c
@@ -3392,7 +3392,7 @@ test_cut_graph(hid_t fapl)
hid_t gidQ = -1; /* Group IDs in file #7 */
char name[NAME_BUF_SIZE]; /* Buffer for filename retrieved */
ssize_t name_len; /* Filename length */
- int obj_count; /* Number of objects open */
+ ssize_t obj_count; /* Number of objects open */
char filename1[NAME_BUF_SIZE],
filename2[NAME_BUF_SIZE],
filename3[NAME_BUF_SIZE],
diff --git a/test/tfile.c b/test/tfile.c
index e839630..ff8aa2b 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -765,7 +765,7 @@ static void
create_objects(hid_t fid1, hid_t fid2, hid_t *ret_did, hid_t *ret_gid1,
hid_t *ret_gid2, hid_t *ret_gid3)
{
- int oid_count;
+ ssize_t oid_count;
herr_t ret;
/* Check reference counts of file IDs and opened object IDs.
@@ -1033,7 +1033,7 @@ test_obj_count_and_id(hid_t fid1, hid_t fid2, hid_t did, hid_t gid1,
hid_t gid2, hid_t gid3)
{
hid_t fid3, fid4;
- int oid_count;
+ ssize_t oid_count, ret_count;
herr_t ret;
/* Create two new files */
@@ -1079,8 +1079,8 @@ test_obj_count_and_id(hid_t fid1, hid_t fid2, hid_t did, hid_t gid1,
oid_list = (hid_t*)calloc((size_t)oid_count, sizeof(hid_t));
if(oid_list != NULL) {
- ret = H5Fget_obj_ids(H5F_OBJ_ALL, H5F_OBJ_ALL, oid_count, oid_list);
- CHECK(ret, FAIL, "H5Fget_obj_ids");
+ ret_count = H5Fget_obj_ids(H5F_OBJ_ALL, H5F_OBJ_ALL, (size_t)oid_count, oid_list);
+ CHECK(ret_count, FAIL, "H5Fget_obj_ids");
}
for(i=0; i<oid_count; i++) {