Merge changes from develop

Comments and whitespace
Skip file-locking and cache changes

1 files changed, 11 insertions, 11 deletions

diff --git a/test/gen_nullspace.c b/test/gen_nullspace.c
index 5205b21..9002309 100644
--- a/test/gen_nullspace.c
+++ b/test/gen_nullspace.c
@@ -42,42 +42,42 @@ main(void)
 
     /* Create the file */
     fid = H5Fcreate(NULLFILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    assert(fid > 0);
+    HDassert(fid > 0);
 
     sid = H5Screate(H5S_NULL);
-    assert(sid > 0);
+    HDassert(sid > 0);
 
     /* Create dataset */
     did = H5Dcreate2(fid, NULLDATASET, H5T_NATIVE_UINT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    assert(did > 0);
+    HDassert(did > 0);
 
     /* Close the dataset */
     ret = H5Dclose(did);
-    assert(ret >= 0);
+    HDassert(ret >= 0);
 
     /* Open the root group */
     gid = H5Gopen2(fid, "/", H5P_DEFAULT);
-    assert(gid > 0);
+    HDassert(gid > 0);
 
     /* Create an attribute for the group */
     attr = H5Acreate2(gid, NULLATTR, H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT);
-    assert(attr > 0);
+    HDassert(attr > 0);
 
     /* Close attribute */
     ret = H5Aclose(attr);
-    assert(ret >= 0);
+    HDassert(ret >= 0);
 
     /* Close the group */
     ret = H5Gclose(gid);
-    assert(ret >= 0);
+    HDassert(ret >= 0);
 
     /* Close the dataspace */
     ret = H5Sclose(sid);
-    assert(ret >= 0);
+    HDassert(ret >= 0);
 
     /* Close the file */
     ret = H5Fclose(fid);
-    assert(ret >= 0);
+    HDassert(ret >= 0);
 
-    return 0;
+    return EXIT_SUCCESS;
 }