[svn-r18455] Purpose:

    Fix for the bug1726 - NPOESS: h5repack loses attributes for datasets of 
    type H5T_REFERENCE.

Description:
    Merged from hdf5 trunk rXXX

Tested:
    jam

1 files changed, 16 insertions, 0 deletions

diff --git a/tools/h5repack/h5repack.h b/tools/h5repack/h5repack.h
index 653958f..f7445ac 100644
--- a/tools/h5repack/h5repack.h
+++ b/tools/h5repack/h5repack.h
@@ -115,6 +115,11 @@ typedef struct {
 } pack_opt_t;
 
 
+typedef struct named_dt_t {
+    haddr_t             addr_in;    /* Address of the named dtype in the in file */
+    hid_t               id_out;     /* Open identifier for the dtype in the out file */
+    struct named_dt_t   *next;      /* Next dtype */
+} named_dt_t;
 
 /*-------------------------------------------------------------------------
  * public functions
@@ -134,6 +139,17 @@ int h5repack_verify    (const char *fname,pack_opt_t *options);
 int h5repack_cmp_pl   (const char *fname1,
                         const char *fname2);
 
+/* Note: The below copy_named_datatype(), named_datatype_free(), copy_attr() 
+ * and struct named_dt_t were located in h5repack_copy.c as static prior to 
+ * bugfix1726. 
+ * Made shared functions as copy_attr() was needed in h5repack_refs.c. 
+ * However copy_attr() may be obsoleted when H5Acopy is available and put back
+ * others to static in h5repack_copy.c.
+ */
+hid_t copy_named_datatype(hid_t type_in, hid_t fidout, named_dt_t **named_dt_head_p, trav_table_t *travt, pack_opt_t *options);
+int named_datatype_free(named_dt_t **named_dt_head_p, int ignore_err);
+int copy_attr(hid_t loc_in, hid_t loc_out, named_dt_t **named_dt_head_p,
+              trav_table_t *travt, pack_opt_t *options);
 
 #ifdef __cplusplus
 }