[svn-r8622] Purpose:

h5dump new version

Description:
added the changes already made for 1.6
support for dumping of
1) filters
2) storage layout
3) fill value
4) comments
5) superblock
6) file contents
7) array indices


Solution:

Platforms tested:
linux
solaris
AIX

Misc. update:

3 files changed, 28 insertions, 5 deletions

diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c
index d34a4a2..a7e6ce4 100644
--- a/tools/lib/h5diff_attr.c
+++ b/tools/lib/h5diff_attr.c
@@ -65,7 +65,6 @@ int diff_attr(hid_t      loc1_id,
  char       name2[255];
  int        n1, n2, i, j, nfound;
  H5S_class_t    space_type1, space_type2;
- H5T_class_t    tclass1, tclass2;
  int        ret=0;
 
  if ((n1 = H5Aget_num_attrs(loc1_id))<0) 
diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c
index 6941c43..5906909 100644
--- a/tools/lib/h5tools.c
+++ b/tools/lib/h5tools.c
@@ -43,8 +43,7 @@
 
 #define ALIGN(A,Z)		((((A) + (Z) - 1) / (Z)) * (Z))
 
-#define START_OF_DATA		0x0001
-#define END_OF_DATA		0x0002
+
 
 /* global variables */
 int         indent;
@@ -500,7 +499,7 @@ h5tools_simple_prefix(FILE *stream, const h5dump_t *info,
  *      handled correctly.
  *-------------------------------------------------------------------------
  */
-static void
+void
 h5tools_dump_simple_data(FILE *stream, const h5dump_t *info, hid_t container,
                          h5tools_context_t *ctx/*in,out*/, unsigned flags,
                          hsize_t nelmts, hid_t type, void *_mem)
diff --git a/tools/lib/h5tools.h b/tools/lib/h5tools.h
index ce4b6f6..545db02 100644
--- a/tools/lib/h5tools.h
+++ b/tools/lib/h5tools.h
@@ -26,6 +26,8 @@
 #define ESCAPE_HTML             1
 #define OPT(X,S)                ((X) ? (X) : (S))
 #define OPTIONAL_LINE_BREAK     "\001"  /* Special strings embedded in the output */
+#define START_OF_DATA		0x0001
+#define END_OF_DATA		0x0002
 
 /*
  * Information about how to format output.
@@ -313,6 +315,9 @@ typedef struct h5dump_t {
     const char *dset_ptformat_pre;
     const char *dset_ptformat;
 
+     /*print array indices in output matrix */
+    int pindex;
+
 } h5dump_t;
 
 typedef struct dump_header{
@@ -437,7 +442,7 @@ extern FILE   *rawdatastream;       /*output stream for raw data            */
 /* taken from h5dump.h*/
 #define ATTRIBUTE       "ATTRIBUTE"
 #define BLOCK           "BLOCK"
-#define BOOT_BLOCK      "BOOT_BLOCK"
+#define SUPER_BLOCK     "SUPER_BLOCK"
 #define COMPRESSION     "COMPRESSION"
 #define CONCATENATOR    "//"
 #define COMPLEX         "COMPLEX"
@@ -466,6 +471,22 @@ extern FILE   *rawdatastream;       /*output stream for raw data            */
 #define STRPAD          "STRPAD"
 #define SUBSET          "SUBSET"
 
+#define FILTERS         "FILTERS"
+#define DEFLATE         "COMPRESSION DEFLATE"
+#define DEFLATE_LEVEL   "LEVEL"
+#define SHUFFLE         "PREPROCESSING SHUFFLE"
+#define FLETCHER32      "CHECKSUM FLETCHER32"
+#define SZIP            "COMPRESSION SZIP"
+#define UNKNOWN_FILTER  "UNKNOWN_FILTER"
+#define STORAGE_LAYOUT  "STORAGE_LAYOUT"
+#define CONTIGUOUS      "CONTIGUOUS"
+#define COMPACT         "COMPACT"
+#define CHUNKED         "CHUNKED"
+#define EXTERNAL_FILE   "EXTERNAL_FILE"
+#define FILLVALUE       "FILLVALUE"
+#define FILE_CONTENTS   "FILE_CONTENTS"
+
+
 #define BEGIN           "{"
 #define END             "}"
 
@@ -480,6 +501,10 @@ extern int      h5tools_dump_dset(FILE *stream, const h5dump_t *info, hid_t dset
 extern int      h5tools_dump_mem(FILE *stream, const h5dump_t *info, hid_t obj_id,
                                  hid_t type, hid_t space, void *mem, int indentlevel);
 
+extern void     h5tools_dump_simple_data(FILE *stream, const h5dump_t *info, hid_t container,
+                         h5tools_context_t *ctx/*in,out*/, unsigned flags,
+                         hsize_t nelmts, hid_t type, void *_mem);
+
 extern int      h5tools_canreadf(const char* name,
                                  hid_t dcpl_id);