[svn-r3517] Purpose:

    More Subsetting
Description:
    Wanted to do a check-in of the current subsetting stuff. The
    command-line parsing was already in there. I now added the feature to
    the h5dump_t structure and it now outputs the new SUBSET DDL stuff in
    the correct format. It doesn't yet do the actual subsetting, but
    we're getting there...
Platforms tested:
    Linux

1 files changed, 41 insertions, 16 deletions

diff --git a/tools/lib/h5tools.h b/tools/lib/h5tools.h
index 2d04539..e338d04 100644
--- a/tools/lib/h5tools.h
+++ b/tools/lib/h5tools.h
@@ -329,6 +329,16 @@ typedef struct dump_header{
     const char *dataend;
     const char *softlinkbegin;
     const char *softlinkend;
+    const char *subsettingbegin;
+    const char *subsettingend;
+    const char *startbegin;
+    const char *startend;
+    const char *stridebegin;
+    const char *strideend;
+    const char *countbegin;
+    const char *countend;
+    const char *blockbegin;
+    const char *blockend;
 
     const char *fileblockbegin;
     const char *fileblockend;
@@ -356,6 +366,16 @@ typedef struct dump_header{
     const char *structblockend;
     const char *vlenblockbegin;
     const char *vlenblockend;
+    const char *subsettingblockbegin;
+    const char *subsettingblockend;
+    const char *startblockbegin;
+    const char *startblockend;
+    const char *strideblockbegin;
+    const char *strideblockend;
+    const char *countblockbegin;
+    const char *countblockend;
+    const char *blockblockbegin;
+    const char *blockblockend;
 
     const char *dataspacedescriptionbegin;
     const char *dataspacedescriptionend;
@@ -479,31 +499,36 @@ extern FILE   *rawdatastream;       /*output stream for raw data            */
 extern void    indentation(int);
 
 /* taken from h5dump.h*/
+#define ATTRIBUTE       "ATTRIBUTE"
+#define BLOCK           "BLOCK"
 #define BOOT_BLOCK      "BOOT_BLOCK"
-#define GROUPNAME       "GROUP"
+#define COMPRESSION     "COMPRESSION"
+#define CONCATENATOR    "//"
+#define COMPLEX         "COMPLEX"
+#define COUNT           "COUNT"
+#define CSET            "CSET"
+#define CTYPE           "CTYPE"
+#define DATA            "DATA"
 #define DATASET         "DATASET"
-#define ATTRIBUTE       "ATTRIBUTE"
-#define DATATYPE        "DATATYPE"
 #define DATASPACE       "DATASPACE"
-#define DATA            "DATA"
-#define SCALAR          "SCALAR"
-#define SIMPLE          "SIMPLE"
-#define COMPLEX         "COMPLEX"
-#define STORAGELAYOUT   "STORAGELAYOUT"
-#define COMPRESSION     "COMPRESSION"
+#define DATATYPE        "DATATYPE"
 #define EXTERNAL        "EXTERNAL"
-#define SOFTLINK        "SOFTLINK"
+#define FILENO          "FILENO"
+#define GROUPNAME       "GROUP"
 #define HARDLINK        "HARDLINK"
 #define NLINK           "NLINK"
-#define FILENO          "FILENO"
+#define OBJID           "OBJECTID"
 #define OBJNO           "OBJNO"
+#define SCALAR          "SCALAR"
+#define SIMPLE          "SIMPLE"
+#define SOFTLINK        "SOFTLINK"
+#define STORAGELAYOUT   "STORAGELAYOUT"
+#define START           "START"
+#define STRIDE          "STRIDE"
 #define STRSIZE         "STRSIZE"
 #define STRPAD          "STRPAD"
-#define CSET            "CSET"
-#define CTYPE           "CTYPE"
-#define CONCATENATOR    "//"
-#define DATASET         "DATASET"
-#define OBJID           "OBJECTID"
+#define SUBSET          "SUBSET"
+
 #define BEGIN           "{"
 #define END             "}"