Merge pull request #2272 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:tr_squash to develop

* commit 'a92c735c9b57049e8c4037d3490f7e10f8eef4d6':
  Squashed commit of the token_refactoring branch:

1 files changed, 8 insertions, 7 deletions

diff --git a/tools/lib/h5tools_utils.h b/tools/lib/h5tools_utils.h
index 17c16bf..366800a 100644
--- a/tools/lib/h5tools_utils.h
+++ b/tools/lib/h5tools_utils.h
@@ -95,14 +95,15 @@ H5TOOLS_DLL int get_option(int argc, const char **argv, const char *opt, const s
 
 /*struct taken from the dumper. needed in table struct*/
 typedef struct obj_t {
-    haddr_t objno;
-    char   *objname;
-    hbool_t displayed;          /* Flag to indicate that the object has been displayed */
-    hbool_t recorded;           /* Flag for named datatypes to indicate they were found in the group hierarchy */
+    H5O_token_t  obj_token;
+    char      *objname;
+    hbool_t    displayed;          /* Flag to indicate that the object has been displayed */
+    hbool_t    recorded;           /* Flag for named datatypes to indicate they were found in the group hierarchy */
 } obj_t;
 
 /*struct for the tables that the find_objs function uses*/
 typedef struct table_t {
+    hid_t fid;
     size_t size;
     size_t nobjs;
     obj_t *objs;
@@ -131,7 +132,7 @@ H5TOOLS_DLL void free_table(table_t *table);
 H5TOOLS_DLL void dump_tables(find_objs_t *info)
 #endif  /* H5DUMP_DEBUG */
 H5TOOLS_DLL herr_t init_objs(hid_t fid, find_objs_t *info, table_t **group_table, table_t **dset_table, table_t **type_table);
-H5TOOLS_DLL obj_t *search_obj(table_t *temp, haddr_t objno);
+H5TOOLS_DLL obj_t *search_obj(table_t *temp, const H5O_token_t *obj_token);
 #ifndef H5_HAVE_TMPFILE
 H5TOOLS_DLL FILE *tmpfile(void);
 #endif
@@ -158,9 +159,9 @@ typedef struct {
     H5O_type_t    trg_type;  /* OUT: target type */
     char         *trg_path;  /* OUT: target obj path. This must be freed
                               *      when used with H5tools_get_symlink_info() */
-    haddr_t       objno;     /* OUT: target object address */
+    H5O_token_t     obj_token; /* OUT: target object token */
     unsigned long fileno;    /* OUT: File number that target object is located in */
-    H5L_info_t    linfo;     /* OUT: link info */
+    H5L_info2_t   linfo;     /* OUT: link info */
     h5tool_opt_t  opt;       /* IN: options */
 } h5tool_link_info_t;