[svn-r12700] Alert:

    File format is not stable, don't keep files produced!

Description:
    First stage of checkins modifying the format of groups to support creation
order.  Implement "dense" storage for links in groups.

    Try to clarify some of the symbols for the H5L API.

    Add the H5Pset_latest_format() flag for FAPLs, to choose to use the newest
file format options (including "dense" link storage in groups)

    Add the H5Pset_track_creation_order() flag for GCPLs, to enable creation
order tracking in groups (although no index on creation order yet).

    Remove --enable-group-revision configure flag, as file format issues are
now handled in a backwardly/forwardly compatible way.

    Clean up lots of compiler warnings and other minor formatting issues.

Tested on:
    FreeBSD/32 4.11 (sleipnir) w/threadsafe
    Linux/32 2.4 (heping) w/FORTRAN & C++
    Linux/64 2.4 (mir) w/enable-v1.6 compa
    Mac OSX/32 10.4.8 (amazon)
    AIX 5.3 (copper) w/parallel & FORTRAN

25 files changed, 194 insertions, 186 deletions

diff --git a/tools/h5diff/h5diffgentest.c b/tools/h5diff/h5diffgentest.c
index 1811b9d..ac2fb65 100644
--- a/tools/h5diff/h5diffgentest.c
+++ b/tools/h5diff/h5diffgentest.c
@@ -49,8 +49,8 @@ static hid_t UD_traverse(UNUSED const char * link_name, UNUSED hid_t cur_group,
 {
 return -1;
 }
-const H5L_link_class_t UD_link_class[1] = {{
-    H5L_LINK_CLASS_T_VERS,    /* H5L_link_class_t version       */
+const H5L_class_t UD_link_class[1] = {{
+    H5L_LINK_CLASS_T_VERS,    /* H5L_class_t version       */
     MY_LINKCLASS,             /* Link type id number            */
     "UD link class",          /* name for debugging             */
     NULL,                     /* Creation callback              */
@@ -2242,8 +2242,8 @@ int test_types(const char *file1,
  *-------------------------------------------------------------------------
  */
 
- status = H5Glink(fid1, H5L_LINK_SOFT, "g1", "l1");
- status = H5Glink(fid1, H5L_LINK_SOFT, "g2", "l2");
+ status = H5Glink(fid1, H5L_TYPE_SOFT, "g1", "l1");
+ status = H5Glink(fid1, H5L_TYPE_SOFT, "g2", "l2");
 
 /*-------------------------------------------------------------------------
  * H5G_UDLINK
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index 3d1d2cd..979ddc9 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -1544,9 +1544,9 @@ dump_all(hid_t group, const char *name, void * op_data)
         case H5G_UDLINK:
         {
             indentation(indent);
-            switch(linfo.linkclass)
+            switch(linfo.type)
             {
-              case H5L_LINK_EXTERNAL:
+              case H5L_TYPE_EXTERNAL:
               {
                 char *targbuf;
                 char *filename;
@@ -1569,7 +1569,7 @@ dump_all(hid_t group, const char *name, void * op_data)
                     } else {
                       if (!doxml) {
                           indentation(indent + COL);
-                          printf("LINKCLASS %d\n", linfo.linkclass);
+                          printf("LINKCLASS %d\n", linfo.type);
                           indentation(indent + COL);
                           printf("TARGETFILE \"%s\"\n", filename);
                           indentation(indent + COL);
@@ -1625,7 +1625,7 @@ dump_all(hid_t group, const char *name, void * op_data)
                       indentation(indent + COL);
                   }
                   if (!doxml) {
-                      printf("LINKCLASS %d\n", linfo.linkclass);
+                      printf("LINKCLASS %d\n", linfo.type);
                   }
                   else /* XML */
                   {
@@ -1648,7 +1648,7 @@ dump_all(hid_t group, const char *name, void * op_data)
                                 t_name,             /* LinkName */
                                 linkxid,            /* OBJ-XID */
                                 t_obj_path,         /* H5SourcePath */
-                                linfo.linkclass,    /* LinkClass */
+                                linfo.type,    /* LinkClass */
                                 parentxid,          /* Parents */
                                 t_prefix);          /* H5ParentPaths */
                     HDfree(t_prefix);
@@ -3237,14 +3237,14 @@ handle_links(hid_t fid, char *links, void UNUSED * data)
         begin_obj(dump_header_format->udlinkbegin, links,
                   dump_header_format->udlinkblockbegin);
         indentation(COL);
-        switch(linfo.linkclass) {
-          case H5L_LINK_EXTERNAL:
+        switch(linfo.type) {
+          case H5L_TYPE_EXTERNAL:
               begin_obj(dump_header_format->extlinkbegin, links,
                         dump_header_format->extlinkblockbegin);
               if (H5Lget_linkval(fid, links, statbuf.linklen, buf, H5P_DEFAULT) >= 0) {
                   if(H5Lunpack_elink_val(buf, &elink_file, &elink_path)>=0) {
                       indentation(COL);
-                      printf("LINKCLASS %d\n", linfo.linkclass);
+                      printf("LINKCLASS %d\n", linfo.type);
                       indentation(COL);
                       printf("TARGETFILE \"%s\"\n", elink_file);
                       indentation(COL);
@@ -3266,7 +3266,7 @@ handle_links(hid_t fid, char *links, void UNUSED * data)
               begin_obj(dump_header_format->udlinkbegin, links,
                         dump_header_format->udlinkblockbegin);
               indentation(COL);
-              printf("LINKCLASS %d\n", linfo.linkclass);
+              printf("LINKCLASS %d\n", linfo.type);
               end_obj(dump_header_format->udlinkend,
                       dump_header_format->udlinkblockend);
         }
diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c
index 572558f..70372da 100644
--- a/tools/h5dump/h5dumpgentest.c
+++ b/tools/h5dump/h5dumpgentest.c
@@ -131,8 +131,8 @@ return -1;
 
 #define MY_LINKCLASS 187
 
-const H5L_link_class_t UD_link_class[1] = {{
-    H5L_LINK_CLASS_T_VERS,    /* H5L_link_class_t version       */
+const H5L_class_t UD_link_class[1] = {{
+    H5L_LINK_CLASS_T_VERS,    /* H5L_class_t version       */
     MY_LINKCLASS,             /* Link type id number            */
     "UD link class",          /* name for debugging             */
     NULL,                     /* Creation callback              */
@@ -426,8 +426,8 @@ static void gent_softlink(void)
 
     fid = H5Fcreate(FILE4, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
     root = H5Gopen (fid, "/");
-    H5Glink (root, H5L_LINK_SOFT, "somevalue", "slink1");
-    H5Glink (root, H5L_LINK_SOFT, "linkvalue", "slink2");
+    H5Glink (root, H5L_TYPE_SOFT, "somevalue", "slink1");
+    H5Glink (root, H5L_TYPE_SOFT, "linkvalue", "slink2");
 
     H5Gclose(root);
     H5Fclose(fid);
@@ -464,15 +464,15 @@ static void gent_hardlink(void)
     H5Dclose(dataset);
 
     group = H5Gcreate (fid, "/g1", 0);
-    H5Glink (group, H5L_LINK_HARD, "/dset1", "dset2");
+    H5Glink (group, H5L_TYPE_HARD, "/dset1", "dset2");
     H5Gclose(group);
 
     group = H5Gcreate (fid, "/g2", 0);
-    H5Glink (group, H5L_LINK_HARD, "/dset1", "dset3");
+    H5Glink (group, H5L_TYPE_HARD, "/dset1", "dset3");
     H5Gclose(group);
 
     group = H5Gopen(fid, "/g1");
-    H5Glink (group, H5L_LINK_HARD, "/g2", "g1.1");
+    H5Glink (group, H5L_TYPE_HARD, "/g2", "g1.1");
     H5Gclose(group);
     H5Fclose(fid);
 }
@@ -888,13 +888,14 @@ g2 : dset2.1  dset2.2 udlink
 
 */
 
-static void gent_all(void) {
-hid_t fid, group, attr, dataset, space;
-hsize_t dims[2];
-int data[2][2], dset1[10][10], dset2[20];
-char buf[60];
-int i, j;
-float dset2_1[10], dset2_2[3][5];
+static void gent_all(void)
+{
+    hid_t fid, group, attr, dataset, space;
+    hsize_t dims[2];
+    int data[2][2], dset1[10][10], dset2[20];
+    char buf[60];
+    int i, j;
+    float dset2_1[10], dset2_2[3][5];
 
   fid = H5Fcreate(FILE7, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
@@ -983,7 +984,7 @@ float dset2_1[10], dset2_2[3][5];
 
   /* soft link */
   group = H5Gopen (fid, "/g1/g1.2/g1.2.1");
-  H5Glink (group, H5L_LINK_SOFT, "somevalue", "slink");
+  H5Glink (group, H5L_TYPE_SOFT, "somevalue", "slink");
   H5Gclose(group);
 
   group = H5Gopen (fid, "/g2");
@@ -1040,8 +1041,8 @@ hid_t fid, group;
   group = H5Gcreate (fid, "/g2", 0);
   H5Gclose(group);
 
-  H5Glink(fid, H5L_LINK_HARD, "/g2", "/g1/g1.1");
-  H5Glink(fid, H5L_LINK_HARD, "/g1", "/g2/g2.1");
+  H5Glink(fid, H5L_TYPE_HARD, "/g2", "/g1/g1.1");
+  H5Glink(fid, H5L_TYPE_HARD, "/g1", "/g2/g2.1");
 
   H5Fclose(fid);
 }
@@ -1060,10 +1061,10 @@ hid_t fid, group;
   H5Gclose(group);
 
   /* create path from object at /g1 to object at /g2 and name it g1.1 */
-  H5Glink (fid, H5L_LINK_HARD, "/g2", "/g1/g1.1");
+  H5Glink (fid, H5L_TYPE_HARD, "/g2", "/g1/g1.1");
 
   /* create path from object at /g2 to object at /g1 and name it g2.1 */
-  H5Glink (fid, H5L_LINK_SOFT, "/g1", "/g2/g2.1");
+  H5Glink (fid, H5L_TYPE_SOFT, "/g1", "/g2/g2.1");
 
   H5Fclose(fid);
 
@@ -1080,7 +1081,8 @@ hid_t fid, group;
       (dset1)                               (udlink)
 */
 
-static void gent_many(void) {
+static void gent_many(void)
+{
     hid_t fid, group, attr, dataset, space, space2, type, create_plist, type2;
     hid_t array_dt;
     hsize_t dims[2];
@@ -1210,11 +1212,11 @@ static void gent_many(void) {
   H5Gclose(group);
 
   group = H5Gcreate (fid, "/g1/g1.2", 0);
-  H5Glink (group, H5L_LINK_HARD, "/g1/g1.1/dset1", "link1");
+  H5Glink (group, H5L_TYPE_HARD, "/g1/g1.1/dset1", "link1");
   H5Gclose(group);
 
   group = H5Gcreate (fid, "/g2", 0);
-  H5Glink (group, H5L_LINK_SOFT, "/g1", "slink2");
+  H5Glink (group, H5L_TYPE_SOFT, "/g1", "slink2");
   H5Gclose(group);
 
   group = H5Gcreate (fid, "/g3", 0);
@@ -1238,7 +1240,7 @@ static void gent_many(void) {
   H5Gclose(group);
 
   group = H5Gopen(fid, "/g3");
-  H5Glink (group, H5L_LINK_HARD, "/g4/dset2", "link3");
+  H5Glink (group, H5L_TYPE_HARD, "/g4/dset2", "link3");
   H5Gclose(group);
 
   group = H5Gcreate (fid, "/g5", 0);
@@ -1261,7 +1263,7 @@ static void gent_many(void) {
   H5Gclose(group);
 
   group = H5Gopen(fid, "/g5");
-  H5Glink (group, H5L_LINK_SOFT, "/g6/dset3", "slink4");
+  H5Glink (group, H5L_TYPE_SOFT, "/g6/dset3", "slink4");
   H5Gclose(group);
   H5Pclose(create_plist);
 
@@ -1276,14 +1278,15 @@ static void gent_many(void) {
   H5Lcreate_ud(fid, "/g8/udlink", MY_LINKCLASS, NULL, 0, H5P_DEFAULT, H5P_DEFAULT);
 
   /* Create links to external and UD links */
-  ret= H5Glink (fid, H5L_LINK_SOFT, "/g8/elink", "/g7/slink5");
+  ret= H5Glink (fid, H5L_TYPE_SOFT, "/g8/elink", "/g7/slink5");
   HDassert(ret >= 0);
-  ret= H5Glink (fid, H5L_LINK_SOFT, "/g8/udlink", "/g7/slink6");
+  ret= H5Glink (fid, H5L_TYPE_SOFT, "/g8/udlink", "/g7/slink6");
   HDassert(ret >= 0);
 
   H5Fclose(fid);
 
 }
+
 static hid_t mkstr(int size, H5T_str_t pad) {
 hid_t type;
 
@@ -5003,39 +5006,39 @@ static void gent_fcontents(void)
 
  /* hard link to "dset" */
  gid1 = H5Gcreate (fid, "/g1", 0);
- H5Glink (gid1, H5L_LINK_HARD, "/dset", "dset1");
+ H5Glink (gid1, H5L_TYPE_HARD, "/dset", "dset1");
  H5Gclose(gid1);
 
 
  /* hard link to "dset" */
  gid1 = H5Gcreate (fid, "/g2", 0);
- H5Glink (gid1, H5L_LINK_HARD, "/dset", "dset2");
+ H5Glink (gid1, H5L_TYPE_HARD, "/dset", "dset2");
  H5Gclose(gid1);
 
 
  /* hard link to "g2" */
  gid1 = H5Gopen(fid, "/g1");
- H5Glink (gid1, H5L_LINK_HARD, "/g2", "g1.1");
+ H5Glink (gid1, H5L_TYPE_HARD, "/g2", "g1.1");
  H5Gclose(gid1);
 
 
  /* hard link to "dset" */
- ret=H5Glink (fid, H5L_LINK_HARD, "/dset", "dset3");
+ ret=H5Glink (fid, H5L_TYPE_HARD, "/dset", "dset3");
  assert(ret>=0);
 
 
  /* hard link to "dset" */
- ret=H5Glink (fid, H5L_LINK_HARD, "/dset", "dset4");
+ ret=H5Glink (fid, H5L_TYPE_HARD, "/dset", "dset4");
  assert(ret>=0);
 
 
  /* soft link to itself */
- ret=H5Glink (fid, H5L_LINK_SOFT, "mylink", "mylink");
+ ret=H5Glink (fid, H5L_TYPE_SOFT, "mylink", "mylink");
  assert(ret>=0);
 
 
  /* soft link to "dset" */
- ret=H5Glink (fid, H5L_LINK_SOFT, "/dset", "softlink");
+ ret=H5Glink (fid, H5L_TYPE_SOFT, "/dset", "softlink");
  assert(ret>=0);
 
  /* dangling external link */
diff --git a/tools/h5jam/h5jamgentest.c b/tools/h5jam/h5jamgentest.c
index dd80c29..1f47bea 100644
--- a/tools/h5jam/h5jamgentest.c
+++ b/tools/h5jam/h5jamgentest.c
@@ -121,17 +121,18 @@ typedef struct s1_t {
 #define VLSTR_TYPE      "vl_string_type"
 
 /* A UD link traversal function.  Shouldn't actually be called. */
-static hid_t UD_traverse(const char * link_name, hid_t cur_group, void * udata, size_t udata_size, hid_t lapl_id)
+static hid_t UD_traverse(const char UNUSED * link_name, hid_t UNUSED cur_group, void UNUSED * udata, size_t UNUSED udata_size, hid_t UNUSED lapl_id)
 {
 return -1;
 }
 #define MY_LINKCLASS 187
-const H5L_link_class_t UD_link_class[1] = {{
-    H5L_LINK_CLASS_T_VERS,    /* H5L_link_class_t version       */
+const H5L_class_t UD_link_class[1] = {{
+    H5L_LINK_CLASS_T_VERS,    /* H5L_class_t version       */
     MY_LINKCLASS,             /* Link type id number            */
     "UD link class",          /* name for debugging             */
     NULL,                     /* Creation callback              */
     NULL,                     /* Move/rename callback           */
+    NULL,                     /* Copy callback                  */
     UD_traverse,              /* The actual traversal function  */
     NULL,                     /* Deletion callback              */
     NULL                      /* Query callback                 */
@@ -156,21 +157,24 @@ g2 : dset2.1  dset2.2 udlink
 
 */
 
-static void gent_ub(const char * filename, int ub_size, int ub_fill) {
-hid_t fid, group, attr, dataset, space;
-hid_t create_plist;
-hsize_t dims[2];
-int data[2][2], dset1[10][10], dset2[20];
-char buf[BUF_SIZE];
-int i, j;
-float dset2_1[10], dset2_2[3][5];
-int fd;
-char *bp;
+static void
+gent_ub(const char * filename, size_t ub_size, size_t ub_fill)
+{
+    hid_t fid, group, attr, dataset, space;
+    hid_t create_plist;
+    hsize_t dims[2];
+    int data[2][2], dset1[10][10], dset2[20];
+    char buf[BUF_SIZE];
+    int i, j;
+    size_t u;
+    float dset2_1[10], dset2_2[3][5];
+    int fd;
+    char *bp;
 
   if(ub_size > 0)
   {
       create_plist = H5Pcreate(H5P_FILE_CREATE);
-      H5Pset_userblock(create_plist,(hsize_t)ub_size);
+      H5Pset_userblock(create_plist, (hsize_t)ub_size);
       fid = H5Fcreate(filename, H5F_ACC_TRUNC, create_plist, H5P_DEFAULT);
   }
   else
@@ -179,23 +183,23 @@ char *bp;
   }
 
   /* create groups */
-  group = H5Gcreate (fid, "/g1", 0);
+  group = H5Gcreate(fid, "/g1", (size_t)0);
   H5Gclose(group);
 
-  group = H5Gcreate (fid, "/g2", 0);
+  group = H5Gcreate(fid, "/g2", (size_t)0);
   H5Gclose(group);
 
-  group = H5Gcreate (fid, "/g1/g1.1", 0);
+  group = H5Gcreate(fid, "/g1/g1.1", (size_t)0);
   H5Gclose(group);
 
-  group = H5Gcreate (fid, "/g1/g1.2", 0);
+  group = H5Gcreate(fid, "/g1/g1.2", (size_t)0);
   H5Gclose(group);
 
-  group = H5Gcreate (fid, "/g1/g1.2/g1.2.1", 0);
+  group = H5Gcreate(fid, "/g1/g1.2/g1.2.1", (size_t)0);
   H5Gclose(group);
 
   /* root attributes */
-  group = H5Gopen (fid, "/");
+  group = H5Gopen(fid, "/");
 
   dims[0] = 10;
   space = H5Screate_simple(1, dims, NULL);
@@ -263,7 +267,7 @@ char *bp;
 
   /* soft link */
   group = H5Gopen (fid, "/g1/g1.2/g1.2.1");
-  H5Glink (group, H5L_LINK_SOFT, "somevalue", "slink");
+  H5Glink (group, H5L_TYPE_SOFT, "somevalue", "slink");
   H5Gclose(group);
 
   group = H5Gopen (fid, "/g2");
@@ -293,38 +297,37 @@ char *bp;
 
   /* user-defined link */
   H5Lregister(UD_link_class);
-  H5Lcreate_ud(fid, "/g2/udlink", MY_LINKCLASS, NULL, 0, H5P_DEFAULT, H5P_DEFAULT);
+  H5Lcreate_ud(fid, "/g2/udlink", MY_LINKCLASS, NULL, (size_t)0, H5P_DEFAULT, H5P_DEFAULT);
 
   H5Fclose(fid);
 
   /* If a user block is being used, write to it here */
   if(ub_size > 0)
   {
-        HDassert(ub_size < BUF_SIZE);
+        HDassert(ub_size <= BUF_SIZE);
+
+	fd = HDopen(filename, O_RDWR, 0);
+        HDassert(fd >= 0);
 
-	fd = HDopen(filename,O_RDWR, 0);
-	if (fd < 0) {
-		/* panic */
-	}
 	/* fill buf with pattern */
-	memset(buf,'\0',ub_size);
+	HDmemset(buf, '\0', ub_size);
 	bp = buf;
-	for (i = 0; i < ub_fill; i++) {
-		*bp++ = pattern[i%10];
-	}
+	for (u = 0; u < ub_fill; u++)
+            *bp++ = pattern[u % 10];
 
-	HDwrite(fd,buf,ub_size);
+	HDwrite(fd, buf, ub_size);
 
 	close(fd);
   }
 }
 
 static void
-create_textfile(const char *name, size_t size) {
-char *buf;
-int fd;
-size_t i;
-char *bp;
+create_textfile(const char *name, size_t size)
+{
+    char *buf;
+    int fd;
+    size_t i;
+    char *bp;
 
 	#ifdef WIN32
 	fd = _creat(name, _S_IREAD | _S_IWRITE);
@@ -334,7 +337,7 @@ char *bp;
 	if (fd < 0) {
 		/* panic */
 	}
-	buf = calloc(size,1);
+	buf = calloc(size, (size_t)1);
 	if (buf == NULL) {
 		/* panic */
 	}
@@ -353,29 +356,27 @@ char *bp;
 #ifdef notdef
 /* not used yet */
 void
-create_binfile(char *name, off_t size) {
-char *buf;
-int fd;
-int i;
-char *bp;
+create_binfile(char *name, off_t size)
+{
+    char *buf;
+    int fd;
+    int i;
+    char *bp;
 
-	fd = creat(name,0777);
-	if (fd < 0) {
-		/* panic */
-	}
-	buf = calloc(size,1);
-	if (buf == NULL) {
-		/* panic */
-	}
-	/* fill buf with pattern */
-	bp = buf;
-	for (i = 0; i < size; i++) {
-		*bp++ = (char) i & 0xff;
-	}
+    fd = creat(name,0777);
+    HDassert(fd >= 0);
 
-	HDwrite(fd,buf,size);
+    buf = calloc(size,1);
+    HDassert(buf);
 
-	close(fd);
+    /* fill buf with pattern */
+    bp = buf;
+    for (i = 0; i < size; i++)
+        *bp++ = (char) i & 0xff;
+
+    HDwrite(fd,buf,size);
+
+    close(fd);
 }
 #endif
 
@@ -390,30 +391,30 @@ int main(void)
 {
 
 /*
-create_textfile(UBTXT1,0);
+create_textfile(UBTXT1, (size_t)0);
 */
-create_textfile(UBTXT2,10);
-create_textfile(UBTXT3,511);
-create_textfile(UBTXT4,512);
-create_textfile(UBTXT5,513);
+create_textfile(UBTXT2, (size_t)10);
+create_textfile(UBTXT3, (size_t)511);
+create_textfile(UBTXT4, (size_t)512);
+create_textfile(UBTXT5, (size_t)513);
 /*
-create_textfile(UBTXT6,1023);
-create_textfile(UBTXT7,1024);
-create_textfile(UBTXT8,1025);
-create_textfile(UBTXT9,2047);
-create_textfile(UBTXT10,2048);
-create_textfile(UBTXT11,2049);
-
-create_binfile(UBBIN1,0);
-create_binfile(UBBIN2,10);
-create_binfile(UBBIN3,511);
-create_binfile(UBBIN4,512);
-create_binfile(UBBIN5,513);
+create_textfile(UBTXT6, (size_t)1023);
+create_textfile(UBTXT7, (size_t)1024);
+create_textfile(UBTXT8, (size_t)1025);
+create_textfile(UBTXT9, (size_t)2047);
+create_textfile(UBTXT10, (size_t)2048);
+create_textfile(UBTXT11, (size_t)2049);
+
+create_binfile(UBBIN1, (off_t)0);
+create_binfile(UBBIN2, (off_t)10);
+create_binfile(UBBIN3, (off_t)511);
+create_binfile(UBBIN4, (off_t)512);
+create_binfile(UBBIN5, (off_t)513);
 
 */
-    gent_ub(FILE7, 0, 0);
-    gent_ub(FILE8, 512, strlen(pattern));
-    gent_ub(FILE9, 1024, 513);
+    gent_ub(FILE7, (size_t)0, (size_t)0);
+    gent_ub(FILE8, (size_t)512, HDstrlen(pattern));
+    gent_ub(FILE9, (size_t)1024, (size_t)513);
 
     return 0;
 }
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index b568bc9..978baf2 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -1770,10 +1770,10 @@ udlink_open(hid_t location, const char *name)
 
     if(H5Lget_linkinfo(location, name, &linfo, H5P_DEFAULT) < 0) return -1;
 
-    switch(linfo.linkclass)
+    switch(linfo.type)
     {
       /* For external links, try to display info for the object it points to */
-      case H5L_LINK_EXTERNAL:
+      case H5L_TYPE_EXTERNAL:
         if ((buf = HDmalloc(linfo.u.link_size))==NULL) goto error;
         if (H5Lget_linkval (location, name, sizeof(buf), buf, H5P_DEFAULT)<0) goto error;
 
diff --git a/tools/h5repack/h5repack_refs.c b/tools/h5repack/h5repack_refs.c
index 4884e04..73fb2fc 100644
--- a/tools/h5repack/h5repack_refs.c
+++ b/tools/h5repack/h5repack_refs.c
@@ -93,7 +93,7 @@ int do_copy_refobjs(hid_t fidin,
     for ( j=0; j<travt->objs[i].nlinks; j++)
     {
       H5Glink(fidout,
-      H5L_LINK_HARD,
+      H5L_TYPE_HARD,
       travt->objs[i].name,
       travt->objs[i].links[j].new_name);
     }
@@ -339,7 +339,7 @@ int do_copy_refobjs(hid_t fidin,
    {
     for ( j=0; j<travt->objs[i].nlinks; j++){
      H5Glink(fidout,
-      H5L_LINK_HARD,
+      H5L_TYPE_HARD,
       travt->objs[i].name,
       travt->objs[i].links[j].new_name);
     }
diff --git a/tools/h5repack/testh5repack_dset.c b/tools/h5repack/testh5repack_dset.c
index ca0f0ca..244aaae 100644
--- a/tools/h5repack/testh5repack_dset.c
+++ b/tools/h5repack/testh5repack_dset.c
@@ -128,7 +128,7 @@ void write_dset_in(hid_t loc_id,
 
 
  /* create hard link */
- status = H5Glink(loc_id, H5L_LINK_HARD, "string", "string_link");
+ status = H5Glink(loc_id, H5L_TYPE_HARD, "string", "string_link");
 
 /*-------------------------------------------------------------------------
  * H5T_BITFIELD
diff --git a/tools/h5repack/testh5repack_main.c b/tools/h5repack/testh5repack_main.c
index 5299cd4..e219497 100644
--- a/tools/h5repack/testh5repack_main.c
+++ b/tools/h5repack/testh5repack_main.c
@@ -36,7 +36,7 @@
 const char *progname = "h5repacktst";
 int d_status = EXIT_SUCCESS;
 
-int main (int argc, char **argv)
+int main (int argc, const char *argv[])
 {
  pack_opt_t  pack_options;
  diff_opt_t  diff_options;
diff --git a/tools/h5repack/testh5repack_make.c b/tools/h5repack/testh5repack_make.c
index a74d466..e7a2948 100644
--- a/tools/h5repack/testh5repack_make.c
+++ b/tools/h5repack/testh5repack_make.c
@@ -259,7 +259,7 @@ int make_all_objects(hid_t loc_id)
  *-------------------------------------------------------------------------
  */
 
- H5Glink(loc_id, H5L_LINK_SOFT, "dset", "link");
+ H5Glink(loc_id, H5L_TYPE_SOFT, "dset", "link");
 
 /*-------------------------------------------------------------------------
  * H5G_UDLINK
@@ -357,11 +357,11 @@ int make_hlinks(hid_t loc_id)
 
  if (write_dset(loc_id,2,dims,"dset",H5T_NATIVE_INT,buf)<0)
   return -1;
- if (H5Glink(loc_id, H5L_LINK_HARD, "dset", "link1 to dset")<0)
+ if (H5Glink(loc_id, H5L_TYPE_HARD, "dset", "link1 to dset")<0)
   return -1;
- if (H5Glink(loc_id, H5L_LINK_HARD, "dset", "link2 to dset")<0)
+ if (H5Glink(loc_id, H5L_TYPE_HARD, "dset", "link2 to dset")<0)
   return -1;
- if (H5Glink(loc_id, H5L_LINK_HARD, "dset", "link3 to dset")<0)
+ if (H5Glink(loc_id, H5L_TYPE_HARD, "dset", "link3 to dset")<0)
   return -1;
 
 
@@ -377,9 +377,9 @@ int make_hlinks(hid_t loc_id)
  if ((group3_id = H5Gcreate(group2_id,"g3",0))<0)
   return -1;
 
- if (H5Glink2(loc_id, "g1", H5L_LINK_HARD, group2_id, "link1 to g1")<0)
+ if (H5Glink2(loc_id, "g1", H5L_TYPE_HARD, group2_id, "link1 to g1")<0)
   return -1;
- if (H5Glink2(group1_id, "g2", H5L_LINK_HARD, group3_id, "link1 to g2")<0)
+ if (H5Glink2(group1_id, "g2", H5L_TYPE_HARD, group3_id, "link1 to g2")<0)
   return -1;
 
  H5Gclose(group1_id);
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index 4fed814..c7f9265 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -1085,7 +1085,7 @@ hsize_t diff (hid_t file1_id,
     goto out;
 
    /* Only external links will have a query function registered */
-   if(li1.linkclass == H5L_LINK_EXTERNAL && li2.linkclass == H5L_LINK_EXTERNAL)
+   if(li1.type == H5L_TYPE_EXTERNAL && li2.type == H5L_TYPE_EXTERNAL)
    {
       buf1 = HDmalloc (li1.u.link_size);
       buf2 = HDmalloc (li2.u.link_size);
@@ -1134,7 +1134,7 @@ hsize_t diff (hid_t file1_id,
       /* If the link classes or the buffer length are not the
        * same, the links are "different"
        */
-      if((li1.linkclass != li2.linkclass) || (li1.u.link_size != li2.u.link_size))
+      if((li1.type != li2.type) || (li1.u.link_size != li2.u.link_size))
         nfound = 1;
       else
         nfound = 0;
diff --git a/tools/lib/h5trav.c b/tools/lib/h5trav.c
index 44553ee..8a6173c 100644
--- a/tools/lib/h5trav.c
+++ b/tools/lib/h5trav.c
@@ -511,7 +511,7 @@ static int traverse( hid_t loc_id,
     H5Lget_linkinfo( loc_id, path, &linkbuf, H5P_DEFAULT);
     } H5E_END_TRY;
 
-    if(linkbuf.linkclass == H5L_LINK_EXTERNAL)
+    if(linkbuf.type == H5L_TYPE_EXTERNAL)
     {
       if (statbuf.linklen>0)
       {
diff --git a/tools/misc/h5stat.c b/tools/misc/h5stat.c
index 15ab968..7d4045e 100644
--- a/tools/misc/h5stat.c
+++ b/tools/misc/h5stat.c
@@ -587,7 +587,11 @@ dataset_stats (hid_t group, const char *name, H5G_stat_t * _sb,  iter_t *_iter)
 
        if (nfltr == 0) iter->dset_comptype[0]++;
           for (u=0; u < (unsigned) nfltr; u++) {
+#ifdef H5_WANT_H5_V1_6_COMPAT
+               fltr = H5Pget_filter(dcpl, u, 0, 0, 0, 0, 0);
+#else /* H5_WANT_H5_V1_6_COMPAT */
                fltr = H5Pget_filter(dcpl, u, 0, 0, 0, 0, 0, NULL);
+#endif /* H5_WANT_H5_V1_6_COMPAT */
                if (fltr < (H5_NFILTERS_IMPL-1))
                  iter->dset_comptype[fltr]++;
                else
diff --git a/tools/testfiles/file3.h5 b/tools/testfiles/file3.h5
index a9eff83..99dee41 100644
--- a/tools/testfiles/file3.h5
+++ b/tools/testfiles/file3.h5
diff --git a/tools/testfiles/tall-2A.h5.xml b/tools/testfiles/tall-2A.h5.xml
index 586afb5..b357397 100644
--- a/tools/testfiles/tall-2A.h5.xml
+++ b/tools/testfiles/tall-2A.h5.xml
@@ -40,9 +40,9 @@ Expected output for 'h5dump --xml -A tall.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Attribute>
-   <hdf5:Group Name="g1" OBJ-XID="xid_792" H5Path="/g1" Parents="xid_96" H5ParentPaths="/" >
-      <hdf5:Group Name="g1.1" OBJ-XID="xid_2512" H5Path="/g1/g1.1" Parents="xid_792" H5ParentPaths="/g1" >
-         <hdf5:Dataset Name="dset1.1.1" OBJ-XID="xid_5432" H5Path= "/g1/g1.1/dset1.1.1" Parents="xid_2512" H5ParentPaths="/g1/g1.1">
+   <hdf5:Group Name="g1" OBJ-XID="xid_808" H5Path="/g1" Parents="xid_96" H5ParentPaths="/" >
+      <hdf5:Group Name="g1.1" OBJ-XID="xid_2560" H5Path="/g1/g1.1" Parents="xid_808" H5ParentPaths="/g1" >
+         <hdf5:Dataset Name="dset1.1.1" OBJ-XID="xid_5528" H5Path= "/g1/g1.1/dset1.1.1" Parents="xid_2560" H5ParentPaths="/g1/g1.1">
             <hdf5:StorageLayout>
                <hdf5:ContiguousLayout/>
             </hdf5:StorageLayout>
@@ -102,7 +102,7 @@ Expected output for 'h5dump --xml -A tall.h5'
                <hdf5:NoData/>
             </hdf5:Data>
          </hdf5:Dataset>
-         <hdf5:Dataset Name="dset1.1.2" OBJ-XID="xid_8272" H5Path= "/g1/g1.1/dset1.1.2" Parents="xid_2512" H5ParentPaths="/g1/g1.1">
+         <hdf5:Dataset Name="dset1.1.2" OBJ-XID="xid_8272" H5Path= "/g1/g1.1/dset1.1.2" Parents="xid_2560" H5ParentPaths="/g1/g1.1">
             <hdf5:StorageLayout>
                <hdf5:ContiguousLayout/>
             </hdf5:StorageLayout>
@@ -126,15 +126,15 @@ Expected output for 'h5dump --xml -A tall.h5'
             </hdf5:Data>
          </hdf5:Dataset>
       </hdf5:Group>
-      <hdf5:Group Name="g1.2" OBJ-XID="xid_3536" H5Path="/g1/g1.2" Parents="xid_792" H5ParentPaths="/g1" >
-         <hdf5:Group Name="g1.2.1" OBJ-XID="xid_4232" H5Path="/g1/g1.2/g1.2.1" Parents="xid_3536" H5ParentPaths="/g1/g1.2" >
-            <hdf5:SoftLink LinkName="slink" OBJ-XID="xid_18446744073709551614" H5SourcePath="/g1/g1.2/g1.2.1/slink" TargetPath="somevalue"  Parents="xid_4232" H5ParentPaths="/g1/g1.2/g1.2.1" />
+      <hdf5:Group Name="g1.2" OBJ-XID="xid_3600" H5Path="/g1/g1.2" Parents="xid_808" H5ParentPaths="/g1" >
+         <hdf5:Group Name="g1.2.1" OBJ-XID="xid_4312" H5Path="/g1/g1.2/g1.2.1" Parents="xid_3600" H5ParentPaths="/g1/g1.2" >
+            <hdf5:SoftLink LinkName="slink" OBJ-XID="xid_18446744073709551614" H5SourcePath="/g1/g1.2/g1.2.1/slink" TargetPath="somevalue"  Parents="xid_4312" H5ParentPaths="/g1/g1.2/g1.2.1" />
          </hdf5:Group>
-         <hdf5:ExternalLink LinkName="extlink" OBJ-XID="xid_18446744073709551613" H5SourcePath="/g1/g1.2/extlink" TargetFilename="somefile"  TargetPath="somepath"  Parents="xid_3536" H5ParentPaths="/g1/g1.2" />
+         <hdf5:ExternalLink LinkName="extlink" OBJ-XID="xid_18446744073709551613" H5SourcePath="/g1/g1.2/extlink" TargetFilename="somefile"  TargetPath="somepath"  Parents="xid_3600" H5ParentPaths="/g1/g1.2" />
       </hdf5:Group>
    </hdf5:Group>
-   <hdf5:Group Name="g2" OBJ-XID="xid_1816" H5Path="/g2" Parents="xid_96" H5ParentPaths="/" >
-      <hdf5:Dataset Name="dset2.1" OBJ-XID="xid_8872" H5Path= "/g2/dset2.1" Parents="xid_1816" H5ParentPaths="/g2">
+   <hdf5:Group Name="g2" OBJ-XID="xid_1848" H5Path="/g2" Parents="xid_96" H5ParentPaths="/" >
+      <hdf5:Dataset Name="dset2.1" OBJ-XID="xid_3688" H5Path= "/g2/dset2.1" Parents="xid_1848" H5ParentPaths="/g2">
          <hdf5:StorageLayout>
             <hdf5:ContiguousLayout/>
          </hdf5:StorageLayout>
@@ -157,7 +157,7 @@ Expected output for 'h5dump --xml -A tall.h5'
             <hdf5:NoData/>
          </hdf5:Data>
       </hdf5:Dataset>
-      <hdf5:Dataset Name="dset2.2" OBJ-XID="xid_9472" H5Path= "/g2/dset2.2" Parents="xid_1816" H5ParentPaths="/g2">
+      <hdf5:Dataset Name="dset2.2" OBJ-XID="xid_8696" H5Path= "/g2/dset2.2" Parents="xid_1848" H5ParentPaths="/g2">
          <hdf5:StorageLayout>
             <hdf5:ContiguousLayout/>
          </hdf5:StorageLayout>
@@ -181,7 +181,7 @@ Expected output for 'h5dump --xml -A tall.h5'
             <hdf5:NoData/>
          </hdf5:Data>
       </hdf5:Dataset>
-      <hdf5:UserDefined LinkName="udlink" OBJ-XID="xid_18446744073709551612" H5SourcePath="/g2/udlink" LinkClass="187"  Parents="xid_1816" H5ParentPaths="/g2" />
+      <hdf5:UserDefined LinkName="udlink" OBJ-XID="xid_18446744073709551612" H5SourcePath="/g2/udlink" LinkClass="187"  Parents="xid_1848" H5ParentPaths="/g2" />
    </hdf5:Group>
 </hdf5:RootGroup>
 </hdf5:HDF5-File>
diff --git a/tools/testfiles/tall.h5 b/tools/testfiles/tall.h5
index 0ed5ed2..6d827af 100644
--- a/tools/testfiles/tall.h5
+++ b/tools/testfiles/tall.h5
diff --git a/tools/testfiles/tall.h5.xml b/tools/testfiles/tall.h5.xml
index ce740fe..45497e6 100644
--- a/tools/testfiles/tall.h5.xml
+++ b/tools/testfiles/tall.h5.xml
@@ -40,9 +40,9 @@ Expected output for 'h5dump --xml tall.h5'
          </hdf5:DataFromFile>
       </hdf5:Data>
    </hdf5:Attribute>
-   <hdf5:Group Name="g1" OBJ-XID="xid_792" H5Path="/g1" Parents="xid_96" H5ParentPaths="/" >
-      <hdf5:Group Name="g1.1" OBJ-XID="xid_2512" H5Path="/g1/g1.1" Parents="xid_792" H5ParentPaths="/g1" >
-         <hdf5:Dataset Name="dset1.1.1" OBJ-XID="xid_5432" H5Path= "/g1/g1.1/dset1.1.1" Parents="xid_2512" H5ParentPaths="/g1/g1.1">
+   <hdf5:Group Name="g1" OBJ-XID="xid_808" H5Path="/g1" Parents="xid_96" H5ParentPaths="/" >
+      <hdf5:Group Name="g1.1" OBJ-XID="xid_2560" H5Path="/g1/g1.1" Parents="xid_808" H5ParentPaths="/g1" >
+         <hdf5:Dataset Name="dset1.1.1" OBJ-XID="xid_5528" H5Path= "/g1/g1.1/dset1.1.1" Parents="xid_2560" H5ParentPaths="/g1/g1.1">
             <hdf5:StorageLayout>
                <hdf5:ContiguousLayout/>
             </hdf5:StorageLayout>
@@ -113,7 +113,7 @@ Expected output for 'h5dump --xml tall.h5'
                </hdf5:DataFromFile>
             </hdf5:Data>
          </hdf5:Dataset>
-         <hdf5:Dataset Name="dset1.1.2" OBJ-XID="xid_8272" H5Path= "/g1/g1.1/dset1.1.2" Parents="xid_2512" H5ParentPaths="/g1/g1.1">
+         <hdf5:Dataset Name="dset1.1.2" OBJ-XID="xid_8272" H5Path= "/g1/g1.1/dset1.1.2" Parents="xid_2560" H5ParentPaths="/g1/g1.1">
             <hdf5:StorageLayout>
                <hdf5:ContiguousLayout/>
             </hdf5:StorageLayout>
@@ -139,15 +139,15 @@ Expected output for 'h5dump --xml tall.h5'
             </hdf5:Data>
          </hdf5:Dataset>
       </hdf5:Group>
-      <hdf5:Group Name="g1.2" OBJ-XID="xid_3536" H5Path="/g1/g1.2" Parents="xid_792" H5ParentPaths="/g1" >
-         <hdf5:Group Name="g1.2.1" OBJ-XID="xid_4232" H5Path="/g1/g1.2/g1.2.1" Parents="xid_3536" H5ParentPaths="/g1/g1.2" >
-            <hdf5:SoftLink LinkName="slink" OBJ-XID="xid_18446744073709551614" H5SourcePath="/g1/g1.2/g1.2.1/slink" TargetPath="somevalue"  Parents="xid_4232" H5ParentPaths="/g1/g1.2/g1.2.1" />
+      <hdf5:Group Name="g1.2" OBJ-XID="xid_3600" H5Path="/g1/g1.2" Parents="xid_808" H5ParentPaths="/g1" >
+         <hdf5:Group Name="g1.2.1" OBJ-XID="xid_4312" H5Path="/g1/g1.2/g1.2.1" Parents="xid_3600" H5ParentPaths="/g1/g1.2" >
+            <hdf5:SoftLink LinkName="slink" OBJ-XID="xid_18446744073709551614" H5SourcePath="/g1/g1.2/g1.2.1/slink" TargetPath="somevalue"  Parents="xid_4312" H5ParentPaths="/g1/g1.2/g1.2.1" />
          </hdf5:Group>
-         <hdf5:ExternalLink LinkName="extlink" OBJ-XID="xid_18446744073709551613" H5SourcePath="/g1/g1.2/extlink" TargetFilename="somefile"  TargetPath="somepath"  Parents="xid_3536" H5ParentPaths="/g1/g1.2" />
+         <hdf5:ExternalLink LinkName="extlink" OBJ-XID="xid_18446744073709551613" H5SourcePath="/g1/g1.2/extlink" TargetFilename="somefile"  TargetPath="somepath"  Parents="xid_3600" H5ParentPaths="/g1/g1.2" />
       </hdf5:Group>
    </hdf5:Group>
-   <hdf5:Group Name="g2" OBJ-XID="xid_1816" H5Path="/g2" Parents="xid_96" H5ParentPaths="/" >
-      <hdf5:Dataset Name="dset2.1" OBJ-XID="xid_8872" H5Path= "/g2/dset2.1" Parents="xid_1816" H5ParentPaths="/g2">
+   <hdf5:Group Name="g2" OBJ-XID="xid_1848" H5Path="/g2" Parents="xid_96" H5ParentPaths="/" >
+      <hdf5:Dataset Name="dset2.1" OBJ-XID="xid_3688" H5Path= "/g2/dset2.1" Parents="xid_1848" H5ParentPaths="/g2">
          <hdf5:StorageLayout>
             <hdf5:ContiguousLayout/>
          </hdf5:StorageLayout>
@@ -172,7 +172,7 @@ Expected output for 'h5dump --xml tall.h5'
             </hdf5:DataFromFile>
          </hdf5:Data>
       </hdf5:Dataset>
-      <hdf5:Dataset Name="dset2.2" OBJ-XID="xid_9472" H5Path= "/g2/dset2.2" Parents="xid_1816" H5ParentPaths="/g2">
+      <hdf5:Dataset Name="dset2.2" OBJ-XID="xid_8696" H5Path= "/g2/dset2.2" Parents="xid_1848" H5ParentPaths="/g2">
          <hdf5:StorageLayout>
             <hdf5:ContiguousLayout/>
          </hdf5:StorageLayout>
@@ -200,7 +200,7 @@ Expected output for 'h5dump --xml tall.h5'
             </hdf5:DataFromFile>
          </hdf5:Data>
       </hdf5:Dataset>
-      <hdf5:UserDefined LinkName="udlink" OBJ-XID="xid_18446744073709551612" H5SourcePath="/g2/udlink" LinkClass="187"  Parents="xid_1816" H5ParentPaths="/g2" />
+      <hdf5:UserDefined LinkName="udlink" OBJ-XID="xid_18446744073709551612" H5SourcePath="/g2/udlink" LinkClass="187"  Parents="xid_1848" H5ParentPaths="/g2" />
    </hdf5:Group>
 </hdf5:RootGroup>
 </hdf5:HDF5-File>
diff --git a/tools/testfiles/tboot1.ddl b/tools/testfiles/tboot1.ddl
index 30e700a..4098607 100644
--- a/tools/testfiles/tboot1.ddl
+++ b/tools/testfiles/tboot1.ddl
@@ -18,7 +18,7 @@ USER_BLOCK {
    USERBLOCK_SIZE 0
 }
 DATASET "dset" {
-   DATATYPE  H5T_STD_I32LE
+   DATATYPE  H5T_STD_I32BE
    DATASPACE  SIMPLE { ( 4 ) / ( 4 ) }
 }
 }
diff --git a/tools/testfiles/tcontents.ddl b/tools/testfiles/tcontents.ddl
index 935ff8c..f66835a 100644
--- a/tools/testfiles/tcontents.ddl
+++ b/tools/testfiles/tcontents.ddl
@@ -3,7 +3,7 @@ Expected output for 'h5dump -n tfcontents1.h5'
 #############################
 HDF5 "tfcontents1.h5" {
 FILE_CONTENTS {
- datatype   /#6056
+ datatype   /#6392
  dataset    /dset
  dataset    /dset3 -> /dset
  dataset    /dset4 -> /dset
diff --git a/tools/testfiles/textlink.h5 b/tools/testfiles/textlink.h5
index a851011..db4aae4 100644
--- a/tools/testfiles/textlink.h5
+++ b/tools/testfiles/textlink.h5
diff --git a/tools/testfiles/tfcontents1.h5 b/tools/testfiles/tfcontents1.h5
index 8b043fb..acaede4 100644
--- a/tools/testfiles/tfcontents1.h5
+++ b/tools/testfiles/tfcontents1.h5
diff --git a/tools/testfiles/tmany.h5 b/tools/testfiles/tmany.h5
index 0422f93..e197565 100644
--- a/tools/testfiles/tmany.h5
+++ b/tools/testfiles/tmany.h5
diff --git a/tools/testfiles/tmany.h5.xml b/tools/testfiles/tmany.h5.xml
index 1f7fa70..3bf1021 100644
--- a/tools/testfiles/tmany.h5.xml
+++ b/tools/testfiles/tmany.h5.xml
@@ -4,9 +4,9 @@ Expected output for 'h5dump --xml tmany.h5'
 <?xml version="1.0" encoding="UTF-8"?>
 <hdf5:HDF5-File xmlns:hdf5="http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hdf.ncsa.uiuc.edu/DTDs/HDF5File http://hdf.ncsa.uiuc.edu/DTDs/HDF5-File.xsd">
 <hdf5:RootGroup OBJ-XID="xid_96" H5Path="/">
-   <hdf5:Group Name="g1" OBJ-XID="xid_792" H5Path="/g1" Parents="xid_96" H5ParentPaths="/" >
-      <hdf5:Group Name="g1.1" OBJ-XID="xid_1816" H5Path="/g1/g1.1" Parents="xid_792" H5ParentPaths="/g1" >
-         <hdf5:Dataset Name="dset1" OBJ-XID="xid_2840" H5Path= "/g1/g1.1/dset1" Parents="xid_1816" H5ParentPaths="/g1/g1.1">
+   <hdf5:Group Name="g1" OBJ-XID="xid_808" H5Path="/g1" Parents="xid_96" H5ParentPaths="/" >
+      <hdf5:Group Name="g1.1" OBJ-XID="xid_1848" H5Path="/g1/g1.1" Parents="xid_808" H5ParentPaths="/g1" >
+         <hdf5:Dataset Name="dset1" OBJ-XID="xid_2888" H5Path= "/g1/g1.1/dset1" Parents="xid_1848" H5ParentPaths="/g1/g1.1">
             <hdf5:StorageLayout>
                <hdf5:ChunkedLayout Ndims="1">
                   <hdf5:ChunkDimension DimSize="2" />
@@ -265,17 +265,17 @@ Expected output for 'h5dump --xml tmany.h5'
             </hdf5:Data>
          </hdf5:Dataset>
       </hdf5:Group>
-      <hdf5:Group Name="g1.2" OBJ-XID="xid_6040" H5Path="/g1/g1.2" Parents="xid_792" H5ParentPaths="/g1" >
-         <hdf5:Dataset Name="link1" OBJ-XID="xid_2840-1" H5Path="/g1/g1.2/link1" Parents="xid_6040" H5ParentPaths="/g1/g1.2">
-            <hdf5:DatasetPtr OBJ-XID="xid_2840" H5Path="/g1/g1.2/link1"/>
+      <hdf5:Group Name="g1.2" OBJ-XID="xid_6088" H5Path="/g1/g1.2" Parents="xid_808" H5ParentPaths="/g1" >
+         <hdf5:Dataset Name="link1" OBJ-XID="xid_2888-1" H5Path="/g1/g1.2/link1" Parents="xid_6088" H5ParentPaths="/g1/g1.2">
+            <hdf5:DatasetPtr OBJ-XID="xid_2888" H5Path="/g1/g1.2/link1"/>
          </hdf5:Dataset>
       </hdf5:Group>
    </hdf5:Group>
-   <hdf5:Group Name="g2" OBJ-XID="xid_6520" H5Path="/g2" Parents="xid_96" H5ParentPaths="/" >
-      <hdf5:SoftLink LinkName="slink2" OBJ-XID="xid_792" H5SourcePath="/g2/slink2" TargetPath="/g1" TargetObj="xid_792" Parents="xid_6520" H5ParentPaths="/g2" />
+   <hdf5:Group Name="g2" OBJ-XID="xid_9184" H5Path="/g2" Parents="xid_96" H5ParentPaths="/" >
+      <hdf5:SoftLink LinkName="slink2" OBJ-XID="xid_808" H5SourcePath="/g2/slink2" TargetPath="/g1" TargetObj="xid_808" Parents="xid_9184" H5ParentPaths="/g2" />
    </hdf5:Group>
-   <hdf5:Group Name="g3" OBJ-XID="xid_10160" H5Path="/g3" Parents="xid_96" H5ParentPaths="/" >
-      <hdf5:Dataset Name="link3" OBJ-XID="xid_11552" H5Path= "/g3/link3" Parents="xid_10160" H5ParentPaths="/g3">
+   <hdf5:Group Name="g3" OBJ-XID="xid_10224" H5Path="/g3" Parents="xid_96" H5ParentPaths="/" >
+      <hdf5:Dataset Name="link3" OBJ-XID="xid_11648" H5Path= "/g3/link3" Parents="xid_10224" H5ParentPaths="/g3">
          <hdf5:StorageLayout>
             <hdf5:ContiguousLayout/>
          </hdf5:StorageLayout>
@@ -311,16 +311,16 @@ Expected output for 'h5dump --xml tmany.h5'
          </hdf5:Data>
       </hdf5:Dataset>
    </hdf5:Group>
-   <hdf5:Group Name="g4" OBJ-XID="xid_10856" H5Path="/g4" Parents="xid_96" H5ParentPaths="/" >
-      <hdf5:Dataset Name="dset2" OBJ-XID="xid_11552-2" H5Path="/g4/dset2" Parents="xid_10856" H5ParentPaths="/g4">
-         <hdf5:DatasetPtr OBJ-XID="xid_11552" H5Path="/g4/dset2"/>
+   <hdf5:Group Name="g4" OBJ-XID="xid_10936" H5Path="/g4" Parents="xid_96" H5ParentPaths="/" >
+      <hdf5:Dataset Name="dset2" OBJ-XID="xid_11648-2" H5Path="/g4/dset2" Parents="xid_10936" H5ParentPaths="/g4">
+         <hdf5:DatasetPtr OBJ-XID="xid_11648" H5Path="/g4/dset2"/>
       </hdf5:Dataset>
    </hdf5:Group>
    <hdf5:Group Name="g5" OBJ-XID="xid_8512" H5Path="/g5" Parents="xid_96" H5ParentPaths="/" >
-      <hdf5:SoftLink LinkName="slink4" OBJ-XID="xid_15872" H5SourcePath="/g5/slink4" TargetPath="/g6/dset3" TargetObj="xid_15872" Parents="xid_8512" H5ParentPaths="/g5" />
+      <hdf5:SoftLink LinkName="slink4" OBJ-XID="xid_15992" H5SourcePath="/g5/slink4" TargetPath="/g6/dset3" TargetObj="xid_15992" Parents="xid_8512" H5ParentPaths="/g5" />
    </hdf5:Group>
    <hdf5:Group Name="g6" OBJ-XID="xid_8560" H5Path="/g6" Parents="xid_96" H5ParentPaths="/" >
-      <hdf5:Dataset Name="dset3" OBJ-XID="xid_15872" H5Path= "/g6/dset3" Parents="xid_8560" H5ParentPaths="/g6">
+      <hdf5:Dataset Name="dset3" OBJ-XID="xid_15992" H5Path= "/g6/dset3" Parents="xid_8560" H5ParentPaths="/g6">
          <hdf5:StorageLayout>
             <hdf5:ContiguousLayout/>
          </hdf5:StorageLayout>
@@ -356,13 +356,13 @@ Expected output for 'h5dump --xml tmany.h5'
          </hdf5:Data>
       </hdf5:Dataset>
    </hdf5:Group>
-   <hdf5:Group Name="g7" OBJ-XID="xid_12688" H5Path="/g7" Parents="xid_96" H5ParentPaths="/" >
-      <hdf5:SoftLink LinkName="slink5" OBJ-XID="xid_18446744073709551614" H5SourcePath="/g7/slink5" TargetPath="/g8/elink"  Parents="xid_12688" H5ParentPaths="/g7" />
-      <hdf5:SoftLink LinkName="slink6" OBJ-XID="xid_18446744073709551613" H5SourcePath="/g7/slink6" TargetPath="/g8/udlink"  Parents="xid_12688" H5ParentPaths="/g7" />
+   <hdf5:Group Name="g7" OBJ-XID="xid_16920" H5Path="/g7" Parents="xid_96" H5ParentPaths="/" >
+      <hdf5:SoftLink LinkName="slink5" OBJ-XID="xid_18446744073709551614" H5SourcePath="/g7/slink5" TargetPath="/g8/elink"  Parents="xid_16920" H5ParentPaths="/g7" />
+      <hdf5:SoftLink LinkName="slink6" OBJ-XID="xid_18446744073709551613" H5SourcePath="/g7/slink6" TargetPath="/g8/udlink"  Parents="xid_16920" H5ParentPaths="/g7" />
    </hdf5:Group>
-   <hdf5:Group Name="g8" OBJ-XID="xid_720" H5Path="/g8" Parents="xid_96" H5ParentPaths="/" >
-      <hdf5:ExternalLink LinkName="elink" OBJ-XID="xid_18446744073709551612" H5SourcePath="/g8/elink" TargetFilename="somefile"  TargetPath="somepath"  Parents="xid_720" H5ParentPaths="/g8" />
-      <hdf5:UserDefined LinkName="udlink" OBJ-XID="xid_18446744073709551611" H5SourcePath="/g8/udlink" LinkClass="187"  Parents="xid_720" H5ParentPaths="/g8" />
+   <hdf5:Group Name="g8" OBJ-XID="xid_17632" H5Path="/g8" Parents="xid_96" H5ParentPaths="/" >
+      <hdf5:ExternalLink LinkName="elink" OBJ-XID="xid_18446744073709551612" H5SourcePath="/g8/elink" TargetFilename="somefile"  TargetPath="somepath"  Parents="xid_17632" H5ParentPaths="/g8" />
+      <hdf5:UserDefined LinkName="udlink" OBJ-XID="xid_18446744073709551611" H5SourcePath="/g8/udlink" LinkClass="187"  Parents="xid_17632" H5ParentPaths="/g8" />
    </hdf5:Group>
 </hdf5:RootGroup>
 </hdf5:HDF5-File>
diff --git a/tools/testfiles/tudlink.h5 b/tools/testfiles/tudlink.h5
index 3b10447..d2f5802 100644
--- a/tools/testfiles/tudlink.h5
+++ b/tools/testfiles/tudlink.h5
diff --git a/tools/testfiles/twithub.h5 b/tools/testfiles/twithub.h5
index 2176034..4d975f2 100644
--- a/tools/testfiles/twithub.h5
+++ b/tools/testfiles/twithub.h5
diff --git a/tools/testfiles/twithub513.h5 b/tools/testfiles/twithub513.h5
index fbb872a..525d7b5 100644
--- a/tools/testfiles/twithub513.h5
+++ b/tools/testfiles/twithub513.h5