More includes cleanup

1 files changed, 68 insertions, 69 deletions

diff --git a/test/tvltypes.c b/test/tvltypes.c
index 0c4cb9d..e5a3d34 100644
--- a/test/tvltypes.c
+++ b/test/tvltypes.c
@@ -13,7 +13,7 @@
 
 /***********************************************************
 *
-* Test program:	 tvltypes
+* Test program:     tvltypes
 *
 * Test the Variable-Length Datatype functionality
 *
@@ -21,24 +21,23 @@
 
 #include "testhdf5.h"
 
-#include "hdf5.h"
 #include "H5Dprivate.h"
 
 #define FILENAME   "tvltypes.h5"
 
 /* 1-D dataset with fixed dimensions */
-#define SPACE1_RANK	1
+#define SPACE1_RANK    1
 #define SPACE1_DIM1     4
 
 /* 1-D dataset with fixed dimensions */
-#define SPACE3_RANK	1
+#define SPACE3_RANK    1
 #define SPACE3_DIM1     128
 #define L1_INCM         16
 #define L2_INCM         8
 #define L3_INCM         3
 
 /* 1-D dataset with fixed dimensions */
-#define SPACE4_RANK	1
+#define SPACE4_RANK    1
 #define SPACE4_DIM_SMALL     128
 #define SPACE4_DIM_LARGE     (H5D_TEMP_BUF_SIZE / 64)
 
@@ -104,7 +103,7 @@ static void
 test_vltypes_dataset_create(void)
 {
     hid_t               fid1;           /* HDF5 File IDs                */
-    hid_t		dcpl;		/* Dataset Property list	*/
+    hid_t        dcpl;        /* Dataset Property list    */
     hid_t               dataset;        /* Dataset ID                   */
     hsize_t             dims1[] = {SPACE1_DIM1};
     hid_t               sid1;       /* Dataspace ID                     */
@@ -136,7 +135,7 @@ test_vltypes_dataset_create(void)
 
     /* Create a dataset, supposed to fail */
     H5E_BEGIN_TRY {
-    	dataset = H5Dcreate2(fid1, "Dataset1", tid1, sid1, H5P_DEFAULT, dcpl, H5P_DEFAULT);
+        dataset = H5Dcreate2(fid1, "Dataset1", tid1, sid1, H5P_DEFAULT, dcpl, H5P_DEFAULT);
     } H5E_END_TRY;
     VERIFY(dataset, FAIL, "H5Dcreate2");
 
@@ -230,18 +229,18 @@ test_vltypes_vlen_atomic(void)
     hvl_t wdata2[SPACE1_DIM1];  /* Information to write */
     hvl_t rdata[SPACE1_DIM1];   /* Information read in */
     hvl_t fill;                 /* Fill value */
-    hid_t fid1;		/* HDF5 File IDs		*/
-    hid_t dataset;	/* Dataset ID			*/
-    hid_t sid1;         /* Dataspace ID			*/
+    hid_t fid1;        /* HDF5 File IDs        */
+    hid_t dataset;    /* Dataset ID            */
+    hid_t sid1;         /* Dataspace ID            */
     hid_t sid2;         /* ID of bad dataspace (no extent set) */
-    hid_t tid1;         /* Datatype ID			*/
+    hid_t tid1;         /* Datatype ID            */
     hid_t dcpl_pid;     /* Dataset creation property list ID */
     hid_t xfer_pid;     /* Dataset transfer property list ID */
     hsize_t dims1[] = {SPACE1_DIM1};
     hsize_t size;       /* Number of bytes which will be used */
     unsigned i,j;       /* counting variables */
     size_t mem_used=0;  /* Memory used during allocation */
-    herr_t ret;		/* Generic return value		*/
+    herr_t ret;        /* Generic return value        */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Basic Atomic VL Datatype Functionality\n"));
@@ -556,7 +555,7 @@ rewrite_vltypes_vlen_atomic(void)
     hsize_t     size;       /* Number of bytes which will be used */
     unsigned       i,j;        /* counting variables */
     size_t         mem_used=0; /* Memory used during allocation */
-    unsigned	increment=4;
+    unsigned    increment=4;
     herr_t              ret;            /* Generic return value         */
 
     /* Output message about test being performed */
@@ -709,16 +708,16 @@ test_vltypes_vlen_compound(void)
     } s1;
     hvl_t wdata[SPACE1_DIM1];   /* Information to write */
     hvl_t rdata[SPACE1_DIM1];   /* Information read in */
-    hid_t		fid1;		/* HDF5 File IDs		*/
-    hid_t		dataset;	/* Dataset ID			*/
-    hid_t		sid1;       /* Dataspace ID			*/
-    hid_t		tid1, tid2; /* Datatype IDs         */
+    hid_t        fid1;        /* HDF5 File IDs        */
+    hid_t        dataset;    /* Dataset ID            */
+    hid_t        sid1;       /* Dataspace ID            */
+    hid_t        tid1, tid2; /* Datatype IDs         */
     hid_t       xfer_pid;   /* Dataset transfer property list ID */
-    hsize_t		dims1[] = {SPACE1_DIM1};
+    hsize_t        dims1[] = {SPACE1_DIM1};
     hsize_t     size;       /* Number of bytes which will be used */
     unsigned       i,j;        /* counting variables */
     size_t         mem_used=0; /* Memory used during allocation */
-    herr_t		ret;		/* Generic return value		*/
+    herr_t        ret;        /* Generic return value        */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Basic Compound VL Datatype Functionality\n"));
@@ -863,7 +862,7 @@ rewrite_vltypes_vlen_compound(void)
     hsize_t     size;       /* Number of bytes which will be used */
     unsigned       i,j;        /* counting variables */
     size_t         mem_used=0; /* Memory used during allocation */
-    unsigned 	increment=4;
+    unsigned     increment=4;
     herr_t              ret;            /* Generic return value         */
 
     /* Output message about test being performed */
@@ -1001,14 +1000,14 @@ test_vltypes_compound_vlen_vlen(void)
     } s1;
     s1          *wdata;                 /* data to write */
     s1          *rdata;                 /* data to read */
-    hid_t	fid1;		        /* HDF5 File IDs		*/
-    hid_t	dataset;	        /* Dataset ID			*/
-    hid_t	sid1;                   /* Dataspace ID			*/
-    hid_t	tid1, tid2, tid3;       /* Datatype IDs         */
-    hsize_t	dims1[] = {SPACE3_DIM1};
+    hid_t    fid1;                /* HDF5 File IDs        */
+    hid_t    dataset;            /* Dataset ID            */
+    hid_t    sid1;                   /* Dataspace ID            */
+    hid_t    tid1, tid2, tid3;       /* Datatype IDs         */
+    hsize_t    dims1[] = {SPACE3_DIM1};
     unsigned    i,j,k;                  /* counting variables */
     hvl_t       *t1, *t2;               /* Temporary pointer to VL information */
-    herr_t	ret;		        /* Generic return value		*/
+    herr_t    ret;                /* Generic return value        */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Compound Datatypes with VL Atomic Datatype Component Functionality\n"));
@@ -1182,21 +1181,21 @@ test_vltypes_compound_vlstr(void)
     s1 wdata2[SPACE1_DIM1];             /* data to write */
     s1 rdata[SPACE1_DIM1];              /* data to read */
     s1 rdata2[SPACE1_DIM1];              /* data to read */
-    char	str[64] = "a\0";
-    hid_t	fid1;		        /* HDF5 File IDs		*/
-    hid_t	dataset, dset2;	        /* Dataset ID			*/
-    hid_t	sid1, sid2, filespace, filespace2;  /* Dataspace ID	*/
-    hid_t	tid1, tid2, tid3, tid4, tid5;       /* Datatype IDs     */
-    hid_t	cparms;
-    hsize_t	dims1[] = {SPACE1_DIM1};
-    hsize_t	chunk_dims[] = {SPACE1_DIM1/2};
-    hsize_t	maxdims[] = {H5S_UNLIMITED};
-    hsize_t	size[] = {SPACE1_DIM1};
-    hsize_t	offset[] = {0};
+    char    str[64] = "a\0";
+    hid_t    fid1;                /* HDF5 File IDs        */
+    hid_t    dataset, dset2;            /* Dataset ID            */
+    hid_t    sid1, sid2, filespace, filespace2;  /* Dataspace ID    */
+    hid_t    tid1, tid2, tid3, tid4, tid5;       /* Datatype IDs     */
+    hid_t    cparms;
+    hsize_t    dims1[] = {SPACE1_DIM1};
+    hsize_t    chunk_dims[] = {SPACE1_DIM1/2};
+    hsize_t    maxdims[] = {H5S_UNLIMITED};
+    hsize_t    size[] = {SPACE1_DIM1};
+    hsize_t    offset[] = {0};
     unsigned    i,j;                    /* counting variables */
     s2          *t1, *t2;               /* Temporary pointer to VL information */
-    int		val;
-    herr_t	ret;		        /* Generic return value		*/
+    int        val;
+    herr_t    ret;                /* Generic return value        */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing VL Datatype of Compound Datatype with VL String Functionality\n"));
@@ -1374,10 +1373,10 @@ test_vltypes_compound_vlstr(void)
         wdata2[i].v.p=(s2*)HDmalloc((i+1)*sizeof(s2));
         wdata2[i].v.len=i+1;
         for(t1=(s2*)(wdata2[i].v).p, j=0; j<i+1; j++, t1++) {
-	    strcat(str, "pp");
-	    t1->string = (char*)HDmalloc(strlen(str)*sizeof(char)+1);
+        strcat(str, "pp");
+        t1->string = (char*)HDmalloc(strlen(str)*sizeof(char)+1);
             strcpy(t1->string, str);
-	    t1->color = green;
+        t1->color = green;
         }
     } /* end for */
 
@@ -1467,17 +1466,17 @@ test_vltypes_compound_vlen_atomic(void)
     s1 wdata[SPACE1_DIM1];   /* Information to write */
     s1 rdata[SPACE1_DIM1];   /* Information read in */
     s1 fill;                    /* Fill value */
-    hid_t		fid1;		/* HDF5 File IDs		*/
-    hid_t		dataset;	/* Dataset ID			*/
-    hid_t		sid1;       /* Dataspace ID			*/
-    hid_t		tid1, tid2; /* Datatype IDs         */
+    hid_t        fid1;        /* HDF5 File IDs        */
+    hid_t        dataset;    /* Dataset ID            */
+    hid_t        sid1;       /* Dataspace ID            */
+    hid_t        tid1, tid2; /* Datatype IDs         */
     hid_t       xfer_pid;   /* Dataset transfer property list ID */
     hid_t       dcpl_pid;   /* Dataset creation property list ID */
-    hsize_t		dims1[] = {SPACE1_DIM1};
+    hsize_t        dims1[] = {SPACE1_DIM1};
     hsize_t     size;       /* Number of bytes which will be used */
     unsigned       i,j;        /* counting variables */
     size_t         mem_used=0; /* Memory used during allocation */
-    herr_t		ret;		/* Generic return value		*/
+    herr_t        ret;        /* Generic return value        */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing Compound Datatypes with VL Atomic Datatype Component Functionality\n"));
@@ -1671,9 +1670,9 @@ test_vltypes_compound_vlen_atomic(void)
 /****************************************************************
 **
 **  rewrite_vltypes_compound_vlen_atomic(): Check memory leak for
-**	basic VL datatype code.
+**    basic VL datatype code.
 **      Check memory leak for compound datatypes with VL datatypes
-**	of atomic datatypes.
+**    of atomic datatypes.
 **
 ****************************************************************/
 static void
@@ -1694,7 +1693,7 @@ rewrite_vltypes_compound_vlen_atomic(void)
     hsize_t     size;       /* Number of bytes which will be used */
     unsigned       i,j;        /* counting variables */
     size_t         mem_used=0; /* Memory used during allocation */
-    unsigned		increment=4;
+    unsigned        increment=4;
     herr_t              ret;            /* Generic return value         */
 
     /* Output message about test being performed */
@@ -1855,16 +1854,16 @@ test_vltypes_vlen_vlen_atomic(void)
     hvl_t wdata[SPACE1_DIM1];   /* Information to write */
     hvl_t rdata[SPACE1_DIM1];   /* Information read in */
     hvl_t *t1, *t2;             /* Temporary pointer to VL information */
-    hid_t		fid1;		/* HDF5 File IDs		*/
-    hid_t		dataset;	/* Dataset ID			*/
-    hid_t		sid1;       /* Dataspace ID			*/
-    hid_t		tid1, tid2; /* Datatype IDs         */
+    hid_t        fid1;        /* HDF5 File IDs        */
+    hid_t        dataset;    /* Dataset ID            */
+    hid_t        sid1;       /* Dataspace ID            */
+    hid_t        tid1, tid2; /* Datatype IDs         */
     hid_t       xfer_pid;   /* Dataset transfer property list ID */
-    hsize_t		dims1[] = {SPACE1_DIM1};
+    hsize_t        dims1[] = {SPACE1_DIM1};
     hsize_t     size;       /* Number of bytes which will be used */
     unsigned       i,j,k;      /* counting variables */
     size_t         mem_used=0; /* Memory used during allocation */
-    herr_t		ret;		/* Generic return value		*/
+    herr_t        ret;        /* Generic return value        */
 
     /* Output message about test being performed */
     MESSAGE(5, ("Testing VL Datatypes with VL Atomic Datatype Component Functionality\n"));
@@ -2049,12 +2048,12 @@ rewrite_longer_vltypes_vlen_vlen_atomic(void)
     hid_t               fid1;           /* HDF5 File IDs                */
     hid_t               dataset;        /* Dataset ID                   */
     hid_t               sid1;       /* Dataspace ID                     */
-    hid_t               tid2; 	/* Datatype IDs         */
+    hid_t               tid2;     /* Datatype IDs         */
     hid_t       xfer_pid;   /* Dataset transfer property list ID */
     hsize_t     size;       /* Number of bytes which will be used */
     unsigned       i,j,k;      /* counting variables */
     size_t         mem_used=0; /* Memory used during allocation */
-    unsigned		increment=1;
+    unsigned        increment=1;
     herr_t              ret;            /* Generic return value         */
 
     /* Output message about test being performed */
@@ -3171,15 +3170,15 @@ test_vltypes(void)
 
     /* These next tests use the same file */
     test_vltypes_dataset_create();    /* Check dataset of VL when fill value
-				       * won't be rewritten to it.*/
+                    * won't be rewritten to it.*/
     test_vltypes_funcs();             /* Test functions with VL types */
     test_vltypes_vlen_atomic();       /* Test VL atomic datatypes */
-    rewrite_vltypes_vlen_atomic();    /* Check VL memory leak	  */
+    rewrite_vltypes_vlen_atomic();    /* Check VL memory leak      */
     test_vltypes_vlen_compound();     /* Test VL compound datatypes */
-    rewrite_vltypes_vlen_compound();  /* Check VL memory leak	  */
+    rewrite_vltypes_vlen_compound();  /* Check VL memory leak      */
     test_vltypes_compound_vlen_atomic(); /* Test compound datatypes with VL atomic components */
-    rewrite_vltypes_compound_vlen_atomic();/* Check VL memory leak	*/
-    test_vltypes_vlen_vlen_atomic();  	   /* Test VL datatype with VL atomic components */
+    rewrite_vltypes_compound_vlen_atomic();/* Check VL memory leak    */
+    test_vltypes_vlen_vlen_atomic();         /* Test VL datatype with VL atomic components */
     rewrite_longer_vltypes_vlen_vlen_atomic();  /*overwrite with VL data of longer sequence*/
     rewrite_shorter_vltypes_vlen_vlen_atomic();  /*overwrite with VL data of shorted sequence*/
     test_vltypes_compound_vlen_vlen();/* Test compound datatypes with VL atomic components */
@@ -3187,15 +3186,15 @@ test_vltypes(void)
     test_vltypes_fill_value();        /* Test fill value for VL data */
 }   /* test_vltypes() */
 
-
+
 /*-------------------------------------------------------------------------
- * Function:	cleanup_vltypes
+ * Function:    cleanup_vltypes
  *
- * Purpose:	Cleanup temporary test files
+ * Purpose:    Cleanup temporary test files
  *
- * Return:	none
+ * Return:    none
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              June 8, 1999
  *
  * Modifications: