[svn-r4482] Purpose:

    Kludge
Description:
    Since we're only about halfway through converting the internal use of
    property lists from the "old way" to the generic property lists, we turned
    off snapshots to avoid exposing lots of API changes to users, until the
    APIs settled down.

    Getting the snapshots rolling again seems to have become a priority, so
    some changes are going to have to be made now that were going to be
    postponed until we were completely finished with the conversion.  This
    requires that the old API functions be able to deal with both the old
    and new property lists smoothly.

Solution:
    Kludge together the property list code so that they can transparently handle
    dealing with both the old and new property lists

Platforms tested:
    FreeBSD 4.4 (hawkwind)

6 files changed, 25 insertions, 25 deletions

diff --git a/test/cmpd_dset.c b/test/cmpd_dset.c
index ee00e50..0fbb346 100644
--- a/test/cmpd_dset.c
+++ b/test/cmpd_dset.c
@@ -157,7 +157,7 @@ main (int argc, char *argv[])
     if ((space = H5Screate_simple (2, dim, NULL))<0) goto error;
 
     /* Create xfer properties to preserve initialized data */
-    if ((PRESERVE = H5Pcreate_list (H5P_DATASET_XFER_NEW))<0) goto error;
+    if ((PRESERVE = H5Pcreate (H5P_DATASET_XFER))<0) goto error;
     if (H5Pset_preserve (PRESERVE, 1)<0) goto error;
 
     /*
@@ -703,7 +703,7 @@ main (int argc, char *argv[])
     /*
      * Release resources.
      */
-    H5Pclose_list (PRESERVE);
+    H5Pclose (PRESERVE);
     H5Dclose (dataset);
     H5Fclose (file);
 
diff --git a/test/dsets.c b/test/dsets.c
index 40d5f90..6716e02 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -198,7 +198,7 @@ test_simple_io(hid_t file)
 
     /* Create a small conversion buffer to test strip mining */
     tconv_buf = malloc (1000);
-    xfer = H5Pcreate_list (H5P_DATASET_XFER_NEW);
+    xfer = H5Pcreate (H5P_DATASET_XFER);
     assert (xfer>=0);
     if (H5Pset_buffer (xfer, 1000, tconv_buf, NULL)<0) goto error;
 
@@ -226,7 +226,7 @@ test_simple_io(hid_t file)
 	}
     }
 
-    i=H5Pclose_list (xfer);
+    i=H5Pclose (xfer);
     H5Dclose(dataset);
     free (tconv_buf);
     PASSED();
@@ -383,7 +383,7 @@ test_compression(hid_t file)
      * Create a small conversion buffer to test strip mining. We
      * might as well test all we can!
      */
-    if ((xfer = H5Pcreate_list (H5P_DATASET_XFER_NEW))<0) goto error;
+    if ((xfer = H5Pcreate (H5P_DATASET_XFER))<0) goto error;
     tconv_buf = malloc (1000);
     if (H5Pset_buffer (xfer, 1000, tconv_buf, NULL)<0) goto error;
 
@@ -637,7 +637,7 @@ test_compression(hid_t file)
      * Cleanup
      *---------------------------------------------------------------------- 
      */
-    if (H5Pclose_list (xfer)<0) goto error;
+    if (H5Pclose (xfer)<0) goto error;
     if (H5Pclose (dc)<0) goto error;
     if (H5Dclose(dataset)<0) goto error;
     free (tconv_buf);
diff --git a/test/tarray.c b/test/tarray.c
index fe816d5..4b0943c 100644
--- a/test/tarray.c
+++ b/test/tarray.c
@@ -1141,7 +1141,7 @@ test_array_vlen_atomic(void)
     CHECK(ret, FAIL, "H5Tclose");
 
     /* Change to the custom memory allocation routines for reading VL data */
-    xfer_pid=H5Pcreate_list(H5P_DATASET_XFER_NEW);
+    xfer_pid=H5Pcreate(H5P_DATASET_XFER);
     CHECK(xfer_pid, FAIL, "H5Pcreate");
 
     ret=H5Pset_vlen_mem_manager(xfer_pid,test_array_alloc_custom,&mem_used,test_array_free_custom,&mem_used);
@@ -1196,7 +1196,7 @@ test_array_vlen_atomic(void)
     CHECK(ret, FAIL, "H5Dvlen_reclaim");
 
     /* Close dataset transfer property list */
-    ret = H5Pclose_list(xfer_pid);
+    ret = H5Pclose(xfer_pid);
     CHECK(ret, FAIL, "H5Pclose");
     
     /* Close Datatype */
@@ -1395,7 +1395,7 @@ test_array_vlen_array(void)
     CHECK(ret, FAIL, "H5Tclose");
 
     /* Change to the custom memory allocation routines for reading VL data */
-    xfer_pid=H5Pcreate_list(H5P_DATASET_XFER_NEW);
+    xfer_pid=H5Pcreate(H5P_DATASET_XFER);
     CHECK(xfer_pid, FAIL, "H5Pcreate");
 
     ret=H5Pset_vlen_mem_manager(xfer_pid,test_array_alloc_custom,&mem_used,test_array_free_custom,&mem_used);
@@ -1452,7 +1452,7 @@ test_array_vlen_array(void)
     CHECK(ret, FAIL, "H5Dvlen_reclaim");
 
     /* Close dataset transfer property list */
-    ret = H5Pclose_list(xfer_pid);
+    ret = H5Pclose(xfer_pid);
     CHECK(ret, FAIL, "H5Pclose");
     
     /* Close Datatype */
diff --git a/test/tselect.c b/test/tselect.c
index 22743da..d0d889d 100644
--- a/test/tselect.c
+++ b/test/tselect.c
@@ -2227,8 +2227,8 @@ test_select_hyper_union(void)
     dataset=H5Dcreate(fid1,"Dataset4",H5T_NATIVE_UCHAR,sid1,H5P_DEFAULT);
     CHECK(dataset, FAIL, "H5Dcreate");
 
-    xfer = H5Pcreate_list (H5P_DATASET_XFER_NEW);
-    CHECK(xfer, FAIL, "H5Pcreate_list");
+    xfer = H5Pcreate (H5P_DATASET_XFER);
+    CHECK(xfer, FAIL, "H5Pcreate");
 
     ret = H5Pset_hyper_cache(xfer,0,1);
     CHECK(ret, FAIL, "H5Pset_hyper_cache");
@@ -2258,7 +2258,7 @@ test_select_hyper_union(void)
     CHECK(ret, FAIL, "H5Dread");
 
     /* Close transfer property list */
-    ret = H5Pclose_list(xfer);
+    ret = H5Pclose(xfer);
     CHECK(ret, FAIL, "H5Pclose");
 
     /* Compare data read with data written out */
@@ -3170,7 +3170,7 @@ test_select(void)
     MESSAGE(5, ("Testing Selections\n"));
 
     /* Create a dataset transfer property list */
-    plist_id=H5Pcreate_list(H5P_DATASET_XFER_NEW);
+    plist_id=H5Pcreate(H5P_DATASET_XFER);
     CHECK(plist_id, FAIL, "H5Pcreate");
 
     /* test I/O with a very small buffer for reads */
@@ -3231,7 +3231,7 @@ test_select(void)
     CHECK(ret, FAIL, "H5Pclose");
 
     /* Close dataset transfer property list */
-    ret=H5Pclose_list(plist_id);
+    ret=H5Pclose(plist_id);
     CHECK(ret, FAIL, "H5Pclose");
 
 }   /* test_select() */
diff --git a/test/tvlstr.c b/test/tvlstr.c
index 40c3880..2a8ecbc 100644
--- a/test/tvlstr.c
+++ b/test/tvlstr.c
@@ -154,7 +154,7 @@ test_vlstrings_basic(void)
     CHECK(ret, FAIL, "H5Dwrite");
 
     /* Change to the custom memory allocation routines for reading VL string */
-    xfer_pid=H5Pcreate_list(H5P_DATASET_XFER_NEW);
+    xfer_pid=H5Pcreate(H5P_DATASET_XFER);
     CHECK(xfer_pid, FAIL, "H5Pcreate");
 
     ret=H5Pset_vlen_mem_manager(xfer_pid,test_vlstr_alloc_custom,&mem_used,test_vlstr_free_custom,&mem_used);
@@ -212,7 +212,7 @@ test_vlstrings_basic(void)
     CHECK(ret, FAIL, "H5Sclose");
     
     /* Close dataset transfer property list */
-    ret = H5Pclose_list(xfer_pid);
+    ret = H5Pclose(xfer_pid);
     CHECK(ret, FAIL, "H5Pclose");
     
     /* Close file */
diff --git a/test/tvltypes.c b/test/tvltypes.c
index 3383818..8e59bd2 100644
--- a/test/tvltypes.c
+++ b/test/tvltypes.c
@@ -149,7 +149,7 @@ test_vltypes_vlen_atomic(void)
     CHECK(ret, FAIL, "H5Dwrite");
 
     /* Change to the custom memory allocation routines for reading VL data */
-    xfer_pid=H5Pcreate_list(H5P_DATASET_XFER_NEW);
+    xfer_pid=H5Pcreate(H5P_DATASET_XFER);
     CHECK(xfer_pid, FAIL, "H5Pcreate");
 
     ret=H5Pset_vlen_mem_manager(xfer_pid,test_vltypes_alloc_custom,&mem_used,test_vltypes_free_custom,&mem_used);
@@ -210,7 +210,7 @@ test_vltypes_vlen_atomic(void)
     CHECK(ret, FAIL, "H5Sclose");
     
     /* Close dataset transfer property list */
-    ret = H5Pclose_list(xfer_pid);
+    ret = H5Pclose(xfer_pid);
     CHECK(ret, FAIL, "H5Pclose");
     
     /* Close file */
@@ -289,7 +289,7 @@ test_vltypes_vlen_compound(void)
     CHECK(ret, FAIL, "H5Dwrite");
 
     /* Change to the custom memory allocation routines for reading VL data */
-    xfer_pid=H5Pcreate_list(H5P_DATASET_XFER_NEW);
+    xfer_pid=H5Pcreate(H5P_DATASET_XFER);
     CHECK(xfer_pid, FAIL, "H5Pcreate");
 
     ret=H5Pset_vlen_mem_manager(xfer_pid,test_vltypes_alloc_custom,&mem_used,test_vltypes_free_custom,&mem_used);
@@ -359,7 +359,7 @@ test_vltypes_vlen_compound(void)
     CHECK(ret, FAIL, "H5Sclose");
     
     /* Close dataset transfer property list */
-    ret = H5Pclose_list(xfer_pid);
+    ret = H5Pclose(xfer_pid);
     CHECK(ret, FAIL, "H5Pclose");
     
     /* Close file */
@@ -441,7 +441,7 @@ test_vltypes_compound_vlen_atomic(void)
     CHECK(ret, FAIL, "H5Dwrite");
 
     /* Change to the custom memory allocation routines for reading VL data */
-    xfer_pid=H5Pcreate_list(H5P_DATASET_XFER_NEW);
+    xfer_pid=H5Pcreate(H5P_DATASET_XFER);
     CHECK(xfer_pid, FAIL, "H5Pcreate");
 
     ret=H5Pset_vlen_mem_manager(xfer_pid,test_vltypes_alloc_custom,&mem_used,test_vltypes_free_custom,&mem_used);
@@ -516,7 +516,7 @@ test_vltypes_compound_vlen_atomic(void)
     CHECK(ret, FAIL, "H5Sclose");
     
     /* Close dataset transfer property list */
-    ret = H5Pclose_list(xfer_pid);
+    ret = H5Pclose(xfer_pid);
     CHECK(ret, FAIL, "H5Pclose");
     
     /* Close file */
@@ -658,7 +658,7 @@ test_vltypes_vlen_vlen_atomic(void)
     CHECK(dataset, FAIL, "H5Dopen");
 
     /* Change to the custom memory allocation routines for reading VL data */
-    xfer_pid=H5Pcreate_list(H5P_DATASET_XFER_NEW);
+    xfer_pid=H5Pcreate(H5P_DATASET_XFER);
     CHECK(xfer_pid, FAIL, "H5Pcreate");
 
     ret=H5Pset_vlen_mem_manager(xfer_pid,test_vltypes_alloc_custom,&mem_used,test_vltypes_free_custom,&mem_used);
@@ -732,7 +732,7 @@ test_vltypes_vlen_vlen_atomic(void)
     CHECK(ret, FAIL, "H5Sclose");
     
     /* Close dataset transfer property list */
-    ret = H5Pclose_list(xfer_pid);
+    ret = H5Pclose(xfer_pid);
     CHECK(ret, FAIL, "H5Pclose");
     
     /* Close file */