[svn-r14126] Description:

	Move H5Gunlink to deprecated symbol section, replacing internal calls
with H5Ldelete.

Tested on:
	FreeBSD/32 6.2 (duty)
	FreeBSD/64 6.2 (liberty)
	Linux/32 2.6 (kagiso)
	Linux/64 2.6 (smirom)
	Solaris/32 5.10 (linew)
	Mac OS X/32 10.4.10 (amazon)

1 files changed, 466 insertions, 445 deletions

diff --git a/test/unlink.c b/test/unlink.c
index c4f1dab..106da0d 100644
--- a/test/unlink.c
+++ b/test/unlink.c
@@ -17,7 +17,7 @@
  * Programmer:  Robb Matzke <matzke@llnl.gov>
  *              Friday, September 25, 1998
  *
- * Purpose:	Test H5Gunlink().
+ * Purpose:	Test unlinking operations.
  */
 
 #define H5G_PACKAGE		/*suppress error about including H5Gpkg	  */
@@ -103,39 +103,40 @@ const char *FILENAME[] = {
 static int
 test_one(hid_t file)
 {
-    hid_t	work=-1, grp=-1;
+    hid_t	work = -1, grp = -1;
     herr_t	status;
 
     /* Create a test group */
-    if((work = H5Gcreate2(file, "/test_one", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto error;
+    if((work = H5Gcreate2(file, "/test_one", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
 
     /* Delete by absolute name */
     TESTING("unlink by absolute name");
-    if((grp = H5Gcreate2(work, "foo", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-    if(H5Gclose(grp) < 0) TEST_ERROR
-    if(H5Gunlink(file, "/test_one/foo") < 0) TEST_ERROR
+    if((grp = H5Gcreate2(work, "foo", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    if(H5Gclose(grp) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(file, "/test_one/foo", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
     PASSED();
 
     /* Delete by local name */
     TESTING("unlink by local name");
-    if((grp = H5Gcreate2(work, "foo", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-    if(H5Gclose(grp) < 0) TEST_ERROR
-    if(H5Gunlink(work, "foo") < 0) TEST_ERROR
+    if((grp = H5Gcreate2(work, "foo", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    if(H5Gclose(grp) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(work, "foo", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
     PASSED();
 
     /* Delete directly - should fail */
     TESTING("unlink without a name");
-    if((grp = H5Gcreate2(work, "foo", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
+    if((grp = H5Gcreate2(work, "foo", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
     H5E_BEGIN_TRY {
-	status = H5Gunlink(grp, ".");
+	status = H5Ldelete(grp, ".", H5P_DEFAULT);
     } H5E_END_TRY;
     if(status>=0)
 	FAIL_PUTS_ERROR("    Unlinking object w/o a name should have failed.")
-    if(H5Gclose(grp) < 0) TEST_ERROR
-    PASSED();
+    if(H5Gclose(grp) < 0) FAIL_STACK_ERROR
 
     /* Cleanup */
-    if(H5Gclose(work) < 0) goto error;
+    if(H5Gclose(work) < 0) FAIL_STACK_ERROR
+
+    PASSED();
     return 0;
 
  error:
@@ -144,7 +145,7 @@ test_one(hid_t file)
 	H5Gclose(grp);
     } H5E_END_TRY;
     return 1;
-}
+} /* end test_one() */
 
 
 /*-------------------------------------------------------------------------
@@ -184,7 +185,7 @@ test_many(hid_t file)
     } /* end for */
     for(i = 0; i < how_many; i++) {
 	sprintf(name, "obj_%05d", i);
-	if(H5Gunlink(work, name) < 0) FAIL_STACK_ERROR
+	if(H5Ldelete(work, name, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
     } /* end for */
     PASSED();
 
@@ -196,7 +197,7 @@ test_many(hid_t file)
     } /* end for */
     for(i = (how_many - 1); i >= 0; --i) {
 	sprintf(name, "obj_%05d", i);
-	if(H5Gunlink(work, name) < 0) FAIL_STACK_ERROR
+	if(H5Ldelete(work, name, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
     } /* end for */
     PASSED();
 
@@ -211,7 +212,7 @@ test_many(hid_t file)
 	    sprintf(name, "obj_%05d", how_many - (1 + i / 2));
 	else
 	    sprintf(name, "obj_%05d", i / 2);
-	if(H5Gunlink(work, name) < 0) FAIL_STACK_ERROR
+	if(H5Ldelete(work, name, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
     } /* end for */
     PASSED();
 
@@ -226,7 +227,7 @@ test_many(hid_t file)
 	    sprintf(name, "obj_%05d", how_many - (1 + i / 2));
 	else
 	    sprintf(name, "obj_%05d", i / 2);
-	if(H5Gunlink(work, name) < 0) FAIL_STACK_ERROR
+	if(H5Ldelete(work, name, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
     } /* end for */
     PASSED();
 
@@ -266,21 +267,22 @@ test_symlink(hid_t file)
     TESTING("symlink removal");
 
     /* Create a test group and symlink */
-    if((work = H5Gcreate2(file, "/test_symlink", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-    if(H5Lcreate_soft("link_value", work, "link", H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
-    if(H5Gunlink(work, "link") < 0) TEST_ERROR
+    if((work = H5Gcreate2(file, "/test_symlink", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    if(H5Lcreate_soft("link_value", work, "link", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(work, "link", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Cleanup */
-    if (H5Gclose(work) < 0) TEST_ERROR
+    if(H5Gclose(work) < 0) FAIL_STACK_ERROR
+
     PASSED();
     return 0;
 
- error:
+error:
     H5E_BEGIN_TRY {
 	H5Gclose(work);
     } H5E_END_TRY;
     return 1;
-}
+} /* end test_symlink() */
 
 
 /*-------------------------------------------------------------------------
@@ -598,126 +600,132 @@ test_filespace(hid_t fapl)
     /* Create buffer for writing dataset */
     if((data = HDmalloc(sizeof(int)*FILESPACE_DIM0*FILESPACE_DIM1*FILESPACE_DIM2))==NULL) TEST_ERROR
 
+
 /* Create single dataset (with contiguous storage & late allocation), remove it & verify file size */
     TESTING("    contiguous dataset with late allocation");
 
     /* Create file */
-    if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
+    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR
 
     /* Create a single dataset to remove */
-    if((dataset = H5Dcreate (file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT)) < 0) TEST_ERROR
-    if(H5Dclose (dataset) < 0) TEST_ERROR
+    if((dataset = H5Dcreate(file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    if(H5Dclose(dataset) < 0) FAIL_STACK_ERROR
 
     /* Remove the dataset */
-    if(H5Gunlink (file, DATASETNAME) < 0) TEST_ERROR
+    if(H5Ldelete(file, DATASETNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Close file */
-    if(H5Fclose(file) < 0) TEST_ERROR
+    if(H5Fclose(file) < 0) FAIL_STACK_ERROR
 
     /* Get the size of the file */
-    if((file_size=h5_get_file_size(filename))<0) TEST_ERROR
+    if((file_size = h5_get_file_size(filename)) < 0) TEST_ERROR
 
     /* Verify the file is correct size */
-    if(file_size!=empty_size) TEST_ERROR
+    if(file_size != empty_size) TEST_ERROR
 
     PASSED();
 
+
 /* Create single dataset (with contiguous storage & early allocation), remove it & verify file size */
     TESTING("    contiguous dataset with early allocation");
 
     /* Create file */
-    if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
+    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR
 
     /* Create a single dataset to remove */
-    if((dataset = H5Dcreate (file, DATASETNAME, H5T_NATIVE_INT, space, contig_dcpl)) < 0) TEST_ERROR
-    if(H5Dclose (dataset) < 0) TEST_ERROR
+    if((dataset = H5Dcreate(file, DATASETNAME, H5T_NATIVE_INT, space, contig_dcpl)) < 0) FAIL_STACK_ERROR
+    if(H5Dclose(dataset) < 0) FAIL_STACK_ERROR
 
     /* Remove the dataset */
-    if(H5Gunlink (file, DATASETNAME) < 0) TEST_ERROR
+    if(H5Ldelete(file, DATASETNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Close file */
-    if(H5Fclose(file) < 0) TEST_ERROR
+    if(H5Fclose(file) < 0) FAIL_STACK_ERROR
 
     /* Get the size of the file */
-    if((file_size=h5_get_file_size(filename))<0) TEST_ERROR
+    if((file_size = h5_get_file_size(filename))<0) TEST_ERROR
 
     /* Verify the file is correct size */
-    if(file_size!=empty_size) TEST_ERROR
+    if(file_size != empty_size) TEST_ERROR
 
     PASSED();
 
+
 /* Create single dataset (with chunked storage & late allocation), remove it & verify file size */
     TESTING("    chunked dataset with late allocation");
 
     /* Create file */
-    if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
+    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR
 
     /* Create a single dataset to remove */
-    if((dataset = H5Dcreate (file, DATASETNAME, H5T_NATIVE_INT, space, late_chunk_dcpl)) < 0) TEST_ERROR
-    if(H5Dclose (dataset) < 0) TEST_ERROR
+    if((dataset = H5Dcreate(file, DATASETNAME, H5T_NATIVE_INT, space, late_chunk_dcpl)) < 0) FAIL_STACK_ERROR
+    if(H5Dclose(dataset) < 0) FAIL_STACK_ERROR
 
     /* Remove the dataset */
-    if(H5Gunlink (file, DATASETNAME) < 0) TEST_ERROR
+    if(H5Ldelete(file, DATASETNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Close file */
-    if(H5Fclose(file) < 0) TEST_ERROR
+    if(H5Fclose(file) < 0) FAIL_STACK_ERROR
 
     /* Get the size of the file */
-    if((file_size=h5_get_file_size(filename))<0) TEST_ERROR
+    if((file_size = h5_get_file_size(filename))<0) TEST_ERROR
 
     /* Verify the file is correct size */
-    if(file_size!=empty_size) TEST_ERROR
+    if(file_size != empty_size) TEST_ERROR
 
     PASSED();
 
+
 /* Create single dataset (with chunked storage & early allocation), remove it & verify file size */
     TESTING("    chunked dataset with early allocation");
 
     /* Create file */
-    if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
+    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR
 
     /* Create a single dataset to remove */
-    if((dataset = H5Dcreate (file, DATASETNAME, H5T_NATIVE_INT, space, early_chunk_dcpl)) < 0) TEST_ERROR
-    if(H5Dclose (dataset) < 0) TEST_ERROR
+    if((dataset = H5Dcreate(file, DATASETNAME, H5T_NATIVE_INT, space, early_chunk_dcpl)) < 0) FAIL_STACK_ERROR
+    if(H5Dclose(dataset) < 0) FAIL_STACK_ERROR
 
     /* Remove the dataset */
-    if(H5Gunlink (file, DATASETNAME) < 0) TEST_ERROR
+    if(H5Ldelete(file, DATASETNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Close file */
-    if(H5Fclose(file) < 0) TEST_ERROR
+    if(H5Fclose(file) < 0) FAIL_STACK_ERROR
 
     /* Get the size of the file */
-    if((file_size=h5_get_file_size(filename))<0) TEST_ERROR
+    if((file_size = h5_get_file_size(filename)) < 0) TEST_ERROR
 
     /* Verify the file is correct size */
-    if(file_size!=empty_size) TEST_ERROR
+    if(file_size != empty_size) TEST_ERROR
 
     PASSED();
 
+
 /* Create single dataset (with compressed storage & early allocation), remove it & verify file size */
     TESTING("    compressed, chunked dataset");
 
     /* Create file */
-    if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
+    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR
 
     /* Create a single dataset to remove */
-    if((dataset = H5Dcreate (file, DATASETNAME, H5T_NATIVE_INT, space, comp_dcpl)) < 0) TEST_ERROR
-    if(H5Dclose (dataset) < 0) TEST_ERROR
+    if((dataset = H5Dcreate(file, DATASETNAME, H5T_NATIVE_INT, space, comp_dcpl)) < 0) FAIL_STACK_ERROR
+    if(H5Dclose(dataset) < 0) FAIL_STACK_ERROR
 
     /* Remove the dataset */
-    if(H5Gunlink (file, DATASETNAME) < 0) TEST_ERROR
+    if(H5Ldelete(file, DATASETNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Close file */
-    if(H5Fclose(file) < 0) TEST_ERROR
+    if(H5Fclose(file) < 0) FAIL_STACK_ERROR
 
     /* Get the size of the file */
-    if((file_size=h5_get_file_size(filename))<0) TEST_ERROR
+    if((file_size = h5_get_file_size(filename)) < 0) TEST_ERROR
 
     /* Verify the file is correct size */
-    if(file_size!=empty_size) TEST_ERROR
+    if(file_size != empty_size) TEST_ERROR
 
     PASSED();
 
+
 /* Create single dataset (with compressed storage & early allocation), re-write it a bunch of
  * times (which should re-allocate blocks many times) and remove it & verify
  * file size.
@@ -725,69 +733,71 @@ test_filespace(hid_t fapl)
     TESTING("    re-writing compressed, chunked dataset");
 
     /* Create file (using FAPL with disabled raw data cache) */
-    if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_nocache)) < 0) TEST_ERROR
+    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_nocache)) < 0) FAIL_STACK_ERROR
 
     /* Create a single dataset to remove */
-    if((dataset = H5Dcreate (file, DATASETNAME, H5T_NATIVE_INT, space, comp_dcpl)) < 0) TEST_ERROR
+    if((dataset = H5Dcreate(file, DATASETNAME, H5T_NATIVE_INT, space, comp_dcpl)) < 0) FAIL_STACK_ERROR
 
     /* Alternate re-writing dataset with compressible & random data */
-    for(u=0; u<FILESPACE_REWRITE; u++) {
+    for(u = 0; u < FILESPACE_REWRITE; u++) {
         /* Set buffer to some compressible values */
-        for (v=0, tmp_data=data; v<(FILESPACE_DIM0*FILESPACE_DIM1*FILESPACE_DIM2); v++)
-            *tmp_data++ = v*u;
+        for(v = 0, tmp_data = data; v < (FILESPACE_DIM0 * FILESPACE_DIM1 * FILESPACE_DIM2); v++)
+            *tmp_data++ = v * u;
 
         /* Write the buffer to the dataset */
-        if (H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) TEST_ERROR
+        if(H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) FAIL_STACK_ERROR
 
         /* Set buffer to different random numbers each time */
-        for (v=0, tmp_data=data; v<(FILESPACE_DIM0*FILESPACE_DIM1*FILESPACE_DIM2); v++)
+        for(v = 0, tmp_data = data; v < (FILESPACE_DIM0 * FILESPACE_DIM1 * FILESPACE_DIM2); v++)
             *tmp_data++ = (int)HDrandom();
 
         /* Write the buffer to the dataset */
-        if (H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) TEST_ERROR
+        if(H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) FAIL_STACK_ERROR
     } /* end for */
 
     /* Close dataset */
-    if(H5Dclose (dataset) < 0) TEST_ERROR
+    if(H5Dclose(dataset) < 0) FAIL_STACK_ERROR
 
     /* Remove the dataset */
-    if(H5Gunlink (file, DATASETNAME) < 0) TEST_ERROR
+    if(H5Ldelete(file, DATASETNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Close file */
-    if(H5Fclose(file) < 0) TEST_ERROR
+    if(H5Fclose(file) < 0) FAIL_STACK_ERROR
 
     /* Get the size of the file */
-    if((file_size=h5_get_file_size(filename))<0) TEST_ERROR
+    if((file_size = h5_get_file_size(filename)) < 0) TEST_ERROR
 
     /* Verify the file is correct size */
-    if(file_size!=empty_size) TEST_ERROR
+    if(file_size != empty_size) TEST_ERROR
 
     PASSED();
 
+
 /* Create single dataset (with compact storage), remove it & verify file size */
     TESTING("    compact dataset");
 
     /* Create file */
-    if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
+    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR
 
     /* Create a single dataset to remove */
-    if((dataset = H5Dcreate (file, DATASETNAME, H5T_NATIVE_INT, space, compact_dcpl)) < 0) TEST_ERROR
-    if(H5Dclose (dataset) < 0) TEST_ERROR
+    if((dataset = H5Dcreate(file, DATASETNAME, H5T_NATIVE_INT, space, compact_dcpl)) < 0) FAIL_STACK_ERROR
+    if(H5Dclose(dataset) < 0) FAIL_STACK_ERROR
 
     /* Remove the dataset */
-    if(H5Gunlink (file, DATASETNAME) < 0) TEST_ERROR
+    if(H5Ldelete(file, DATASETNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Close file */
-    if(H5Fclose(file) < 0) TEST_ERROR
+    if(H5Fclose(file) < 0) FAIL_STACK_ERROR
 
     /* Get the size of the file */
-    if((file_size=h5_get_file_size(filename))<0) TEST_ERROR
+    if((file_size = h5_get_file_size(filename)) < 0) TEST_ERROR
 
     /* Verify the file is correct size */
-    if(file_size!=empty_size) TEST_ERROR
+    if(file_size != empty_size) TEST_ERROR
 
     PASSED();
 
+
 /* Create two datasets (with contiguous storage), alternate adding attributes
  * to each one (which creates many object header continuations),
  * remove both & verify file size.
@@ -795,14 +805,14 @@ test_filespace(hid_t fapl)
     TESTING("    object header continuations");
 
     /* Create file */
-    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
+    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR
 
     /* Create datasets to remove */
-    if((dataset = H5Dcreate(file, DATASETNAME, H5T_NATIVE_INT, space, contig_dcpl)) < 0) TEST_ERROR
-    if((dataset2 = H5Dcreate(file, DATASET2NAME, H5T_NATIVE_INT, space, contig_dcpl)) < 0) TEST_ERROR
+    if((dataset = H5Dcreate(file, DATASETNAME, H5T_NATIVE_INT, space, contig_dcpl)) < 0) FAIL_STACK_ERROR
+    if((dataset2 = H5Dcreate(file, DATASET2NAME, H5T_NATIVE_INT, space, contig_dcpl)) < 0) FAIL_STACK_ERROR
 
     /* Create a dataspace for the attributes */
-    if((attr_space = H5Screate_simple(FILESPACE_ATTR_NDIMS, attr_dims, NULL)) < 0) TEST_ERROR
+    if((attr_space = H5Screate_simple(FILESPACE_ATTR_NDIMS, attr_dims, NULL)) < 0) FAIL_STACK_ERROR
 
     /* Alternate adding attributes to each one */
     for(u = 0; u < FILESPACE_NATTR; u++) {
@@ -810,120 +820,123 @@ test_filespace(hid_t fapl)
         sprintf(objname,"%s %u",ATTRNAME,u);
 
         /* Create an attribute on the first dataset */
-        if((attr = H5Acreate(dataset, objname, H5T_NATIVE_INT, attr_space, H5P_DEFAULT)) < 0) TEST_ERROR
+        if((attr = H5Acreate(dataset, objname, H5T_NATIVE_INT, attr_space, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
 
         /* Don't worry about writing the attribute - it will have a fill value */
 
         /* Close the attribute on the first dataset */
-        if(H5Aclose(attr) < 0) TEST_ERROR
+        if(H5Aclose(attr) < 0) FAIL_STACK_ERROR
 
         /* Create an attribute on the second dataset */
-        if((attr = H5Acreate(dataset2, objname, H5T_NATIVE_INT, attr_space, H5P_DEFAULT)) < 0) TEST_ERROR
+        if((attr = H5Acreate(dataset2, objname, H5T_NATIVE_INT, attr_space, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
 
         /* Don't worry about writing the attribute - it will have a fill value */
 
         /* Close the attribute on the second dataset */
-        if(H5Aclose(attr) < 0) TEST_ERROR
+        if(H5Aclose(attr) < 0) FAIL_STACK_ERROR
 
         /* Flush the file (to fix the sizes of object header buffers, etc) */
-        if(H5Fflush(file,H5F_SCOPE_GLOBAL) < 0) TEST_ERROR
+        if(H5Fflush(file,H5F_SCOPE_GLOBAL) < 0) FAIL_STACK_ERROR
     } /* end for */
 
     /* Close the dataspace for the attributes */
-    if(H5Sclose(attr_space) < 0) TEST_ERROR
+    if(H5Sclose(attr_space) < 0) FAIL_STACK_ERROR
 
     /* Close datasets */
-    if(H5Dclose(dataset) < 0) TEST_ERROR
-    if(H5Dclose(dataset2) < 0) TEST_ERROR
+    if(H5Dclose(dataset) < 0) FAIL_STACK_ERROR
+    if(H5Dclose(dataset2) < 0) FAIL_STACK_ERROR
 
     /* Remove the datasets */
-    if(H5Gunlink(file, DATASETNAME) < 0) TEST_ERROR
-    if(H5Gunlink(file, DATASET2NAME) < 0) TEST_ERROR
+    if(H5Ldelete(file, DATASETNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(file, DATASET2NAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Close file */
-    if(H5Fclose(file) < 0) TEST_ERROR
+    if(H5Fclose(file) < 0) FAIL_STACK_ERROR
 
     /* Get the size of the file */
-    if((file_size = h5_get_file_size(filename))<0) TEST_ERROR
+    if((file_size = h5_get_file_size(filename)) < 0) TEST_ERROR
 
     /* Verify the file is correct size */
-    if(file_size!=empty_size) TEST_ERROR
+    if(file_size != empty_size) TEST_ERROR
 
     PASSED();
 
+
 /* Create single named datatype, remove it & verify file size */
     TESTING("    named datatype");
 
     /* Create file */
-    if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
+    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR
 
     /* Create datatype to commit */
-    if((type = H5Tcopy (H5T_NATIVE_INT)) < 0) TEST_ERROR
+    if((type = H5Tcopy(H5T_NATIVE_INT)) < 0) FAIL_STACK_ERROR
 
     /* Create a single named datatype to remove */
-    if(H5Tcommit (file, TYPENAME, type) < 0) TEST_ERROR
-    if(H5Tclose (type) < 0) TEST_ERROR
+    if(H5Tcommit(file, TYPENAME, type) < 0) FAIL_STACK_ERROR
+    if(H5Tclose(type) < 0) FAIL_STACK_ERROR
 
     /* Remove the named datatype */
-    if(H5Gunlink (file, TYPENAME) < 0) TEST_ERROR
+    if(H5Ldelete(file, TYPENAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Close file */
-    if(H5Fclose(file) < 0) TEST_ERROR
+    if(H5Fclose(file) < 0) FAIL_STACK_ERROR
 
     /* Get the size of the file */
-    if((file_size=h5_get_file_size(filename))<0) TEST_ERROR
+    if((file_size = h5_get_file_size(filename)) < 0) TEST_ERROR
 
     /* Verify the file is correct size */
-    if(file_size!=empty_size) TEST_ERROR
+    if(file_size != empty_size) TEST_ERROR
 
     PASSED();
 
+
 /* Create single group, remove it & verify file size */
     TESTING("    single group");
 
     /* Create file */
-    if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
+    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR
 
     /* Create a single group to remove */
-    if((group = H5Gcreate2(file, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-    if(H5Gclose (group) < 0) TEST_ERROR
+    if((group = H5Gcreate2(file, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    if(H5Gclose(group) < 0) FAIL_STACK_ERROR
 
     /* Remove the group */
-    if(H5Gunlink (file, GROUPNAME) < 0) TEST_ERROR
+    if(H5Ldelete(file, GROUPNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Close file */
-    if(H5Fclose(file) < 0) TEST_ERROR
+    if(H5Fclose(file) < 0) FAIL_STACK_ERROR
 
     /* Get the size of the file */
-    if((file_size=h5_get_file_size(filename))<0) TEST_ERROR
+    if((file_size = h5_get_file_size(filename)) < 0) TEST_ERROR
 
     /* Verify the file is correct size */
-    if(file_size!=empty_size) TEST_ERROR
+    if(file_size != empty_size) TEST_ERROR
 
     PASSED();
 
+
 /* Create many groups, remove them & verify file size */
     TESTING("    multiple groups");
 
     /* Create file */
-    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
+    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR
 
     /* Create a many groups to remove */
     for(u = 0; u < UNLINK_NGROUPS; u++) {
         sprintf(objname, "%s %u", GROUPNAME, u);
-        if((group = H5Gcreate2(file, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-        if(H5Gclose (group) < 0) TEST_ERROR
+        if((group = H5Gcreate2(file, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+        if(H5Gclose(group) < 0) FAIL_STACK_ERROR
     } /* end for */
 
     /* Remove the all the groups */
     /* (Remove them in reverse order just to make file size calculation easier -QAK) */
     for(u = UNLINK_NGROUPS; u > 0; u--) {
         sprintf(objname, "%s %u", GROUPNAME, (u - 1));
-        if(H5Gunlink(file, objname) < 0) TEST_ERROR
+        if(H5Ldelete(file, objname, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
     } /* end for */
 
     /* Close file */
-    if(H5Fclose(file) < 0) TEST_ERROR
+    if(H5Fclose(file) < 0) FAIL_STACK_ERROR
 
     /* Get the size of the file */
     if((file_size = h5_get_file_size(filename)) < 0) TEST_ERROR
@@ -933,35 +946,37 @@ test_filespace(hid_t fapl)
 
     PASSED();
 
+
 /* Create simple group hiearchy, remove it & verify file size */
     TESTING("    simple group hierarchy");
 
     /* Create file */
-    if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
+    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR
 
     /* Create a small group hierarchy to remove */
-    if((group = H5Gcreate2(file, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-    if((group2 = H5Gcreate2(group, GROUP2NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-    if(H5Gclose (group2) < 0) TEST_ERROR
-    if(H5Gclose (group) < 0) TEST_ERROR
+    if((group = H5Gcreate2(file, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    if((group2 = H5Gcreate2(group, GROUP2NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    if(H5Gclose(group2) < 0) FAIL_STACK_ERROR
+    if(H5Gclose(group) < 0) FAIL_STACK_ERROR
 
     /* Remove the second group */
-    if(H5Gunlink (file, GROUPNAME "/" GROUP2NAME) < 0) TEST_ERROR
+    if(H5Ldelete(file, GROUPNAME "/" GROUP2NAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Remove the first group */
-    if(H5Gunlink (file, GROUPNAME) < 0) TEST_ERROR
+    if(H5Ldelete(file, GROUPNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Close file */
-    if(H5Fclose(file) < 0) TEST_ERROR
+    if(H5Fclose(file) < 0) FAIL_STACK_ERROR
 
     /* Get the size of the file */
-    if((file_size=h5_get_file_size(filename))<0) TEST_ERROR
+    if((file_size = h5_get_file_size(filename)) < 0) TEST_ERROR
 
     /* Verify the file is correct size */
-    if(file_size!=empty_size) TEST_ERROR
+    if(file_size != empty_size) TEST_ERROR
 
     PASSED();
 
+
 /* Create complex group hiearchy, remove it & verify file size */
     TESTING("    complex group hierarchy");
 
@@ -973,252 +988,257 @@ test_filespace(hid_t fapl)
         SKIPPED();
     } else {
 
-    /* Create file */
-    if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
-
-    /* Create a complex group hierarchy to remove */
-    for(u=0; u<FILESPACE_TOP_GROUPS; u++) {
-        /* Create group */
-        sprintf(objname,"%s %u",GROUPNAME,u);
-        if((group = H5Gcreate2(file, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
+        /* Create file */
+        if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR
 
-        /* Create nested groups inside top groups */
-        for(v=0; v<FILESPACE_NESTED_GROUPS; v++) {
+        /* Create a complex group hierarchy to remove */
+        for(u = 0; u < FILESPACE_TOP_GROUPS; u++) {
             /* Create group */
-            sprintf(objname,"%s %u",GROUP2NAME,v);
-            if((group2 = H5Gcreate2(group, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-
-            /* Create datasets inside nested groups */
-            for(w=0; w<FILESPACE_NDATASETS; w++) {
-                /* Create & close a dataset */
-                sprintf(objname,"%s %u",DATASETNAME,w);
-                if((dataset = H5Dcreate (group2, objname, H5T_NATIVE_INT, space, H5P_DEFAULT)) < 0) TEST_ERROR
-                if(H5Dclose (dataset) < 0) TEST_ERROR
+            sprintf(objname,"%s %u",GROUPNAME,u);
+            if((group = H5Gcreate2(file, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+
+            /* Create nested groups inside top groups */
+            for(v = 0; v < FILESPACE_NESTED_GROUPS; v++) {
+                /* Create group */
+                sprintf(objname, "%s %u", GROUP2NAME, v);
+                if((group2 = H5Gcreate2(group, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+
+                /* Create datasets inside nested groups */
+                for(w = 0; w < FILESPACE_NDATASETS; w++) {
+                    /* Create & close a dataset */
+                    sprintf(objname, "%s %u", DATASETNAME, w);
+                    if((dataset = H5Dcreate(group2, objname, H5T_NATIVE_INT, space, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+                    if(H5Dclose(dataset) < 0) FAIL_STACK_ERROR
+                } /* end for */
+
+                /* Close nested group */
+                if(H5Gclose(group2) < 0) FAIL_STACK_ERROR
             } /* end for */
 
-            /* Close nested group */
-            if(H5Gclose (group2) < 0) TEST_ERROR
+            /* Close top group */
+            if(H5Gclose(group) < 0) FAIL_STACK_ERROR
         } /* end for */
 
-        /* Close top group */
-        if(H5Gclose (group) < 0) TEST_ERROR
-    } /* end for */
-
-    /* Remove complex group hierarchy */
-    /* (Remove them in reverse order just to make file size calculation easier -QAK) */
-    for(u=FILESPACE_TOP_GROUPS; u>0; u--) {
-        /* Open group */
-        sprintf(objname,"%s %u",GROUPNAME,(u-1));
-        if((group = H5Gopen2(file, objname, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
-
-        /* Open nested groups inside top groups */
-        for(v=0; v<FILESPACE_NESTED_GROUPS; v++) {
-            /* Create group */
-            sprintf(objname,"%s %u",GROUP2NAME,v);
-            if((group2 = H5Gopen2(group, objname, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
-
-            /* Remove datasets inside nested groups */
-            for(w=0; w<FILESPACE_NDATASETS; w++) {
-                /* Remove dataset */
-                sprintf(objname,"%s %u",DATASETNAME,w);
-                if(H5Gunlink (group2, objname) < 0) TEST_ERROR
+        /* Remove complex group hierarchy */
+        /* (Remove them in reverse order just to make file size calculation easier -QAK) */
+        for(u = FILESPACE_TOP_GROUPS; u > 0; u--) {
+            /* Open group */
+            sprintf(objname, "%s %u", GROUPNAME, (u - 1));
+            if((group = H5Gopen2(file, objname, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+
+            /* Open nested groups inside top groups */
+            for(v = 0; v < FILESPACE_NESTED_GROUPS; v++) {
+                /* Create group */
+                sprintf(objname, "%s %u", GROUP2NAME, v);
+                if((group2 = H5Gopen2(group, objname, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+
+                /* Remove datasets inside nested groups */
+                for(w = 0; w < FILESPACE_NDATASETS; w++) {
+                    /* Remove dataset */
+                    sprintf(objname, "%s %u", DATASETNAME, w);
+                    if(H5Ldelete(group2, objname, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+                } /* end for */
+
+                /* Close nested group */
+                if(H5Gclose(group2) < 0) FAIL_STACK_ERROR
+
+                /* Remove nested group */
+                sprintf(objname, "%s %u",GROUP2NAME, v);
+                if(H5Ldelete(group, objname, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
             } /* end for */
 
-            /* Close nested group */
-            if(H5Gclose (group2) < 0) TEST_ERROR
+            /* Close top group */
+            if(H5Gclose(group) < 0) FAIL_STACK_ERROR
 
-            /* Remove nested group */
-            sprintf(objname,"%s %u",GROUP2NAME,v);
-            if(H5Gunlink (group, objname) < 0) TEST_ERROR
+            /* Remove top group */
+            sprintf(objname, "%s %u", GROUPNAME, (u - 1));
+            if(H5Ldelete(file, objname, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
         } /* end for */
 
-        /* Close top group */
-        if(H5Gclose (group) < 0) TEST_ERROR
-
-        /* Remove top group */
-        sprintf(objname,"%s %u",GROUPNAME,(u-1));
-        if(H5Gunlink (file, objname) < 0) TEST_ERROR
-    } /* end for */
-
-    /* Close file */
-    if(H5Fclose(file) < 0) TEST_ERROR
+        /* Close file */
+        if(H5Fclose(file) < 0) FAIL_STACK_ERROR
 
-    /* Get the size of the file */
-    if((file_size=h5_get_file_size(filename))<0) TEST_ERROR
+        /* Get the size of the file */
+        if((file_size = h5_get_file_size(filename)) < 0) TEST_ERROR
 
-    /* Verify the file is correct size */
-    if(file_size!=empty_size) TEST_ERROR
+        /* Verify the file is correct size */
+        if(file_size != empty_size) TEST_ERROR
 
-    PASSED();
+        PASSED();
     }
 
+
 /* Create dataset and duplicate dataset, remove original & verify file size */
     TESTING("    duplicate dataset");
 
     /* Create file */
-    if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
+    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR
 
     /* Create a single dataset to remove */
-    if((dataset = H5Dcreate (file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT)) < 0) TEST_ERROR
-    if(H5Dclose (dataset) < 0) TEST_ERROR
+    if((dataset = H5Dcreate (file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    if(H5Dclose(dataset) < 0) FAIL_STACK_ERROR
 
     /* Create another dataset with same name */
     H5E_BEGIN_TRY {
-        dataset=H5Dcreate (file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT);
+        dataset = H5Dcreate (file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT);
     } H5E_END_TRY;
-    if (dataset>=0) {
+    if(dataset >= 0) {
         H5Dclose(dataset);
         TEST_ERROR
     } /* end if */
 
     /* Remove the dataset */
-    if(H5Gunlink (file, DATASETNAME) < 0) TEST_ERROR
+    if(H5Ldelete(file, DATASETNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Close file */
-    if(H5Fclose(file) < 0) TEST_ERROR
+    if(H5Fclose(file) < 0) FAIL_STACK_ERROR
 
     /* Get the size of the file */
-    if((file_size=h5_get_file_size(filename))<0) TEST_ERROR
+    if((file_size = h5_get_file_size(filename))<0) TEST_ERROR
 
     /* Verify the file is correct size */
-    if(file_size!=empty_size) TEST_ERROR
+    if(file_size != empty_size) TEST_ERROR
 
     PASSED();
 
+
 /* Create group and duplicate group, remove original & verify file size */
     TESTING("    duplicate group");
 
     /* Create file */
-    if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
+    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR
 
     /* Create a single group to remove */
-    if((group = H5Gcreate2(file, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-    if(H5Gclose (group) < 0) TEST_ERROR
+    if((group = H5Gcreate2(file, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    if(H5Gclose(group) < 0) FAIL_STACK_ERROR
 
     /* Create another group with same name */
     H5E_BEGIN_TRY {
         group = H5Gcreate2(file, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     } H5E_END_TRY;
-    if (group>=0) {
+    if(group >= 0) {
         H5Gclose(group);
         TEST_ERROR
     } /* end if */
 
     /* Remove the group */
-    if(H5Gunlink (file, GROUPNAME) < 0) TEST_ERROR
+    if(H5Ldelete(file, GROUPNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Close file */
-    if(H5Fclose(file) < 0) TEST_ERROR
+    if(H5Fclose(file) < 0) FAIL_STACK_ERROR
 
     /* Get the size of the file */
-    if((file_size=h5_get_file_size(filename))<0) TEST_ERROR
+    if((file_size = h5_get_file_size(filename)) < 0) TEST_ERROR
 
     /* Verify the file is correct size */
-    if(file_size!=empty_size) TEST_ERROR
+    if(file_size != empty_size) TEST_ERROR
 
     PASSED();
 
+
 /* Create named datatype and duplicate named datatype, remove original & verify file size */
     TESTING("    duplicate named datatype");
 
     /* Create file */
-    if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
+    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR
 
     /* Create datatype to commit */
-    if((type = H5Tcopy (H5T_NATIVE_INT)) < 0) TEST_ERROR
+    if((type = H5Tcopy(H5T_NATIVE_INT)) < 0) FAIL_STACK_ERROR
 
     /* Create a single named datatype to remove */
-    if(H5Tcommit (file, TYPENAME, type) < 0) TEST_ERROR
-    if(H5Tclose (type) < 0) TEST_ERROR
+    if(H5Tcommit(file, TYPENAME, type) < 0) FAIL_STACK_ERROR
+    if(H5Tclose(type) < 0) FAIL_STACK_ERROR
 
     /* Create datatype to commit */
-    if((type = H5Tcopy (H5T_NATIVE_INT)) < 0) TEST_ERROR
+    if((type = H5Tcopy(H5T_NATIVE_INT)) < 0) FAIL_STACK_ERROR
 
     /* Create another named datatype with same name */
     H5E_BEGIN_TRY {
-        status = H5Tcommit (file, TYPENAME, type);
+        status = H5Tcommit(file, TYPENAME, type);
     } H5E_END_TRY;
-    if (status>=0) TEST_ERROR
-    if(H5Tclose (type) < 0) TEST_ERROR
+    if(status >= 0) TEST_ERROR
+    if(H5Tclose(type) < 0) FAIL_STACK_ERROR
 
     /* Remove the named datatype */
-    if(H5Gunlink (file, TYPENAME) < 0) TEST_ERROR
+    if(H5Ldelete(file, TYPENAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Close file */
-    if(H5Fclose(file) < 0) TEST_ERROR
+    if(H5Fclose(file) < 0) FAIL_STACK_ERROR
 
     /* Get the size of the file */
-    if((file_size=h5_get_file_size(filename))<0) TEST_ERROR
+    if((file_size = h5_get_file_size(filename)) < 0) TEST_ERROR
 
     /* Verify the file is correct size */
-    if(file_size!=empty_size) TEST_ERROR
+    if(file_size != empty_size) TEST_ERROR
 
     PASSED();
 
+
 /* Create named datatype and duplicate named datatype, remove original & verify file size */
     TESTING("    duplicate attribute");
 
     /* Create file */
-    if ((file=H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
+    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR
 
     /* Create datasets to remove */
-    if((dataset = H5Dcreate (file, DATASETNAME, H5T_NATIVE_INT, space, contig_dcpl)) < 0) TEST_ERROR
+    if((dataset = H5Dcreate(file, DATASETNAME, H5T_NATIVE_INT, space, contig_dcpl)) < 0) FAIL_STACK_ERROR
 
     /* Create a dataspace for the attributes */
-    if((attr_space = H5Screate_simple(FILESPACE_ATTR_NDIMS, attr_dims, NULL)) < 0) TEST_ERROR
+    if((attr_space = H5Screate_simple(FILESPACE_ATTR_NDIMS, attr_dims, NULL)) < 0) FAIL_STACK_ERROR
 
     /* Create an attribute on the dataset */
-    if((attr = H5Acreate (dataset, ATTRNAME, H5T_NATIVE_INT, attr_space, H5P_DEFAULT)) < 0) TEST_ERROR
+    if((attr = H5Acreate(dataset, ATTRNAME, H5T_NATIVE_INT, attr_space, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
 
     /* Don't worry about writing the attribute - it will have a fill value */
 
     /* Close the attribute on the dataset */
-    if(H5Aclose (attr) < 0) TEST_ERROR
+    if(H5Aclose(attr) < 0) FAIL_STACK_ERROR
 
     /* Create another attribute with same name */
     H5E_BEGIN_TRY {
-        attr = H5Acreate (dataset, ATTRNAME, H5T_NATIVE_INT, attr_space, H5P_DEFAULT);
+        attr = H5Acreate(dataset, ATTRNAME, H5T_NATIVE_INT, attr_space, H5P_DEFAULT);
     } H5E_END_TRY;
-    if (attr>=0) {
+    if(attr >= 0) {
         H5Aclose(attr);
         TEST_ERROR
     } /* end if */
 
     /* Close the dataspace for the attributes */
-    if(H5Sclose (attr_space) < 0) TEST_ERROR
+    if(H5Sclose(attr_space) < 0) FAIL_STACK_ERROR
 
     /* Close dataset */
-    if(H5Dclose (dataset) < 0) TEST_ERROR
+    if(H5Dclose(dataset) < 0) FAIL_STACK_ERROR
 
     /* Remove the dataset */
-    if(H5Gunlink (file, DATASETNAME) < 0) TEST_ERROR
+    if(H5Ldelete(file, DATASETNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Close file */
-    if(H5Fclose(file) < 0) TEST_ERROR
+    if(H5Fclose(file) < 0) FAIL_STACK_ERROR
 
     /* Get the size of the file */
-    if((file_size=h5_get_file_size(filename))<0) TEST_ERROR
+    if((file_size = h5_get_file_size(filename)) < 0) TEST_ERROR
 
     /* Verify the file is correct size */
-    if(file_size!=empty_size) TEST_ERROR
+    if(file_size != empty_size) TEST_ERROR
 
     PASSED();
 
+
 /* Cleanup common objects */
 
     /* Release dataset buffer */
     HDfree(data);
 
     /* Close property lists */
-    if(H5Pclose(fapl_nocache) < 0) TEST_ERROR
-    if(H5Pclose(contig_dcpl) < 0) TEST_ERROR
-    if(H5Pclose(early_chunk_dcpl) < 0) TEST_ERROR
-    if(H5Pclose(late_chunk_dcpl) < 0) TEST_ERROR
-    if(H5Pclose(comp_dcpl) < 0) TEST_ERROR
-    if(H5Pclose(compact_dcpl) < 0) TEST_ERROR
+    if(H5Pclose(fapl_nocache) < 0) FAIL_STACK_ERROR
+    if(H5Pclose(contig_dcpl) < 0) FAIL_STACK_ERROR
+    if(H5Pclose(early_chunk_dcpl) < 0) FAIL_STACK_ERROR
+    if(H5Pclose(late_chunk_dcpl) < 0) FAIL_STACK_ERROR
+    if(H5Pclose(comp_dcpl) < 0) FAIL_STACK_ERROR
+    if(H5Pclose(compact_dcpl) < 0) FAIL_STACK_ERROR
 
     /* Close dataspace */
-    if(H5Sclose(space) < 0) TEST_ERROR
+    if(H5Sclose(space) < 0) FAIL_STACK_ERROR
 
     /* Indicate success */
     /* Don't print final "PASSED", since we aren't on the correct line anymore */
@@ -1264,8 +1284,8 @@ test_create_unlink(const char *msg, hid_t fapl)
         FAIL_PUTS_ERROR("    Creating file failed")
 
     /* Create a many groups to remove */
-    for(u=0; u<UNLINK_NGROUPS; u++) {
-        sprintf(groupname,"%s %u",GROUPNAME,u);
+    for(u = 0; u < UNLINK_NGROUPS; u++) {
+        sprintf(groupname, "%s %u", GROUPNAME, u);
         if((group = H5Gcreate2(file, groupname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
             H5_FAILED();
             printf("group %s creation failed\n", groupname);
@@ -1279,9 +1299,9 @@ test_create_unlink(const char *msg, hid_t fapl)
     } /* end for */
 
     /* Remove the all the groups */
-    for(u=0; u<UNLINK_NGROUPS; u++) {
-        sprintf(groupname,"%s %u",GROUPNAME,u);
-        if(H5Gunlink(file, groupname) < 0) {
+    for(u = 0; u < UNLINK_NGROUPS; u++) {
+        sprintf(groupname, "%s %u", GROUPNAME, u);
+        if(H5Ldelete(file, groupname, H5P_DEFAULT) < 0) {
             H5_FAILED();
             printf("Unlinking group %s failed\n", groupname);
             goto error;
@@ -1396,34 +1416,34 @@ test_unlink_slashes(hid_t fapl)
     h5_fixname(FILENAME[5], fapl, filename, sizeof filename);
 
     /* Open the file */
-    if((fid=H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) TEST_ERROR
+    if((fid = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
 
     /* Open the top level group */
     if((gid = H5Gopen2(fid, SLASHES_GROUP_NAME, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
 
     /* Delete the root link */
-    if(H5Gunlink(gid,SLASHES_ROOTLINK_NAME) < 0) TEST_ERROR
+    if(H5Ldelete(gid,SLASHES_ROOTLINK_NAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Delete the soft link with the full path */
-    if(H5Gunlink(gid,SLASHES_SOFTLINK2_NAME) < 0) TEST_ERROR
+    if(H5Ldelete(gid,SLASHES_SOFTLINK2_NAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Delete the soft link with the relative path */
-    if(H5Gunlink(gid,SLASHES_SOFTLINK_NAME) < 0) TEST_ERROR
+    if(H5Ldelete(gid,SLASHES_SOFTLINK_NAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Delete the hard link */
-    if(H5Gunlink(gid,SLASHES_HARDLINK_NAME) < 0) TEST_ERROR
+    if(H5Ldelete(gid,SLASHES_HARDLINK_NAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Delete the group itself */
-    if(H5Gunlink(gid,SLASHES_GROUP_NAME) < 0) TEST_ERROR
+    if(H5Ldelete(gid,SLASHES_GROUP_NAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Close the group */
-    if(H5Gclose(gid) < 0) TEST_ERROR
+    if(H5Gclose(gid) < 0) FAIL_STACK_ERROR
 
     /* Delete the hard link */
-    if(H5Gunlink(fid,SLASHES_HARDLINK_NAME) < 0) TEST_ERROR
+    if(H5Ldelete(fid,SLASHES_HARDLINK_NAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Delete the group itself */
-    if(H5Gunlink(fid,SLASHES_GROUP_NAME) < 0) TEST_ERROR
+    if(H5Ldelete(fid,SLASHES_GROUP_NAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Close the file */
     if(H5Fclose(fid) < 0) TEST_ERROR
@@ -1438,7 +1458,8 @@ error:
 /*
  * Helper routine for test_unlink_rightleaf()
  */
-static int delete_node (hid_t pid, hid_t id)
+static int
+delete_node(hid_t pid, hid_t id)
 {
     char name[256];     /* Name of object to close */
 
@@ -1446,13 +1467,13 @@ static int delete_node (hid_t pid, hid_t id)
     if(H5Iget_name(id, name, sizeof(name)) < 0) return (-1);
 
     /* Close the object */
-    if(H5Gclose (id) < 0) return(-1);
+    if(H5Gclose(id) < 0) return(-1);
 
     /* Unlink the object */
-    if(H5Gunlink (pid, name) < 0) return(-1);
+    if(H5Ldelete(pid, name, H5P_DEFAULT) < 0) return(-1);
 
     /* If this object is the right-most child, try opening the previous object */
-    if(HDstrcmp(name,"/Zone81")==0) {
+    if(HDstrcmp(name,"/Zone81") == 0) {
         hid_t gid;
 
         if((gid = H5Gopen2(pid, "/Zone80", H5P_DEFAULT)) < 0) return(-1);
@@ -1562,22 +1583,22 @@ test_unlink_rightnode(hid_t fid)
     /* Create all the groups */
     for (n = 0; n < ngroups; n++) {
         sprintf(name, "ZoneB%d", n + 1);
-        if((gids[n] = H5Gcreate2(rootid, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
+        if((gids[n] = H5Gcreate2(rootid, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
     } /* end for */
 
     /* Close all the groups */
     for (n = 0; n < ngroups; n++)
-        if(H5Gclose(gids[n]) < 0) TEST_ERROR
+        if(H5Gclose(gids[n]) < 0) FAIL_STACK_ERROR
 
     /* Unlink specific objects to trigger deletion of right leaf in non-leaf node */
-    if(H5Gunlink(fid,"/ZoneB77") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneB78") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneB79") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneB8") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneB80") < 0) TEST_ERROR
+    if(H5Ldelete(fid, "/ZoneB77", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneB78", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneB79", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneB8", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneB80", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Close root group ID */
-    if(H5Gclose(rootid) < 0) TEST_ERROR
+    if(H5Gclose(rootid) < 0) FAIL_STACK_ERROR
 
     /* Free memory */
     HDfree(gids);
@@ -1625,165 +1646,165 @@ test_unlink_middlenode(hid_t fid)
     /* Create all the groups */
     for (n = 0; n < ngroups; n++) {
         sprintf(name, "ZoneC%d", n + 1);
-        if((gids[n] = H5Gcreate2(rootid, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
+        if((gids[n] = H5Gcreate2(rootid, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
     } /* end for */
 
     /* Close all the groups */
     for (n = 0; n < ngroups; n++)
-        if(H5Gclose(gids[n]) < 0) TEST_ERROR
+        if(H5Gclose(gids[n]) < 0) FAIL_STACK_ERROR
 
     /* Unlink specific objects to trigger deletion of all leafs in "interior" non-leaf node */
-    if(H5Gunlink(fid,"/ZoneC11") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC110") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC111") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC112") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC113") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC114") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC115") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC116") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC117") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC118") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC119") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC12") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC120") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC121") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC122") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC123") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC124") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC125") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC126") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC127") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC128") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC129") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC13") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC130") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC131") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC132") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC133") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC134") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC135") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC136") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC137") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC138") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC139") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC14") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC140") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC141") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC142") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC143") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC144") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC145") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC146") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC147") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC148") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC149") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC15") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC150") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC151") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC152") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC153") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC154") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC155") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC156") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC157") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC158") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC159") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC16") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC160") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC161") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC162") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC163") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC164") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC165") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC166") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC167") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC168") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC169") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC17") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC170") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC171") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC172") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC173") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC174") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC175") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC176") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC177") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC178") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC179") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC18") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC180") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC19") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC2") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC20") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC21") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC22") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC23") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC24") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC25") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC26") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC27") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC28") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC29") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC3") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC30") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC31") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC32") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC33") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC34") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC35") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC36") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC37") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC38") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC39") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC4") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC40") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC41") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC42") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC43") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC44") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC45") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC46") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC47") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC48") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC49") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC5") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC50") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC51") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC52") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC53") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC54") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC55") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC56") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC57") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC58") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC59") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC6") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC60") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC61") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC62") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC63") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC64") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC65") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC66") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC67") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC68") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC69") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC7") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC70") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC71") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC72") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC73") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC74") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC75") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC76") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC77") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC78") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC79") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC8") < 0) TEST_ERROR
-    if(H5Gunlink(fid,"/ZoneC80") < 0) TEST_ERROR
+    if(H5Ldelete(fid, "/ZoneC11", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC110", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC111", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC112", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC113", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC114", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC115", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC116", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC117", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC118", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC119", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC12", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC120", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC121", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC122", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC123", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC124", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC125", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC126", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC127", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC128", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC129", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC13", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC130", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC131", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC132", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC133", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC134", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC135", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC136", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC137", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC138", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC139", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC14", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC140", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC141", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC142", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC143", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC144", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC145", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC146", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC147", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC148", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC149", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC15", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC150", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC151", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC152", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC153", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC154", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC155", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC156", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC157", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC158", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC159", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC16", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC160", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC161", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC162", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC163", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC164", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC165", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC166", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC167", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC168", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC169", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC17", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC170", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC171", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC172", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC173", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC174", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC175", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC176", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC177", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC178", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC179", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC18", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC180", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC19", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC2", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC20", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC21", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC22", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC23", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC24", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC25", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC26", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC27", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC28", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC29", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC3", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC30", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC31", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC32", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC33", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC34", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC35", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC36", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC37", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC38", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC39", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC4", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC40", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC41", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC42", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC43", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC44", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC45", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC46", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC47", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC48", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC49", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC5", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC50", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC51", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC52", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC53", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC54", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC55", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC56", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC57", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC58", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC59", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC6", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC60", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC61", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC62", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC63", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC64", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC65", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC66", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC67", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC68", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC69", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC7", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC70", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC71", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC72", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC73", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC74", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC75", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC76", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC77", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC78", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC79", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC8", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(fid, "/ZoneC80", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Close root group ID */
-    if(H5Gclose(rootid) < 0) TEST_ERROR
+    if(H5Gclose(rootid) < 0) FAIL_STACK_ERROR
 
     /* Free memory */
     HDfree(gids);
@@ -1815,7 +1836,7 @@ error:
 static int
 test_resurrect_dataset(hid_t fapl)
 {
-    hid_t       f=-1, s=-1, d=-1;
+    hid_t       f =-1, s =-1, d =-1;
     char	filename[1024];
 
     TESTING("resurrecting dataset after deletion");
@@ -1832,7 +1853,7 @@ test_resurrect_dataset(hid_t fapl)
     if(H5Sclose(s) < 0) FAIL_STACK_ERROR
 
     /* Unlink the dataset while it's open (will mark it for deletion when closed) */
-    if(H5Gunlink(f, DATASETNAME) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(f, DATASETNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Check that dataset name is NULL */
     if(H5Iget_name(d, NULL, (size_t)0) != 0) FAIL_STACK_ERROR
@@ -1845,7 +1866,7 @@ test_resurrect_dataset(hid_t fapl)
     if(H5Fclose(f) < 0) FAIL_STACK_ERROR
 
     /* Re-open the file */
-    if((f=H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0) FAIL_STACK_ERROR
+    if((f = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0) FAIL_STACK_ERROR
 
     /* Attempt to open the dataset under the new name */
     if((d = H5Dopen(f,DATASET2NAME)) < 0) FAIL_STACK_ERROR
@@ -1899,10 +1920,10 @@ test_resurrect_datatype(hid_t fapl)
 
     /* Create a named datatype in the file */
     if((type = H5Tcopy (H5T_NATIVE_INT)) < 0) FAIL_STACK_ERROR
-    if(H5Tcommit (file, TYPENAME, type) < 0) FAIL_STACK_ERROR
+    if(H5Tcommit(file, TYPENAME, type) < 0) FAIL_STACK_ERROR
 
     /* Unlink the datatype while it's open (will mark it for deletion when closed) */
-    if(H5Gunlink(file, TYPENAME) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(file, TYPENAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Check that datatype name is NULL */
     if(H5Iget_name(type, NULL, (size_t)0) != 0) FAIL_STACK_ERROR
@@ -1970,7 +1991,7 @@ test_resurrect_group(hid_t fapl)
     if((group = H5Gcreate2(file, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
 
     /* Unlink the group while it's open (will mark it for deletion when closed) */
-    if(H5Gunlink(file, GROUPNAME) < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(file, GROUPNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Check that group's name is NULL */
     if(H5Iget_name(group, NULL, (size_t)0) != 0) FAIL_STACK_ERROR
@@ -2022,13 +2043,13 @@ error:
 static int
 test_unlink_chunked_dataset(hid_t fapl)
 {
-    hid_t file_id=-1;
-    hid_t dset_id=-1;
-    hid_t space_id=-1;
-    hid_t dcpl_id=-1;
-    hsize_t dims[FILESPACE_NDIMS]={FILESPACE_DIM0,FILESPACE_DIM1,FILESPACE_DIM2};
-    hsize_t max_dims[FILESPACE_NDIMS]={H5S_UNLIMITED,H5S_UNLIMITED,H5S_UNLIMITED};
-    hsize_t chunk_dims[FILESPACE_NDIMS]={FILESPACE_CHUNK0,FILESPACE_CHUNK1,FILESPACE_CHUNK2};
+    hid_t file_id = -1;
+    hid_t dset_id = -1;
+    hid_t space_id = -1;
+    hid_t dcpl_id = -1;
+    hsize_t dims[FILESPACE_NDIMS] = {FILESPACE_DIM0, FILESPACE_DIM1, FILESPACE_DIM2};
+    hsize_t max_dims[FILESPACE_NDIMS] = {H5S_UNLIMITED, H5S_UNLIMITED, H5S_UNLIMITED};
+    hsize_t chunk_dims[FILESPACE_NDIMS] = {FILESPACE_CHUNK0, FILESPACE_CHUNK1, FILESPACE_CHUNK2};
     char filename[1024];
 
     TESTING("unlinking chunked dataset");
@@ -2037,43 +2058,43 @@ test_unlink_chunked_dataset(hid_t fapl)
     h5_fixname(FILENAME[9], fapl, filename, sizeof filename);
 
     /* Create the file */
-    if((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR
+    if((file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR
 
     /* Create the dataspace */
-    if((space_id=H5Screate_simple(FILESPACE_NDIMS,dims,max_dims)) < 0) TEST_ERROR
+    if((space_id = H5Screate_simple(FILESPACE_NDIMS,dims,max_dims)) < 0) FAIL_STACK_ERROR
 
     /* Create the dataset creation filter */
-    if((dcpl_id=H5Pcreate(H5P_DATASET_CREATE)) < 0) TEST_ERROR
+    if((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) FAIL_STACK_ERROR
 
     /* Set to chunked storage */
-    if(H5Pset_chunk(dcpl_id,FILESPACE_NDIMS,chunk_dims) < 0) TEST_ERROR
+    if(H5Pset_chunk(dcpl_id,FILESPACE_NDIMS,chunk_dims) < 0) FAIL_STACK_ERROR
 
     /* Set to early space allocation */
-    if(H5Pset_alloc_time(dcpl_id,H5D_ALLOC_TIME_EARLY) < 0) TEST_ERROR
+    if(H5Pset_alloc_time(dcpl_id,H5D_ALLOC_TIME_EARLY) < 0) FAIL_STACK_ERROR
 
     /* Create the dataset */
-    if((dset_id = H5Dcreate(file_id,DATASETNAME,H5T_NATIVE_INT,space_id,dcpl_id)) < 0) TEST_ERROR
+    if((dset_id = H5Dcreate(file_id,DATASETNAME,H5T_NATIVE_INT,space_id,dcpl_id)) < 0) FAIL_STACK_ERROR
 
     /* Close the dataspace */
-    if(H5Sclose(space_id) < 0) TEST_ERROR
+    if(H5Sclose(space_id) < 0) FAIL_STACK_ERROR
 
     /* Close the dataset creation property list */
-    if(H5Pclose(dcpl_id) < 0) TEST_ERROR
+    if(H5Pclose(dcpl_id) < 0) FAIL_STACK_ERROR
 
     /* Close the dataset */
-    if(H5Dclose(dset_id) < 0) TEST_ERROR
+    if(H5Dclose(dset_id) < 0) FAIL_STACK_ERROR
 
     /* Close the file */
-    if(H5Fclose(file_id) < 0) TEST_ERROR
+    if(H5Fclose(file_id) < 0) FAIL_STACK_ERROR
 
     /* Re-open the file */
-    if((file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) TEST_ERROR
+    if((file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) FAIL_STACK_ERROR
 
     /* Delete the dataset */
-    if(H5Gunlink(file_id, DATASETNAME) < 0) TEST_ERROR
+    if(H5Ldelete(file_id, DATASETNAME, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Close the file */
-    if(H5Fclose(file_id) < 0) TEST_ERROR
+    if(H5Fclose(file_id) < 0) FAIL_STACK_ERROR
 
     PASSED();
     return 0;
@@ -2191,7 +2212,7 @@ test_full_group_compact(hid_t fapl)
     if((file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) FAIL_STACK_ERROR
 
     /* Delete the full group */
-    if(H5Gunlink(file_id, "/delete") < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(file_id, "/delete", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Check reference count on objects to keep */
     for(u = 0; u < FULL_GROUP_NUM_KEEP; u++) {
@@ -2337,7 +2358,7 @@ test_full_group_dense(hid_t fapl)
     if((file_id = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) FAIL_STACK_ERROR
 
     /* Delete the full group */
-    if(H5Gunlink(file_id, "/delete") < 0) FAIL_STACK_ERROR
+    if(H5Ldelete(file_id, "/delete", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
 
     /* Check reference count on objects to keep */
     for(u = 0; u < FULL_GROUP_NUM_KEEP; u++) {
@@ -2372,7 +2393,7 @@ error:
 /*-------------------------------------------------------------------------
  * Function:	main
  *
- * Purpose:	Test H5Gunlink()
+ * Purpose:	Test unlinking operations
  *
  * Return:	Success:	zero
  *