Merge hdf5 1 10 8 (#1154)hdf5-1_10_8

 Merge HDF5 1.10.8 release files to 1.10/master

1 files changed, 47 insertions, 51 deletions

diff --git a/test/ttime.c b/test/ttime.c
index 5b3436d..c8a76e8 100644
--- a/test/ttime.c
+++ b/test/ttime.c
@@ -6,24 +6,24 @@
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
- * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /***********************************************************
-*
-* Test program:     ttime
-*
-* Test the Time Datatype functionality
-*
-*************************************************************/
+ *
+ * Test program:     ttime
+ *
+ * Test the Time Datatype functionality
+ *
+ *************************************************************/
 
 #include "testhdf5.h"
 
-#define DATAFILE   "ttime.h5"
+#define DATAFILE "ttime.h5"
 #ifdef NOT_YET
-#define DATASETNAME   "Dataset"
+#define DATASETNAME "Dataset"
 #endif /* NOT_YET */
 
 /****************************************************************
@@ -34,8 +34,8 @@
 static void
 test_time_commit(void)
 {
-    hid_t       file_id, tid;  /* identifiers */
-    herr_t      status;
+    hid_t  file_id, tid; /* identifiers */
+    herr_t status;
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Committing Time Datatypes\n"));
@@ -44,32 +44,32 @@ test_time_commit(void)
     file_id = H5Fcreate(DATAFILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(file_id, FAIL, "H5Fcreate");
 
-    tid = H5Tcopy (H5T_UNIX_D32LE);
+    tid = H5Tcopy(H5T_UNIX_D32LE);
     CHECK(tid, FAIL, "H5Tcopy");
     status = H5Tcommit2(file_id, "Committed D32LE type", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(status, FAIL, "H5Tcommit2");
-    status = H5Tclose (tid);
+    status = H5Tclose(tid);
     CHECK(status, FAIL, "H5Tclose");
 
-    tid = H5Tcopy (H5T_UNIX_D32BE);
+    tid = H5Tcopy(H5T_UNIX_D32BE);
     CHECK(tid, FAIL, "H5Tcopy");
     status = H5Tcommit2(file_id, "Committed D32BE type", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(status, FAIL, "H5Tcommit2");
-    status = H5Tclose (tid);
+    status = H5Tclose(tid);
     CHECK(status, FAIL, "H5Tclose");
 
-    tid = H5Tcopy (H5T_UNIX_D64LE);
+    tid = H5Tcopy(H5T_UNIX_D64LE);
     CHECK(tid, FAIL, "H5Tcopy");
     status = H5Tcommit2(file_id, "Committed D64LE type", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(status, FAIL, "H5Tcommit2");
-    status = H5Tclose (tid);
+    status = H5Tclose(tid);
     CHECK(status, FAIL, "H5Tclose");
 
-    tid = H5Tcopy (H5T_UNIX_D64BE);
+    tid = H5Tcopy(H5T_UNIX_D64BE);
     CHECK(tid, FAIL, "H5Tcopy");
     status = H5Tcommit2(file_id, "Committed D64BE type", tid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(status, FAIL, "H5Tcommit2");
-    status = H5Tclose (tid);
+    status = H5Tclose(tid);
     CHECK(status, FAIL, "H5Tclose");
 
     /* Close the file. */
@@ -82,42 +82,41 @@ test_time_commit(void)
     tid = H5Topen2(file_id, "Committed D32LE type", H5P_DEFAULT);
     CHECK(tid, FAIL, "H5Topen2");
 
-    if(!H5Tequal(tid, H5T_UNIX_D32LE))
+    if (!H5Tequal(tid, H5T_UNIX_D32LE))
         TestErrPrintf("H5T_UNIX_D32LE datatype not found\n");
 
-    status = H5Tclose (tid);
+    status = H5Tclose(tid);
     CHECK(status, FAIL, "H5Tclose");
 
     tid = H5Topen2(file_id, "Committed D32BE type", H5P_DEFAULT);
     CHECK(tid, FAIL, "H5Topen2");
 
-    if(!H5Tequal(tid, H5T_UNIX_D32BE))
+    if (!H5Tequal(tid, H5T_UNIX_D32BE))
         TestErrPrintf("H5T_UNIX_D32BE datatype not found\n");
 
-    status = H5Tclose (tid);
+    status = H5Tclose(tid);
     CHECK(status, FAIL, "H5Tclose");
 
     tid = H5Topen2(file_id, "Committed D64LE type", H5P_DEFAULT);
     CHECK(tid, FAIL, "H5Topen2");
 
-    if(!H5Tequal(tid, H5T_UNIX_D64LE))
+    if (!H5Tequal(tid, H5T_UNIX_D64LE))
         TestErrPrintf("H5T_UNIX_D64LE datatype not found");
 
-    status = H5Tclose (tid);
+    status = H5Tclose(tid);
     CHECK(status, FAIL, "H5Tclose");
 
     tid = H5Topen2(file_id, "Committed D64BE type", H5P_DEFAULT);
     CHECK(tid, FAIL, "H5Topen2");
 
-    if(!H5Tequal(tid, H5T_UNIX_D64BE))
+    if (!H5Tequal(tid, H5T_UNIX_D64BE))
         TestErrPrintf("H5T_UNIX_D64BE datatype not found");
 
-    status = H5Tclose (tid);
+    status = H5Tclose(tid);
     CHECK(status, FAIL, "H5Tclose");
 
     status = H5Fclose(file_id);
     CHECK(status, FAIL, "H5Fclose");
-
 }
 
 #ifdef NOT_YET
@@ -129,12 +128,12 @@ test_time_commit(void)
 static void
 test_time_io(void)
 {
-    hid_t       fid;            /* File identifier */
-    hid_t       dsid;           /* Dataset identifier */
-    hid_t       tid;            /* Datatype identifier */
-    hid_t       sid;            /* Dataspace identifier */
-    time_t      timenow, timethen;      /* Times */
-    herr_t      status;
+    hid_t  fid;               /* File identifier */
+    hid_t  dsid;              /* Dataset identifier */
+    hid_t  tid;               /* Datatype identifier */
+    hid_t  sid;               /* Dataspace identifier */
+    time_t timenow, timethen; /* Times */
+    herr_t status;
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Committing Time Datatypes\n"));
@@ -155,7 +154,7 @@ test_time_io(void)
     timenow = HDtime(NULL);
 
     /* Write time to dataset */
-    status = H5Dwrite (dsid, H5T_UNIX_D32LE, H5S_ALL, H5S_ALL, H5P_DEFAULT, &timenow);
+    status = H5Dwrite(dsid, H5T_UNIX_D32LE, H5S_ALL, H5S_ALL, H5P_DEFAULT, &timenow);
     CHECK(status, FAIL, "H5Dwrite");
 
     /* Close objects */
@@ -165,7 +164,7 @@ test_time_io(void)
     status = H5Sclose(sid);
     CHECK(status, FAIL, "H5Sclose");
 
-    status = H5Fclose (fid);
+    status = H5Fclose(fid);
     CHECK(status, FAIL, "H5Fclose");
 
     /* Open file and dataset, read time back and print it in calendar format */
@@ -175,23 +174,22 @@ test_time_io(void)
     dsid = H5Dopen2(fid, DATASETNAME, H5P_DEFAULT);
     CHECK(dsid, FAIL, "H5Dopen2");
 
-tid = H5Dget_type(dsid);
-CHECK(tid, FAIL, "H5Dget_type");
-if( H5Tget_class (tid) == H5T_TIME)
-    HDfprintf(stderr,"datatype class is H5T_TIME\n");
-status = H5Tclose (tid);
-CHECK(status, FAIL, "H5Tclose");
+    tid = H5Dget_type(dsid);
+    CHECK(tid, FAIL, "H5Dget_type");
+    if (H5Tget_class(tid) == H5T_TIME)
+        HDfprintf(stderr, "datatype class is H5T_TIME\n");
+    status = H5Tclose(tid);
+    CHECK(status, FAIL, "H5Tclose");
 
-    status = H5Dread (dsid, H5T_UNIX_D32LE, H5S_ALL, H5S_ALL, H5P_DEFAULT, &timethen);
+    status = H5Dread(dsid, H5T_UNIX_D32LE, H5S_ALL, H5S_ALL, H5P_DEFAULT, &timethen);
     CHECK(status, FAIL, "H5Dread");
-HDfprintf(stderr,"time written was: %s\n", HDctime(&timethen));
+    HDfprintf(stderr, "time written was: %s\n", HDctime(&timethen));
 
     status = H5Dclose(dsid);
     CHECK(status, FAIL, "H5Dclose");
 
     status = H5Fclose(fid);
     CHECK(status, FAIL, "H5Fclose");
-
 }
 #endif /* NOT_YET */
 
@@ -206,13 +204,12 @@ test_time(void)
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Time Datatypes\n"));
 
-    test_time_commit();         /* Test committing time datatypes to a file */
+    test_time_commit(); /* Test committing time datatypes to a file */
 #ifdef NOT_YET
-    test_time_io();             /* Test writing time data to a dataset */
-#endif /* NOT_YET */
-
-}   /* test_time() */
+    test_time_io(); /* Test writing time data to a dataset */
+#endif              /* NOT_YET */
 
+} /* test_time() */
 
 /*-------------------------------------------------------------------------
  * Function:    cleanup_time
@@ -233,4 +230,3 @@ cleanup_time(void)
 {
     HDremove(DATAFILE);
 }
-