[svn-r7542] Purpose:

    Bug fixes and code cleanup

Description:
    Whitespace removal.

    Added testfiles for named datatypes in attributes.

Platforms tested:
    FreeBSD 4.9 (sleipnir)
    h5committest

1 files changed, 11 insertions, 16 deletions

diff --git a/tools/testfiles/tvlstr.ddl b/tools/testfiles/tvlstr.ddl
index 93b392e..2487984 100644
--- a/tools/testfiles/tvlstr.ddl
+++ b/tools/testfiles/tvlstr.ddl
@@ -4,38 +4,33 @@ Expected output for 'h5dump tvlstr.h5'
 HDF5 "tvlstr.h5" {
 GROUP "/" {
    ATTRIBUTE "test_scalar" {
-      DATATYPE  H5T_STRING {
-            STRSIZE H5T_VARIABLE;
-            STRPAD H5T_STR_NULLPAD;
-            CSET H5T_CSET_ASCII;
-            CTYPE H5T_C_S1;
-         }        
-      DATASPACE  SCALAR  
+      DATATYPE  "/vl_string_type"
+      DATASPACE  SCALAR
       DATA {
          "This is the string for the attribute"
-      } 
-   } 
+      }
+   }
    DATASET "Dataset1" {
       DATATYPE  H5T_STRING {
             STRSIZE H5T_VARIABLE;
             STRPAD H5T_STR_NULLTERM;
             CSET H5T_CSET_ASCII;
             CTYPE H5T_C_S1;
-         }        
-      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) } 
+         }
+      DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
       DATA {
          "Four score and seven years ago our forefathers brought forth on this continent a new nation,",
          "conceived in liberty and dedicated to the proposition that all men are created equal.",
          "Now we are engaged in a great civil war,",
          "testing whether that nation or any nation so conceived and so dedicated can long endure."
-      } 
-   } 
+      }
+   }
    DATATYPE "vl_string_type"       H5T_STRING {
          STRSIZE H5T_VARIABLE;
          STRPAD H5T_STR_NULLPAD;
          CSET H5T_CSET_ASCII;
          CTYPE H5T_C_S1;
       };
-    
-} 
-} 
+
+}
+}