diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2011-07-18 23:12:28 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2011-07-18 23:12:28 (GMT) |
| commit | a777619a6b556aeb8365f874099c1a1f42ef3466 (patch) | |
| tree | 50db7be8ab74cef9dcbc9d954c6e6fddd96be0ca /tools/lib | |
| parent | de106315771c4c227c4e73d9194494a240b92fd2 (diff) | |
| download | hdf5-a777619a6b556aeb8365f874099c1a1f42ef3466.zip hdf5-a777619a6b556aeb8365f874099c1a1f42ef3466.tar.gz hdf5-a777619a6b556aeb8365f874099c1a1f42ef3466.tar.bz2 | |
[svn-r21121] Description:
Switch from H5P_DATASET_ACCESS_DEFAULT to H5P_DEFAULT for calls to
H5Rdereference2().
Tested on:
Mac OS X/32 10.6.8 (amazon) w/debug
(too minor to require h5committest)
Diffstat (limited to 'tools/lib')
| -rw-r--r-- | tools/lib/h5diff_array.c | 8 | ||||
| -rw-r--r-- | tools/lib/h5tools.c | 6 | ||||
| -rw-r--r-- | tools/lib/h5tools_str.c | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c index 91a2de9..3e3db02 100644 --- a/tools/lib/h5diff_array.c +++ b/tools/lib/h5diff_array.c @@ -760,9 +760,9 @@ hsize_t diff_datum(void *_mem1, hid_t region1_id; hid_t region2_id; - if ((obj1_id = H5Rdereference2(container1_id, H5P_DATASET_ACCESS_DEFAULT, H5R_DATASET_REGION, _mem1))<0) + if ((obj1_id = H5Rdereference2(container1_id, H5P_DEFAULT, H5R_DATASET_REGION, _mem1))<0) ret= -1; - if ((obj2_id = H5Rdereference2(container2_id, H5P_DATASET_ACCESS_DEFAULT, H5R_DATASET_REGION, _mem2))<0) + if ((obj2_id = H5Rdereference2(container2_id, H5P_DEFAULT, H5R_DATASET_REGION, _mem2))<0) ret= -1; if ((region1_id = H5Rget_region(container1_id, H5R_DATASET_REGION, _mem1))<0) ret= -1; @@ -811,9 +811,9 @@ hsize_t diff_datum(void *_mem1, return 0; } - if((obj1_id = H5Rdereference2(container1_id, H5P_DATASET_ACCESS_DEFAULT, H5R_OBJECT, _mem1)) < 0) + if((obj1_id = H5Rdereference2(container1_id, H5P_DEFAULT, H5R_OBJECT, _mem1)) < 0) ret = -1; - if((obj2_id = H5Rdereference2(container2_id, H5P_DATASET_ACCESS_DEFAULT, H5R_OBJECT, _mem2)) < 0) + if((obj2_id = H5Rdereference2(container2_id, H5P_DEFAULT, H5R_OBJECT, _mem2)) < 0) ret = -1; if(ret == -1) { options->err_stat = 1; diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c index 079af30..c9cb00f 100644 --- a/tools/lib/h5tools.c +++ b/tools/lib/h5tools.c @@ -988,7 +988,7 @@ h5tools_dump_simple_data(FILE *stream, const h5tool_format_t *info, hid_t contai char ref_name[1024]; /* region data */ - region_id = H5Rdereference2(container, H5P_DATASET_ACCESS_DEFAULT, H5R_DATASET_REGION, memref); + region_id = H5Rdereference2(container, H5P_DEFAULT, H5R_DATASET_REGION, memref); if (region_id >= 0) { region_space = H5Rget_region(container, H5R_DATASET_REGION, memref); if (region_space >= 0) { @@ -1033,7 +1033,7 @@ h5tools_dump_simple_data(FILE *stream, const h5tool_format_t *info, hid_t contai } /* if (region_id >= 0) */ else - HERROR(H5E_tools_g, H5E_tools_min_id_g, "H5Rdereference failed"); + HERROR(H5E_tools_g, H5E_tools_min_id_g, "H5Rdereference2 failed"); ctx->need_prefix = TRUE; } /* end if (region_output... */ @@ -4007,7 +4007,7 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem) hid_t region_id, region_space; H5S_sel_type region_type; - region_id = H5Rdereference2(container, H5P_DATASET_ACCESS_DEFAULT, H5R_DATASET_REGION, mem); + region_id = H5Rdereference2(container, H5P_DEFAULT, H5R_DATASET_REGION, mem); if (region_id >= 0) { region_space = H5Rget_region(container, H5R_DATASET_REGION, mem); if (region_space >= 0) { diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c index eeb024d..75bab95 100644 --- a/tools/lib/h5tools_str.c +++ b/tools/lib/h5tools_str.c @@ -1001,7 +1001,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai H5O_info_t oi; const char *path; - obj = H5Rdereference2(container, H5P_DATASET_ACCESS_DEFAULT, H5R_OBJECT, vp); + obj = H5Rdereference2(container, H5P_DEFAULT, H5R_OBJECT, vp); H5Oget_info(obj, &oi); /* Print object type and close object */ @@ -1191,7 +1191,7 @@ h5tools_str_sprint_region(h5tools_str_t *str, const h5tool_format_t *info, char ref_name[1024]; H5S_sel_type region_type; - obj = H5Rdereference2(container, H5P_DATASET_ACCESS_DEFAULT, H5R_DATASET_REGION, vp); + obj = H5Rdereference2(container, H5P_DEFAULT, H5R_DATASET_REGION, vp); if (obj >= 0) { region = H5Rget_region(container, H5R_DATASET_REGION, vp); if (region >= 0) { |