[svn-r21119] Description:

    Simplify use of property lists to H5Rdereference, and switch to use
H5Rdereference2.

Tested on:
    Mac OS X/32 10.6.8 (amazon)
    (too small to require h5committest)

2 files changed, 3 insertions, 15 deletions

diff --git a/examples/h5_ref2reg.c b/examples/h5_ref2reg.c
index 4db7671..c4e8d3d 100644
--- a/examples/h5_ref2reg.c
+++ b/examples/h5_ref2reg.c
@@ -39,7 +39,6 @@ int main(void)
     hid_t spacer_id;
     hid_t dsetv_id;       /*dataset identifiers*/
     hid_t dsetr_id;
-    hid_t dapl_id;        /* Dataset access property list */
     hsize_t dims[2] =  {2,9};
     hsize_t dimsr[1] =  {2};
     int rank = 2;
@@ -68,9 +67,6 @@ int main(void)
     space_id = H5Screate_simple(rank, dims, NULL);
     spacer_id = H5Screate_simple(rankr, dimsr, NULL);
 
-    /* Create dataset access property list */
-    dapl_id = H5Pcreate(H5P_DATASET_ACCESS);
- 
     /*
      * Create integer dataset.
      */
@@ -134,7 +130,7 @@ int main(void)
     /*
      * Dereference the first reference.
      */
-    dsetv_id = H5Rdereference(dsetr_id, dapl_id, H5R_DATASET_REGION, &ref_out[0]);
+    dsetv_id = H5Rdereference2(dsetr_id, H5P_DEFAULT, H5R_DATASET_REGION, &ref_out[0]);
     /*
      * Get name of the dataset the first region reference points to
      * using H5Rget_name
@@ -181,7 +177,7 @@ int main(void)
     /*
      * Dereference the second reference.
      */
-    dsetv_id = H5Rdereference(dsetr_id, dapl_id, H5R_DATASET_REGION, &ref_out[1]);
+    dsetv_id = H5Rdereference2(dsetr_id, H5P_DEFAULT, H5R_DATASET_REGION, &ref_out[1]);
     space_id = H5Rget_region(dsetv_id, H5R_DATASET_REGION,&ref_out[1]);
 
     /*
@@ -203,7 +199,6 @@ int main(void)
      * Close dataspace and the dataset.
      */
     status = H5Sclose(space_id);
-    status = H5Pclose(dapl_id);
     status = H5Dclose(dsetv_id);
     status = H5Dclose(dsetr_id);
     status = H5Fclose(file_id);
diff --git a/examples/h5_reference.c b/examples/h5_reference.c
index 3820345..758002f 100644
--- a/examples/h5_reference.c
+++ b/examples/h5_reference.c
@@ -35,7 +35,6 @@ main(void) {
    hid_t gid_a;                       /* and  dataspaces identifiers   */
    hid_t did_b, sid_b, tid_b;
    hid_t did_r, tid_r, sid_r;
-   hid_t dapl_id;                     /* Dataset access property list */
    H5O_type_t obj_type;
    herr_t status;
 
@@ -56,11 +55,6 @@ main(void) {
     */
    gid_a = H5Gcreate2(fid, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 
-   /* 
-    * Create dataset access property list 
-    */
-   dapl_id = H5Pcreate(H5P_DATASET_ACCESS);
-
   /*
    *  Create dataset "B" in the file.
    */
@@ -134,7 +128,7 @@ main(void) {
    /*
     *  Get datatype of the dataset "B"
     */
-   did_b = H5Rdereference(did_r, dapl_id, H5R_OBJECT, &rbuf[1]);
+   did_b = H5Rdereference2(did_r, H5P_DEFAULT, H5R_OBJECT, &rbuf[1]);
    tid_b = H5Dget_type(did_b);
    if(H5Tequal(tid_b, H5T_NATIVE_FLOAT))
      printf("Datatype of the dataset is H5T_NATIVE_FLOAT.\n");
@@ -143,7 +137,6 @@ main(void) {
    /*
     * Close all objects and free memory buffers.
     */
-   H5Pclose(dapl_id);
    H5Dclose(did_r);
    H5Dclose(did_b);
    H5Tclose(tid_b);