[svn-r297] Switched templates to "property lists" and changed API prefix from H5C to H5P

9 files changed, 109 insertions, 109 deletions

diff --git a/test/cmpd_dset.c b/test/cmpd_dset.c
index aad6339..a98a9b3 100644
--- a/test/cmpd_dset.c
+++ b/test/cmpd_dset.c
@@ -130,7 +130,7 @@ main (void)
 
     /* Create the file */
     file = H5Fcreate ("cmpd_dset.h5", H5F_ACC_TRUNC,
-		      H5C_DEFAULT, H5C_DEFAULT);
+		      H5P_DEFAULT, H5P_DEFAULT);
     assert (file>=0);
 
     /* Create the data space */
@@ -166,11 +166,11 @@ STEP  1: Initialize dataset `s1' and store it on disk in native order.\n");
     assert (s1_tid>=0);
 
     /* Create the dataset */
-    dataset = H5Dcreate (file, "s1", s1_tid, space, H5C_DEFAULT);
+    dataset = H5Dcreate (file, "s1", s1_tid, space, H5P_DEFAULT);
     assert (dataset>=0);
 
     /* Write the data */
-    status = H5Dwrite (dataset, s1_tid, H5S_ALL, H5S_ALL, H5C_DEFAULT, s1);
+    status = H5Dwrite (dataset, s1_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, s1);
     assert (status>=0);
 
     /*
@@ -195,7 +195,7 @@ STEP  2: Read the dataset from disk into a new memory buffer which has the\n\
     assert (s2_tid>=0);
     
     /* Read the data */
-    status = H5Dread (dataset, s2_tid, H5S_ALL, H5S_ALL, H5C_DEFAULT, s2);
+    status = H5Dread (dataset, s2_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, s2);
     assert (status>=0);
 
     /* Compare s2 with s1.  They should be the same */
@@ -227,7 +227,7 @@ STEP  3: Read the dataset again with members in a different order.\n");
     assert (s3_tid>=0);
     
     /* Read the data */
-    status = H5Dread (dataset, s3_tid, H5S_ALL, H5S_ALL, H5C_DEFAULT, s3);
+    status = H5Dread (dataset, s3_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, s3);
     assert (status>=0);
 
     /* Compare s3 with s1.  They should be the same */
@@ -255,7 +255,7 @@ STEP  4: Read a subset of the members.\n");
     assert (s4_tid>=0);
 
     /* Read the data */
-    status = H5Dread (dataset, s4_tid, H5S_ALL, H5S_ALL, H5C_DEFAULT, s4);
+    status = H5Dread (dataset, s4_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, s4);
     assert (status>=0);
 
     /* Compare s4 with s1 */
@@ -291,7 +291,7 @@ STEP  5: Read members into a superset which is partially initialized.\n");
     assert (s5_tid>=0);
 	
     /* Read the data */
-    status = H5Dread (dataset, s5_tid, H5S_ALL, H5S_ALL, H5C_DEFAULT, s5);
+    status = H5Dread (dataset, s5_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, s5);
     assert (status>=0);
 
     /* Check that the data was read properly */
@@ -329,11 +329,11 @@ STEP  6: Update fields `b' and `d' on the file, leaving the other fields\n\
     }
 
     /* Write the data to file */
-    status = H5Dwrite (dataset, s4_tid, H5S_ALL, H5S_ALL, H5C_DEFAULT, s4);
+    status = H5Dwrite (dataset, s4_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, s4);
     assert (status>=0);
     
     /* Read the data back */
-    status = H5Dread (dataset, s1_tid, H5S_ALL, H5S_ALL, H5C_DEFAULT, s1);
+    status = H5Dread (dataset, s1_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, s1);
     assert (status>=0);
 
     /* Compare */
@@ -360,7 +360,7 @@ STEP  7: Reading original dataset with explicit data space.\n");
     assert (s7_sid>=0);
     
     /* Read the dataset */
-    status = H5Dread (dataset, s2_tid, s7_sid, H5S_ALL, H5C_DEFAULT, s2);
+    status = H5Dread (dataset, s2_tid, s7_sid, H5S_ALL, H5P_DEFAULT, s2);
     assert (status>=0);
 
     /* Compare */
@@ -401,7 +401,7 @@ STEP  8: Read middle third hyperslab into memory array.\n");
     /* Read the dataset */
     s8 = calloc (h_size[0]*h_size[1], sizeof(s1_t));
     assert (s8);
-    status = H5Dread (dataset, s1_tid, s8_m_sid, s8_f_sid, H5C_DEFAULT, s8);
+    status = H5Dread (dataset, s1_tid, s8_m_sid, s8_f_sid, H5P_DEFAULT, s8);
     assert (status>=0);
 
     /* Compare */
@@ -435,7 +435,7 @@ STEP  9: Read middle third of hyperslab into middle third of memory array.\n");
     memset (s2, 0xFF, NX*NY*sizeof(s2_t));
     
     /* Read the hyperslab */
-    status = H5Dread (dataset, s2_tid, s8_f_sid, s8_f_sid, H5C_DEFAULT, s2);
+    status = H5Dread (dataset, s2_tid, s8_f_sid, s8_f_sid, H5P_DEFAULT, s2);
     assert (status>=0);
 
     /* Compare */
@@ -474,7 +474,7 @@ STEP 10: Read middle third of hyperslab into middle third of memory array\n\
     memset (s5, 0xFF, NX*NY*sizeof(s5_t));
     
     /* Read the hyperslab */
-    status = H5Dread (dataset, s5_tid, s8_f_sid, s8_f_sid, H5C_DEFAULT, s5);
+    status = H5Dread (dataset, s5_tid, s8_f_sid, s8_f_sid, H5P_DEFAULT, s5);
     assert (status>=0);
 
     /* Compare */
@@ -525,11 +525,11 @@ STEP 11: Write an array back to the middle third of the dataset to\n\
     memset (s11, 0xff, h_size[0]*h_size[1]*sizeof(s4_t));
     
     /* Write to disk */
-    status = H5Dwrite (dataset, s4_tid, s8_m_sid, s8_f_sid, H5C_DEFAULT, s11);
+    status = H5Dwrite (dataset, s4_tid, s8_m_sid, s8_f_sid, H5P_DEFAULT, s11);
     assert (status>=0);
 
     /* Read the whole thing */
-    status = H5Dread (dataset, s1_tid, H5S_ALL, H5S_ALL, H5C_DEFAULT, s1);
+    status = H5Dread (dataset, s1_tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, s1);
     assert (status>=0);
 
     /* Compare */
diff --git a/test/dsets.c b/test/dsets.c
index 16cd541..5d05288 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -65,7 +65,7 @@ test_create(hid_t file)
      * not sure what they are, so we won't check.
      */
     dataset = H5Dcreate(file, DSET_DEFAULT_NAME, H5T_NATIVE_DOUBLE, space,
-                        H5C_DEFAULT);
+                        H5P_DEFAULT);
     if (dataset < 0) {
         puts("*FAILED*");
         if (!isatty(1)) {
@@ -88,7 +88,7 @@ test_create(hid_t file)
      * dataset can only be created once.
      */
     dataset = H5Dcreate(file, DSET_DEFAULT_NAME, H5T_NATIVE_DOUBLE, space,
-                        H5C_DEFAULT);
+                        H5P_DEFAULT);
     if (dataset >= 0) {
         puts("*FAILED*");
         if (!isatty(1)) {
@@ -135,11 +135,11 @@ test_create(hid_t file)
      * Create a new dataset that uses chunked storage instead of the default
      * layout.
      */
-    create_parms = H5Ccreate(H5C_DATASET_CREATE);
+    create_parms = H5Pcreate(H5P_DATASET_CREATE);
     assert(create_parms >= 0);
     csize[0] = 5;
     csize[1] = 100;
-    status = H5Cset_chunk(create_parms, 2, csize);
+    status = H5Pset_chunk(create_parms, 2, csize);
     assert(status >= 0);
 
     dataset = H5Dcreate(file, DSET_CHUNKED_NAME, H5T_NATIVE_DOUBLE, space,
@@ -214,12 +214,12 @@ test_simple_io(hid_t file)
 
     /* Create the dataset */
     dataset = H5Dcreate(file, DSET_SIMPLE_IO_NAME, H5T_NATIVE_INT, space,
-                        H5C_DEFAULT);
+                        H5P_DEFAULT);
     assert(dataset >= 0);
 
     /* Write the data to the dataset */
     status = H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL,
-                      H5C_DEFAULT, points);
+                      H5P_DEFAULT, points);
     if (status < 0) {
         puts("*FAILED*");
         if (!isatty(1)) {
@@ -230,7 +230,7 @@ test_simple_io(hid_t file)
     }
     /* Read the dataset back */
     status = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL,
-                     H5C_DEFAULT, check);
+                     H5P_DEFAULT, check);
     if (status < 0) {
         puts("*FAILED*");
         if (!isatty(1)) {
@@ -306,12 +306,12 @@ test_tconv(hid_t file)
 
     /* Create the data set */
     dataset = H5Dcreate(file, DSET_TCONV_NAME, H5T_NATIVE_INT32, space,
-                        H5C_DEFAULT);
+                        H5P_DEFAULT);
     assert(dataset >= 0);
 
     /* Write the data to the dataset */
     status = H5Dwrite(dataset, H5T_NATIVE_INT32, H5S_ALL, H5S_ALL,
-                      H5C_DEFAULT, out);
+                      H5P_DEFAULT, out);
     if (status<0) H5Eprint (H5E_thrdid_g, stdout);
     assert(status >= 0);
 
@@ -330,7 +330,7 @@ test_tconv(hid_t file)
     }
 
     /* Read data with byte order conversion */
-    status = H5Dread(dataset, type, H5S_ALL, H5S_ALL, H5C_DEFAULT, in);
+    status = H5Dread(dataset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, in);
     assert(status >= 0);
 
     /* Check */
@@ -375,7 +375,7 @@ main(void)
     assert (status>=0);
 
     unlink("dataset.h5");
-    file = H5Fcreate("dataset.h5", H5F_ACC_TRUNC, H5C_DEFAULT, H5C_DEFAULT);
+    file = H5Fcreate("dataset.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     assert(file >= 0);
 
     status = test_create(file);
diff --git a/test/extend.c b/test/extend.c
index a3562fa..2cadb1c 100644
--- a/test/extend.c
+++ b/test/extend.c
@@ -54,13 +54,13 @@ main (void)
     assert (mem_space>=0);
 
     /* Create the file */
-    file = H5Fcreate ("extend.h5", H5F_ACC_TRUNC, H5C_DEFAULT, H5C_DEFAULT);
+    file = H5Fcreate ("extend.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     assert (file>=0);
 
     /* Create the dataset which is originally NX by NY */
-    cparms = H5Ccreate (H5C_DATASET_CREATE);
+    cparms = H5Pcreate (H5P_DATASET_CREATE);
     assert (cparms>=0);
-    status = H5Cset_chunk (cparms, 2, chunk_dims);
+    status = H5Pset_chunk (cparms, 2, chunk_dims);
     assert (status>=0);
     dataset = H5Dcreate (file, "dataset", H5T_NATIVE_INT, mem_space, cparms);
     assert (dataset>=0);
@@ -85,7 +85,7 @@ main (void)
 
 	    /* Write to the hyperslab */
 	    status = H5Dwrite (dataset, H5T_NATIVE_INT, mem_space, file_space,
-			       H5C_DEFAULT, buf1);
+			       H5P_DEFAULT, buf1);
 	    assert (status>=0);
 	    H5Sclose (file_space);
 	}
@@ -108,7 +108,7 @@ main (void)
 	    
 	    /* Read */
 	    status = H5Dread (dataset, H5T_NATIVE_INT, mem_space, file_space,
-			      H5C_DEFAULT, buf2);
+			      H5P_DEFAULT, buf2);
 	    assert (status>=0);
 
 	    /* Compare */
diff --git a/test/istore.c b/test/istore.c
index f5b4b04..4a07337 100644
--- a/test/istore.c
+++ b/test/istore.c
@@ -9,7 +9,7 @@
  */
 #include <H5private.h>
 #include <H5Aprivate.h>
-#include <H5Cprivate.h>
+#include <H5Pprivate.h>
 #include <H5Fprivate.h>
 #include <H5Gprivate.h>
 #include <H5MMprivate.h>
@@ -573,8 +573,8 @@ main(int argc, char *argv[])
     /*
      * Use larger file addresses...
      */
-    template_id = H5Ccreate(H5C_FILE_CREATE);
-    H5Cset_sizes(template_id, 8, 0);
+    template_id = H5Pcreate(H5P_FILE_CREATE);
+    H5Pset_sizes(template_id, 8, 0);
     creation_template = H5A_object(template_id);
 
     /* Create the test file */
diff --git a/test/tfile.c b/test/tfile.c
index d252587..1daca76 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -28,7 +28,7 @@ static char             RcsId[] = "$Revision$";
 
 #include <H5private.h>
 #include <H5Bprivate.h>
-#include <H5Cprivate.h>
+#include <H5Pprivate.h>
 #include <H5Mprivate.h>
 
 #define F1_USERBLOCK_SIZE  0
@@ -71,11 +71,11 @@ test_file_create(void)
     MESSAGE(5, ("Testing Low-Level File Creation I/O\n"));
 
     /* Create first file */
-    fid1 = H5Fcreate(FILE1, H5F_ACC_TRUNC, H5C_DEFAULT, H5C_DEFAULT);
+    fid1 = H5Fcreate(FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(fid1, FAIL, "H5Fcreate");
 
     /* Try to create first file again (should fail) */
-    fid2 = H5Fcreate(FILE1, H5F_ACC_TRUNC, H5C_DEFAULT, H5C_DEFAULT);
+    fid2 = H5Fcreate(FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     VERIFY(fid2, FAIL, "H5Fcreate");
 
     /* Get the file-creation template */
@@ -83,19 +83,19 @@ test_file_create(void)
     CHECK(tmpl1, FAIL, "H5Fget_create_template");
 
     /* Get the file-creation parameters */
-    ret = H5Cget_userblock(tmpl1, &parm);
-    CHECK(ret, FAIL, "H5Cget_userblock");
-    VERIFY(parm, F1_USERBLOCK_SIZE, "H5Cget_userblock");
+    ret = H5Pget_userblock(tmpl1, &parm);
+    CHECK(ret, FAIL, "H5Pget_userblock");
+    VERIFY(parm, F1_USERBLOCK_SIZE, "H5Pget_userblock");
 
-    ret = H5Cget_sizes(tmpl1, &parm, &parm2);
-    CHECK(ret, FAIL, "H5Cget_sizes");
-    VERIFY(parm, F1_OFFSET_SIZE, "H5Cget_sizes");
-    VERIFY(parm2, F1_LENGTH_SIZE, "H5Cget_sizes");
+    ret = H5Pget_sizes(tmpl1, &parm, &parm2);
+    CHECK(ret, FAIL, "H5Pget_sizes");
+    VERIFY(parm, F1_OFFSET_SIZE, "H5Pget_sizes");
+    VERIFY(parm2, F1_LENGTH_SIZE, "H5Pget_sizes");
 
-    ret = H5Cget_sym_k(tmpl1, &iparm, &iparm2);
-    CHECK(ret, FAIL, "H5Cget_sym_k");
-    VERIFY(iparm, F1_SYM_INTERN_K, "H5Cget_sym_k");
-    VERIFY(iparm2, F1_SYM_LEAF_K, "H5Cget_sym_k");
+    ret = H5Pget_sym_k(tmpl1, &iparm, &iparm2);
+    CHECK(ret, FAIL, "H5Pget_sym_k");
+    VERIFY(iparm, F1_SYM_INTERN_K, "H5Pget_sym_k");
+    VERIFY(iparm2, F1_SYM_LEAF_K, "H5Pget_sym_k");
 
     /* Release file-creation template */
     ret = H5Mclose(tmpl1);
@@ -108,24 +108,24 @@ test_file_create(void)
 #endif
 
     /* Create a new file with a non-standard file-creation template */
-    tmpl1 = H5Ccreate(H5C_FILE_CREATE);
-    CHECK(tmpl1, FAIL, "H5Cnew");
+    tmpl1 = H5Pcreate(H5P_FILE_CREATE);
+    CHECK(tmpl1, FAIL, "H5Pnew");
 
     /* Set the new file-creation parameters */
-    ret = H5Cset_userblock(tmpl1, F2_USERBLOCK_SIZE);
-    CHECK(ret, FAIL, "H5Cset_userblock");
+    ret = H5Pset_userblock(tmpl1, F2_USERBLOCK_SIZE);
+    CHECK(ret, FAIL, "H5Pset_userblock");
 
-    ret = H5Cset_sizes(tmpl1, F2_OFFSET_SIZE, F2_LENGTH_SIZE);
-    CHECK(ret, FAIL, "H5Cset_sizes");
+    ret = H5Pset_sizes(tmpl1, F2_OFFSET_SIZE, F2_LENGTH_SIZE);
+    CHECK(ret, FAIL, "H5Pset_sizes");
 
-    ret = H5Cset_sym_k(tmpl1, F2_SYM_INTERN_K, F2_SYM_LEAF_K);
-    CHECK(ret, FAIL, "H5Cset_sym_k");
+    ret = H5Pset_sym_k(tmpl1, F2_SYM_INTERN_K, F2_SYM_LEAF_K);
+    CHECK(ret, FAIL, "H5Pset_sym_k");
 
     /*
      * Try to create second file, with non-standard file-creation template
      * params.
      */
-    fid2 = H5Fcreate(FILE2, H5F_ACC_TRUNC, tmpl1, H5C_DEFAULT);
+    fid2 = H5Fcreate(FILE2, H5F_ACC_TRUNC, tmpl1, H5P_DEFAULT);
     CHECK(fid2, FAIL, "H5Fcreate");
 
     /* Release file-creation template */
@@ -137,19 +137,19 @@ test_file_create(void)
     CHECK(tmpl1, FAIL, "H5Fget_create_template");
 
     /* Get the file-creation parameters */
-    ret = H5Cget_userblock(tmpl1, &parm);
-    CHECK(ret, FAIL, "H5Cget_userblock");
-    VERIFY(parm, F2_USERBLOCK_SIZE, "H5Cget_userblock");
+    ret = H5Pget_userblock(tmpl1, &parm);
+    CHECK(ret, FAIL, "H5Pget_userblock");
+    VERIFY(parm, F2_USERBLOCK_SIZE, "H5Pget_userblock");
 
-    ret = H5Cget_sizes(tmpl1, &parm, &parm2);
-    CHECK(ret, FAIL, "H5Cget_sizes");
-    VERIFY(parm, F2_OFFSET_SIZE, "H5Cget_sizes");
-    VERIFY(parm2, F2_LENGTH_SIZE, "H5Cget_sizes");
+    ret = H5Pget_sizes(tmpl1, &parm, &parm2);
+    CHECK(ret, FAIL, "H5Pget_sizes");
+    VERIFY(parm, F2_OFFSET_SIZE, "H5Pget_sizes");
+    VERIFY(parm2, F2_LENGTH_SIZE, "H5Pget_sizes");
 
-    ret = H5Cget_sym_k(tmpl1, &iparm, &iparm2);
-    CHECK(ret, FAIL, "H5Cget_sym_k");
-    VERIFY(iparm, F2_SYM_INTERN_K, "H5Cget_sym_k");
-    VERIFY(iparm2, F2_SYM_LEAF_K, "H5Cget_sym_k");
+    ret = H5Pget_sym_k(tmpl1, &iparm, &iparm2);
+    CHECK(ret, FAIL, "H5Pget_sym_k");
+    VERIFY(iparm, F2_SYM_INTERN_K, "H5Pget_sym_k");
+    VERIFY(iparm2, F2_SYM_LEAF_K, "H5Pget_sym_k");
 
     /* Clone the file-creation template */
     tmpl2 = H5Mcopy(tmpl1);
@@ -160,14 +160,14 @@ test_file_create(void)
     CHECK(ret, FAIL, "H5Mrelease");
 
     /* Set the new file-creation parameter */
-    ret = H5Cset_userblock(tmpl2, F3_USERBLOCK_SIZE);
-    CHECK(ret, FAIL, "H5Cset_userblock");
+    ret = H5Pset_userblock(tmpl2, F3_USERBLOCK_SIZE);
+    CHECK(ret, FAIL, "H5Pset_userblock");
 
     /*
      * Try to create second file, with non-standard file-creation template
      * params
      */
-    fid3 = H5Fcreate(FILE3, H5F_ACC_TRUNC, tmpl2, H5C_DEFAULT);
+    fid3 = H5Fcreate(FILE3, H5F_ACC_TRUNC, tmpl2, H5P_DEFAULT);
     CHECK(fid3, FAIL, "H5Fcreate");
 
     /* Release file-creation template */
@@ -179,19 +179,19 @@ test_file_create(void)
     CHECK(tmpl1, FAIL, "H5Fget_create_template");
 
     /* Get the file-creation parameters */
-    ret = H5Cget_userblock(tmpl1, &parm);
-    CHECK(ret, FAIL, "H5Cget_userblock");
-    VERIFY(parm, F3_USERBLOCK_SIZE, "H5Cget_userblock");
+    ret = H5Pget_userblock(tmpl1, &parm);
+    CHECK(ret, FAIL, "H5Pget_userblock");
+    VERIFY(parm, F3_USERBLOCK_SIZE, "H5Pget_userblock");
 
-    ret = H5Cget_sizes(tmpl1, &parm, &parm2);
-    CHECK(ret, FAIL, "H5Cget_sizes");
-    VERIFY(parm, F3_OFFSET_SIZE, "H5Cget_sizes");
-    VERIFY(parm2, F3_LENGTH_SIZE, "H5Cget_sizes");
+    ret = H5Pget_sizes(tmpl1, &parm, &parm2);
+    CHECK(ret, FAIL, "H5Pget_sizes");
+    VERIFY(parm, F3_OFFSET_SIZE, "H5Pget_sizes");
+    VERIFY(parm2, F3_LENGTH_SIZE, "H5Pget_sizes");
 
-    ret = H5Cget_sym_k(tmpl1, &iparm, &iparm2);
-    CHECK(ret, FAIL, "H5Cget_sym_k");
-    VERIFY(iparm, F3_SYM_INTERN_K, "H5Cget_sym_k");
-    VERIFY(iparm2, F3_SYM_LEAF_K, "H5Cget_sym_k");
+    ret = H5Pget_sym_k(tmpl1, &iparm, &iparm2);
+    CHECK(ret, FAIL, "H5Pget_sym_k");
+    VERIFY(iparm, F3_SYM_INTERN_K, "H5Pget_sym_k");
+    VERIFY(iparm2, F3_SYM_LEAF_K, "H5Pget_sym_k");
 
     /* Release file-creation template */
     ret = H5Mclose(tmpl1);
@@ -229,7 +229,7 @@ test_file_open(void)
     MESSAGE(5, ("Testing Low-Level File Opening I/O\n"));
 
     /* Open first file */
-    fid1 = H5Fopen(FILE2, H5F_ACC_RDWR, H5C_DEFAULT);
+    fid1 = H5Fopen(FILE2, H5F_ACC_RDWR, H5P_DEFAULT);
     CHECK(fid1, FAIL, "H5Fopen");
 
     /* Get the file-creation template */
@@ -237,19 +237,19 @@ test_file_open(void)
     CHECK(tmpl1, FAIL, "H5Fget_create_template");
 
     /* Get the file-creation parameters */
-    ret = H5Cget_userblock(tmpl1, &parm);
-    CHECK(ret, FAIL, "H5Cget_userblock");
-    VERIFY(parm, F2_USERBLOCK_SIZE, "H5Cget_userblock");
-
-    ret = H5Cget_sizes(tmpl1, &parm, &parm2);
-    CHECK(ret, FAIL, "H5Cget_sizes");
-    VERIFY(parm, F2_OFFSET_SIZE, "H5Cget_sizes");
-    VERIFY(parm2, F2_LENGTH_SIZE, "H5Cget_sizes");
-
-    ret = H5Cget_sym_k(tmpl1, &iparm, &iparm2);
-    CHECK(ret, FAIL, "H5Cget_sym_k");
-    VERIFY(iparm, F2_SYM_INTERN_K, "H5Cget_sym_k");
-    VERIFY(iparm2, F2_SYM_LEAF_K, "H5Cget_sym_k");
+    ret = H5Pget_userblock(tmpl1, &parm);
+    CHECK(ret, FAIL, "H5Pget_userblock");
+    VERIFY(parm, F2_USERBLOCK_SIZE, "H5Pget_userblock");
+
+    ret = H5Pget_sizes(tmpl1, &parm, &parm2);
+    CHECK(ret, FAIL, "H5Pget_sizes");
+    VERIFY(parm, F2_OFFSET_SIZE, "H5Pget_sizes");
+    VERIFY(parm2, F2_LENGTH_SIZE, "H5Pget_sizes");
+
+    ret = H5Pget_sym_k(tmpl1, &iparm, &iparm2);
+    CHECK(ret, FAIL, "H5Pget_sym_k");
+    VERIFY(iparm, F2_SYM_INTERN_K, "H5Pget_sym_k");
+    VERIFY(iparm2, F2_SYM_LEAF_K, "H5Pget_sym_k");
 
     /* Release file-creation template */
     ret = H5Mclose(tmpl1);
diff --git a/test/th5s.c b/test/th5s.c
index faafd5e..aca8df0 100644
--- a/test/th5s.c
+++ b/test/th5s.c
@@ -70,7 +70,7 @@ test_h5p_basic(void)
     MESSAGE(5, ("Testing Datatype Manipulation\n"));
 
     /* Create file */
-    fid1 = H5Fcreate(FILE, H5F_ACC_TRUNC, H5C_DEFAULT, H5C_DEFAULT);
+    fid1 = H5Fcreate(FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(fid1, FAIL, "H5Fcreate");
 
     sid1 = H5Screate_simple(SPACE1_RANK, dims1, NULL);
diff --git a/test/theap.c b/test/theap.c
index ec8a71d..4a4862d 100644
--- a/test/theap.c
+++ b/test/theap.c
@@ -19,7 +19,7 @@
 #include <H5private.h>
 #include <H5Aprivate.h>
 #include <H5ACprivate.h>
-#include <H5Cprivate.h>
+#include <H5Pprivate.h>
 #include <H5Fprivate.h>
 #include <H5Hprivate.h>
 
@@ -55,7 +55,7 @@ test_heap(void)
     MESSAGE(5, ("Testing Heaps\n"));
 
     /* Create the file */
-    fid = H5Fcreate("theap.h5", H5F_ACC_TRUNC, H5C_DEFAULT, H5C_DEFAULT);
+    fid = H5Fcreate("theap.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(fid, FAIL, "H5Fcreate");
     f = H5A_object(fid);
     CHECK(f, NULL, "H5Aatom_object");
diff --git a/test/tohdr.c b/test/tohdr.c
index bbeb895..00d4322 100644
--- a/test/tohdr.c
+++ b/test/tohdr.c
@@ -19,7 +19,7 @@
 #include <H5private.h>
 #include <H5Aprivate.h>
 #include <H5ACprivate.h>
-#include <H5Cprivate.h>
+#include <H5Pprivate.h>
 #include <H5Fprivate.h>
 #include <H5Gprivate.h>
 #include <H5Oprivate.h>
@@ -59,7 +59,7 @@ test_ohdr(void)
     MESSAGE(5, ("Testing Object Headers\n"));
 
     /* create the file */
-    fid = H5Fcreate("tohdr.h5", H5F_ACC_TRUNC, H5C_DEFAULT, H5C_DEFAULT);
+    fid = H5Fcreate("tohdr.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(fid, FAIL, "H5Fcreate");
     f = H5A_object(fid);
     CHECK(f, NULL, "H5Aatom_object");
diff --git a/test/tstab.c b/test/tstab.c
index 58a07d5..4210db7 100644
--- a/test/tstab.c
+++ b/test/tstab.c
@@ -19,7 +19,7 @@
 #include <H5private.h>
 #include <H5Aprivate.h>
 #include <H5ACprivate.h>
-#include <H5Cprivate.h>
+#include <H5Pprivate.h>
 #include <H5Fprivate.h>
 #include <H5Gprivate.h>
 #include <H5Oprivate.h>
@@ -67,7 +67,7 @@ test_1(void)
      */
 
     /* create the file */
-    fid = H5Fcreate("tstab1.h5", H5F_ACC_TRUNC, H5C_DEFAULT, H5C_DEFAULT);
+    fid = H5Fcreate("tstab1.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(fid, FAIL, "H5Fcreate");
     f = H5A_object(fid);
     CHECK(f, NULL, "H5Aatom_object");
@@ -130,7 +130,7 @@ test_1(void)
      */
 
     /* create the file */
-    fid = H5Fcreate("tstab1.h5", H5F_ACC_TRUNC, H5C_DEFAULT, H5C_DEFAULT);
+    fid = H5Fcreate("tstab1.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(fid, FAIL, "H5Fcreate");
     f = H5A_object(fid);
     CHECK(f, NULL, "H5Aatom_object");
@@ -233,17 +233,17 @@ test_2(void)
      * Use larger symbol table data structures to be more efficient, use
      * defaults to bang harder on the library for testing.
      */
-    create_plist = H5Ccreate(H5C_FILE_CREATE);
-    H5Cset_sym_k(create_plist, 16, 16);
+    create_plist = H5Pcreate(H5P_FILE_CREATE);
+    H5Pset_sym_k(create_plist, 16, 16);
 
     /*
      * File access property list.
      */
 #if 0
-    access_plist = H5Ccreate (H5C_FILE_ACCESS);
-    H5Cset_core (access_plist, 3000000);
+    access_plist = H5Pcreate (H5P_FILE_ACCESS);
+    H5Pset_core (access_plist, 3000000);
 #else
-    access_plist = H5C_DEFAULT;
+    access_plist = H5P_DEFAULT;
 #endif
 
     /* create the file */