[svn-r14190]

Bug fixes
Avoid passing iteration flags on the dump_group function parameters but instead inspect the groups's property list just before calling H5Literate and H5Aiterate, in this later case checking the creation order flags with H5Pget_attr_creation_order

Tested: windows, linux

5 files changed, 52 insertions, 4 deletions

diff --git a/tools/testfiles/torderattr.h5 b/tools/testfiles/torderattr.h5
index 73ea951..57b1a87 100644
--- a/tools/testfiles/torderattr.h5
+++ b/tools/testfiles/torderattr.h5
diff --git a/tools/testfiles/torderattr1.ddl b/tools/testfiles/torderattr1.ddl
index 77eff5a..5572ef1 100644
--- a/tools/testfiles/torderattr1.ddl
+++ b/tools/testfiles/torderattr1.ddl
@@ -3,6 +3,18 @@ Expected output for 'h5dump -H --sort_by=name --sort_order=ascending torderattr.
 #############################
 HDF5 "torderattr.h5" {
 GROUP "/" {
+   ATTRIBUTE "a" {
+      DATATYPE  H5T_STD_U8LE
+      DATASPACE  SCALAR
+   }
+   ATTRIBUTE "b" {
+      DATATYPE  H5T_STD_U8LE
+      DATASPACE  SCALAR
+   }
+   ATTRIBUTE "c" {
+      DATATYPE  H5T_STD_U8LE
+      DATASPACE  SCALAR
+   }
    DATASET "dset" {
       DATATYPE  H5T_STD_U8LE
       DATASPACE  SCALAR
diff --git a/tools/testfiles/torderattr2.ddl b/tools/testfiles/torderattr2.ddl
index fd4160b..c0862ed 100644
--- a/tools/testfiles/torderattr2.ddl
+++ b/tools/testfiles/torderattr2.ddl
@@ -3,6 +3,18 @@ Expected output for 'h5dump -H --sort_by=name --sort_order=descending torderattr
 #############################
 HDF5 "torderattr.h5" {
 GROUP "/" {
+   ATTRIBUTE "c" {
+      DATATYPE  H5T_STD_U8LE
+      DATASPACE  SCALAR
+   }
+   ATTRIBUTE "b" {
+      DATATYPE  H5T_STD_U8LE
+      DATASPACE  SCALAR
+   }
+   ATTRIBUTE "a" {
+      DATATYPE  H5T_STD_U8LE
+      DATASPACE  SCALAR
+   }
    DATATYPE "t"       H5T_STD_I32LE;
       ATTRIBUTE "c" {
          DATATYPE  H5T_STD_U8LE
diff --git a/tools/testfiles/torderattr3.ddl b/tools/testfiles/torderattr3.ddl
index d14ec74..146767c 100644
--- a/tools/testfiles/torderattr3.ddl
+++ b/tools/testfiles/torderattr3.ddl
@@ -3,6 +3,18 @@ Expected output for 'h5dump -H --sort_by=creation_order --sort_order=ascending t
 #############################
 HDF5 "torderattr.h5" {
 GROUP "/" {
+   ATTRIBUTE "a" {
+      DATATYPE  H5T_STD_U8LE
+      DATASPACE  SCALAR
+   }
+   ATTRIBUTE "b" {
+      DATATYPE  H5T_STD_U8LE
+      DATASPACE  SCALAR
+   }
+   ATTRIBUTE "c" {
+      DATATYPE  H5T_STD_U8LE
+      DATASPACE  SCALAR
+   }
    DATASET "dset" {
       DATATYPE  H5T_STD_U8LE
       DATASPACE  SCALAR
@@ -20,7 +32,7 @@ GROUP "/" {
       }
    }
    GROUP "g" {
-      ATTRIBUTE "a" {
+      ATTRIBUTE "c" {
          DATATYPE  H5T_STD_U8LE
          DATASPACE  SCALAR
       }
@@ -28,7 +40,7 @@ GROUP "/" {
          DATATYPE  H5T_STD_U8LE
          DATASPACE  SCALAR
       }
-      ATTRIBUTE "c" {
+      ATTRIBUTE "a" {
          DATATYPE  H5T_STD_U8LE
          DATASPACE  SCALAR
       }
diff --git a/tools/testfiles/torderattr4.ddl b/tools/testfiles/torderattr4.ddl
index 032c912..cd46d41 100644
--- a/tools/testfiles/torderattr4.ddl
+++ b/tools/testfiles/torderattr4.ddl
@@ -3,6 +3,18 @@ Expected output for 'h5dump -H --sort_by=creation_order --sort_order=descending
 #############################
 HDF5 "torderattr.h5" {
 GROUP "/" {
+   ATTRIBUTE "c" {
+      DATATYPE  H5T_STD_U8LE
+      DATASPACE  SCALAR
+   }
+   ATTRIBUTE "b" {
+      DATATYPE  H5T_STD_U8LE
+      DATASPACE  SCALAR
+   }
+   ATTRIBUTE "a" {
+      DATATYPE  H5T_STD_U8LE
+      DATASPACE  SCALAR
+   }
    DATATYPE "t"       H5T_STD_I32LE;
       ATTRIBUTE "a" {
          DATATYPE  H5T_STD_U8LE
@@ -18,7 +30,7 @@ GROUP "/" {
       }
 
    GROUP "g" {
-      ATTRIBUTE "c" {
+      ATTRIBUTE "a" {
          DATATYPE  H5T_STD_U8LE
          DATASPACE  SCALAR
       }
@@ -26,7 +38,7 @@ GROUP "/" {
          DATATYPE  H5T_STD_U8LE
          DATASPACE  SCALAR
       }
-      ATTRIBUTE "a" {
+      ATTRIBUTE "c" {
          DATATYPE  H5T_STD_U8LE
          DATASPACE  SCALAR
       }