From 78d22e2c4434549b57a312fa96c91c09b37ae7d6 Mon Sep 17 00:00:00 2001
From: Neil Fortner <nfortne2@hdfgroup.org>
Date: Tue, 8 Jul 2008 11:19:52 -0500
Subject: [svn-r15335] Fixed incorrect error message in H5Pset_fletcher32:
 "unable to add deflate filter to pipeline" -> "unable to add fletcher32
 filter to pipeline"

Tested: kagiso
---
 src/H5Pdcpl.c         |  2 +-
 tools/h5dump/h5dump.c | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c
index 9501019..b971174 100644
--- a/src/H5Pdcpl.c
+++ b/src/H5Pdcpl.c
@@ -2034,7 +2034,7 @@ H5Pset_fletcher32(hid_t plist_id)
     if(H5P_get(plist, H5D_CRT_DATA_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get pipeline")
     if(H5Z_append(&pline, H5Z_FILTER_FLETCHER32, H5Z_FLAG_MANDATORY, (size_t)0, NULL) < 0)
-        HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to add deflate filter to pipeline")
+        HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to add fletcher32 filter to pipeline")
     if(H5P_set(plist, H5D_CRT_DATA_PIPELINE_NAME, &pline) < 0)
         HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to set pipeline")
 
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index aa44cc1..76e04b1 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -894,7 +894,7 @@ print_datatype(hid_t type,unsigned in_group)
                 is_vlstr = H5Tis_variable_str(tmp_type);
 
                 printf("H5T_STRING %s\n", dump_header_format->strblockbegin);
-                indent += COL;
+                /*indent += COL;*/
 
                 indentation(indent + COL);
                 if(is_vlstr)
@@ -983,8 +983,8 @@ print_datatype(hid_t type,unsigned in_group)
                 H5Tclose(str_type);
                 H5Tclose(tmp_type);
 
-                indent -= COL;
-                indentation(indent + COL);
+                /*indent -= COL;*/
+                indentation(indent/* + COL*/);
                 printf("%s", dump_header_format->strblockend);
                 break;
 
@@ -1029,12 +1029,12 @@ print_datatype(hid_t type,unsigned in_group)
                     mtype = H5Tget_member_type(type, i);
                     indentation(indent + COL);
 
-                    if (H5Tget_class(mtype) == H5T_COMPOUND)
+                    /*if (H5Tget_class(mtype) == H5T_COMPOUND)*/
                         indent += COL;
 
                     print_datatype(mtype,0);
 
-                    if (H5Tget_class(mtype) == H5T_COMPOUND)
+                    /*if (H5Tget_class(mtype) == H5T_COMPOUND)*/
                         indent -= COL;
 
                     printf(" \"%s\";\n", mname);
@@ -1051,21 +1051,23 @@ print_datatype(hid_t type,unsigned in_group)
 
             case H5T_ENUM:
                 printf("H5T_ENUM %s\n", dump_header_format->enumblockbegin);
-                indent += COL;
+                /*indent += COL;*/
                 indentation(indent + COL);
                 super = H5Tget_super(type);
                 print_datatype(super,0);
                 printf(";\n");
                 print_enum(type);
-                indent -= COL;
-                indentation(indent + COL);
+                /*indent -= COL;*/
+                indentation(indent/* + COL*/);
                 printf("%s", dump_header_format->enumblockend);
                 break;
 
             case H5T_VLEN:
                 printf("H5T_VLEN %s ", dump_header_format->vlenblockbegin);
                 super = H5Tget_super(type);
+                indent += COL;
                 print_datatype(super,0);
+                indent -= COL;
                 H5Tclose(super);
 
                 /* Print closing */
@@ -1090,7 +1092,9 @@ print_datatype(hid_t type,unsigned in_group)
                 printf(" ");
 
                 /* Print base type */
+                indent += COL;
                 print_datatype(super,0);
+                indent -= COL;
 
                 /* Close array base type */
                 H5Tclose(super);
-- 
cgit v0.12