diff options
| author | Jerome Soumagne <jsoumagne@hdfgroup.org> | 2016-02-29 00:45:59 (GMT) |
|---|---|---|
| committer | Jerome Soumagne <jsoumagne@hdfgroup.org> | 2016-11-29 23:42:32 (GMT) |
| commit | b8d0d9ea97d4bf92020b89ddfb467fbad6b22f58 (patch) | |
| tree | 1a075fe7cc85b59b5a2645cc046cee00f0473ea3 | |
| parent | 8179c7c5cc7df0b5a71a54b3ce7e79dac31ba58b (diff) | |
| download | hdf5-b8d0d9ea97d4bf92020b89ddfb467fbad6b22f58.zip hdf5-b8d0d9ea97d4bf92020b89ddfb467fbad6b22f58.tar.gz hdf5-b8d0d9ea97d4bf92020b89ddfb467fbad6b22f58.tar.bz2 | |
Update tools after reference changes
| -rw-r--r-- | tools/h5repack/h5repack_refs.c | 6 | ||||
| -rw-r--r-- | tools/lib/h5diff_array.c | 8 | ||||
| -rw-r--r-- | tools/lib/h5tools.c | 2 | ||||
| -rw-r--r-- | tools/lib/h5tools_dump.c | 2 | ||||
| -rw-r--r-- | tools/lib/h5tools_str.c | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/tools/h5repack/h5repack_refs.c b/tools/h5repack/h5repack_refs.c index fa66440..dd7838f 100644 --- a/tools/h5repack/h5repack_refs.c +++ b/tools/h5repack/h5repack_refs.c @@ -180,7 +180,7 @@ int do_copy_refobjs(hid_t fidin, } /* end if */ for(u = 0; u < nelmts; u++) { H5E_BEGIN_TRY { - if((refobj_id = H5Rdereference3(dset_in, H5P_DEFAULT, buf[u])) < 0) + if((refobj_id = H5Rget_object(dset_in, H5P_DEFAULT, buf[u])) < 0) continue; } H5E_END_TRY; @@ -268,7 +268,7 @@ int do_copy_refobjs(hid_t fidin, for(u = 0; u < nelmts; u++) { H5E_BEGIN_TRY { - if((refobj_id = H5Rdereference3(dset_in, H5P_DEFAULT, buf[u])) < 0) + if((refobj_id = H5Rget_object(dset_in, H5P_DEFAULT, buf[u])) < 0) continue; } H5E_END_TRY; @@ -813,7 +813,7 @@ static herr_t update_ref_value(hid_t obj_id, href_t ref_in, hid_t fid_out, if (ref_type == H5R_BADTYPE) goto done; - ref_obj_id = H5Rdereference3(obj_id, H5P_DEFAULT, ref_in); + ref_obj_id = H5Rget_object(obj_id, H5P_DEFAULT, ref_in); if (ref_obj_id<0) goto done; diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c index 3c9242f..d015942 100644 --- a/tools/lib/h5diff_array.c +++ b/tools/lib/h5diff_array.c @@ -944,9 +944,9 @@ static hsize_t diff_datum(void *_mem1, hid_t region1_id; hid_t region2_id; - if ((obj1_id = H5Rdereference3(container1_id, H5P_DEFAULT, ref1))<0) + if ((obj1_id = H5Rget_object(container1_id, H5P_DEFAULT, ref1))<0) ret= -1; - if ((obj2_id = H5Rdereference3(container2_id, H5P_DEFAULT, ref2))<0) + if ((obj2_id = H5Rget_object(container2_id, H5P_DEFAULT, ref2))<0) ret= -1; if ((region1_id = H5Rget_region2(container1_id, ref1))<0) ret= -1; @@ -995,9 +995,9 @@ static hsize_t diff_datum(void *_mem1, return 0; } - if((obj1_id = H5Rdereference3(container1_id, H5P_DEFAULT, _mem1)) < 0) + if((obj1_id = H5Rget_object(container1_id, H5P_DEFAULT, _mem1)) < 0) ret = -1; - if((obj2_id = H5Rdereference3(container2_id, H5P_DEFAULT, _mem2)) < 0) + if((obj2_id = H5Rget_object(container2_id, H5P_DEFAULT, _mem2)) < 0) ret = -1; if(ret == -1) { options->err_stat = 1; diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c index 0ad3079..1114e28 100644 --- a/tools/lib/h5tools.c +++ b/tools/lib/h5tools.c @@ -1477,7 +1477,7 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem, hsize_t for (block_index = 0; block_index < block_nelmts; block_index++) { ref = *((href_t*)(mem + block_index * size)); - region_id = H5Rdereference3(container, H5P_DEFAULT, ref); + region_id = H5Rget_object(container, H5P_DEFAULT, ref); if (region_id >= 0) { region_space = H5Rget_region2(container, ref); if (region_space >= 0) { diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c index 5db06d1..ec10c8d 100644 --- a/tools/lib/h5tools_dump.c +++ b/tools/lib/h5tools_dump.c @@ -324,7 +324,7 @@ h5tools_dump_simple_data(FILE *stream, const h5tool_format_t *info, hid_t contai char ref_name[1024]; /* region data */ - region_id = H5Rdereference3(container, H5P_DEFAULT, memref); + region_id = H5Rget_object(container, H5P_DEFAULT, memref); if (region_id >= 0) { region_space = H5Rget_region2(container, memref); if (region_space >= 0) { diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c index 31c13f5..0a0fd70 100644 --- a/tools/lib/h5tools_str.c +++ b/tools/lib/h5tools_str.c @@ -1107,7 +1107,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai H5O_info_t oi; const char *path; - obj = H5Rdereference3(container, H5P_DEFAULT, ref); + obj = H5Rget_object(container, H5P_DEFAULT, ref); H5Oget_info(obj, &oi); /* Print object type and close object */ @@ -1299,7 +1299,7 @@ h5tools_str_sprint_region(h5tools_str_t *str, const h5tool_format_t *info, H5S_sel_type region_type; href_t ref = *((href_t*)vp); - obj = H5Rdereference3(container, H5P_DEFAULT, ref); + obj = H5Rget_object(container, H5P_DEFAULT, ref); if (obj >= 0) { region = H5Rget_region2(container, ref); if (region >= 0) { |