diff options
| author | Vailin Choi <vchoi@jam.ad.hdfgroup.org> | 2017-12-08 21:37:00 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@jam.ad.hdfgroup.org> | 2017-12-08 21:37:00 (GMT) |
| commit | 7af4786a9b29184596cb31afa80b69a68f00349b (patch) | |
| tree | ca6c0c9d6da62a8206fecd2d03d4975086598579 /test/tfile.c | |
| parent | 599ee2f4c6efd1def87384b15e83005eef786cd8 (diff) | |
| parent | 758b9667b3e07a7562107f19f7dabee027e5bd53 (diff) | |
| download | hdf5-7af4786a9b29184596cb31afa80b69a68f00349b.zip hdf5-7af4786a9b29184596cb31afa80b69a68f00349b.tar.gz hdf5-7af4786a9b29184596cb31afa80b69a68f00349b.tar.bz2 | |
Merge branch 'develop' into bugfix/version_bounds
Merge from develop.
Diffstat (limited to 'test/tfile.c')
| -rw-r--r-- | test/tfile.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/tfile.c b/test/tfile.c index 41c920f..653fd12 100644 --- a/test/tfile.c +++ b/test/tfile.c @@ -1196,7 +1196,7 @@ test_get_obj_ids(void) VERIFY(oid_count, (NGROUPS + NDSETS + 1), "H5Fget_obj_count"); oid_list = (hid_t *)HDcalloc((size_t)oid_list_size, sizeof(hid_t)); - CHECK(oid_list, NULL, "HDcalloc"); + CHECK_PTR(oid_list, "HDcalloc"); /* Call the public function H5F_get_obj_ids to use H5F_get_objects. User reported having problem here. * that the returned size (ret_count) from H5Fget_obj_ids is one greater than the size passed in @@ -1259,7 +1259,7 @@ test_get_obj_ids(void) VERIFY(oid_count, NDSETS, "H5Fget_obj_count"); oid_list = (hid_t *)HDcalloc((size_t)oid_count, sizeof(hid_t)); - CHECK(oid_list, NULL, "HDcalloc"); + CHECK_PTR(oid_list, "HDcalloc"); /* Get the list of all opened objects */ ret_count = H5Fget_obj_ids((hid_t)H5F_OBJ_ALL, H5F_OBJ_ALL, (size_t)oid_count, oid_list); @@ -2791,7 +2791,7 @@ cal_chksum(const char *file, uint32_t *chksum) /* Allocate space for the file data */ file_data = HDmalloc((size_t)sb.st_size); - CHECK(file_data, NULL, "HDmalloc"); + CHECK_PTR(file_data, "HDmalloc"); if(file_data) { /* Read file's data into memory */ |