[svn-r21117] Issue 2763 - I added a new parameter of object access property list to the function H5Rdereference. It's called H5Rdereference2 now. H5Rdereference function has been deprecated to H5Rdereference1. I also added some test cases in trefer.c.

Tested on jam, heiwa, and koala.

4 files changed, 12 insertions, 12 deletions

diff --git a/tools/h5repack/h5repack_refs.c b/tools/h5repack/h5repack_refs.c
index 091133e..81b1121 100644
--- a/tools/h5repack/h5repack_refs.c
+++ b/tools/h5repack/h5repack_refs.c
@@ -178,7 +178,7 @@ int do_copy_refobjs(hid_t fidin,
                             } /* end if */
                             for(u = 0; u < nelmts; u++) {
                                 H5E_BEGIN_TRY {
-                                    if((refobj_id = H5Rdereference(dset_in, H5R_OBJECT, &buf[u])) < 0)
+                                    if((refobj_id = H5Rdereference2(dset_in, H5P_DATASET_ACCESS_DEFAULT, H5R_OBJECT, &buf[u])) < 0)
                                         continue;
                                 } H5E_END_TRY;
 
@@ -262,7 +262,7 @@ int do_copy_refobjs(hid_t fidin,
 
                             for(u = 0; u < nelmts; u++) {
                                 H5E_BEGIN_TRY {
-                                    if((refobj_id = H5Rdereference(dset_in, H5R_DATASET_REGION, &buf[u])) < 0)
+                                    if((refobj_id = H5Rdereference2(dset_in, H5P_DATASET_ACCESS_DEFAULT, H5R_DATASET_REGION, &buf[u])) < 0)
                                         continue;
                                 } H5E_END_TRY;
 
@@ -540,7 +540,7 @@ static int copy_refs_attr(hid_t loc_in,
                 {
                     H5E_BEGIN_TRY
                     {
-                        if((refobj_id = H5Rdereference(attr_id, H5R_OBJECT, &buf[k])) < 0)
+                        if((refobj_id = H5Rdereference2(attr_id, H5P_DATASET_ACCESS_DEFAULT, H5R_OBJECT, &buf[k])) < 0)
                             goto error;
                     } H5E_END_TRY;
 
@@ -620,7 +620,7 @@ static int copy_refs_attr(hid_t loc_in,
                 {
                     H5E_BEGIN_TRY
                     {
-                        if((refobj_id = H5Rdereference(attr_id, H5R_DATASET_REGION, &buf[k])) < 0)
+                        if((refobj_id = H5Rdereference2(attr_id, H5P_DATASET_ACCESS_DEFAULT, H5R_DATASET_REGION, &buf[k])) < 0)
                             continue;
                     } H5E_END_TRY;
 
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index ecfc238..91a2de9 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 = H5Rdereference(container1_id, H5R_DATASET_REGION, _mem1))<0)
+                if ((obj1_id = H5Rdereference2(container1_id, H5P_DATASET_ACCESS_DEFAULT, H5R_DATASET_REGION, _mem1))<0)
                     ret= -1;
-                if ((obj2_id = H5Rdereference(container2_id, H5R_DATASET_REGION, _mem2))<0)
+                if ((obj2_id = H5Rdereference2(container2_id, H5P_DATASET_ACCESS_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 = H5Rdereference(container1_id, H5R_OBJECT, _mem1)) < 0)
+                if((obj1_id = H5Rdereference2(container1_id, H5P_DATASET_ACCESS_DEFAULT, H5R_OBJECT, _mem1)) < 0)
                     ret = -1;
-                if((obj2_id = H5Rdereference(container2_id, H5R_OBJECT, _mem2)) < 0)
+                if((obj2_id = H5Rdereference2(container2_id, H5P_DATASET_ACCESS_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 2ed13d0..079af30 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 = H5Rdereference(container, H5R_DATASET_REGION, memref);
+                region_id = H5Rdereference2(container, H5P_DATASET_ACCESS_DEFAULT, H5R_DATASET_REGION, memref);
                 if (region_id >= 0) {
                     region_space = H5Rget_region(container, H5R_DATASET_REGION, memref);
                     if (region_space >= 0) {
@@ -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 = H5Rdereference(container, H5R_DATASET_REGION, mem);
+            region_id = H5Rdereference2(container, H5P_DATASET_ACCESS_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 f8597e6..eeb024d 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 = H5Rdereference(container, H5R_OBJECT, vp);
+            obj = H5Rdereference2(container, H5P_DATASET_ACCESS_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 = H5Rdereference(container, H5R_DATASET_REGION, vp);
+    obj = H5Rdereference2(container, H5P_DATASET_ACCESS_DEFAULT, H5R_DATASET_REGION, vp);
     if (obj >= 0) {
         region = H5Rget_region(container, H5R_DATASET_REGION, vp);
         if (region >= 0) {