[svn-r8904] Purpose:

h5diff and h5repack changes

Description:
h5diff
introduced the following four modes of output:
 Normal mode: print the number of differences found and where they occured
  Report mode: print the above plus the differences
   Verbose mode: print the above plus a list of objects and warnings
    Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found)

    h5repack
     added an extra parameter for SZIP filter (coding method)
     the new syntax is
     -f SZIP=<pixels per block,coding>
     (pixels per block is a even number in 2-32 and coding method is 'EC' or 'NN')
     Example of use:
     ./h5repack -i file1 -o file2 -f SZIP=8,NN -v

     updated usage messages, test scripts and files accordingly




Solution:

Platforms tested:
linux
AIX
solaris

Misc. update:

1 files changed, 6 insertions, 7 deletions

diff --git a/tools/h5repack/h5repack_refs.c b/tools/h5repack/h5repack_refs.c
index ef7f298..0db17f5 100644
--- a/tools/h5repack/h5repack_refs.c
+++ b/tools/h5repack/h5repack_refs.c
@@ -22,7 +22,7 @@
 static const char* MapIdToName(hid_t refobj_id, 
                                trav_table_t *travt);
 
-static void close_obj(H5G_obj_t obj_type, hid_t obj_id);
+static void close_obj(H5G_obj_t1 obj_type, hid_t obj_id);
 
 
 static int copy_refs_attr(hid_t loc_in, 
@@ -142,7 +142,6 @@ int do_copy_refobjs(hid_t fidin,
  */
    if (next==0 && h5tools_canreadf((NULL),dcpl_id)==1)
    {
-
 /*-------------------------------------------------------------------------
  * test for a valid output dataset
  *-------------------------------------------------------------------------
@@ -156,7 +155,7 @@ int do_copy_refobjs(hid_t fidin,
  */
    if (H5Tequal(mtype_id, H5T_STD_REF_OBJ)) 
    {
-    H5G_obj_t        obj_type;
+    H5G_obj_t1       obj_type;
     hid_t            refobj_id;
     hobj_ref_t       *refbuf=NULL; /* buffer for object references */
     hobj_ref_t       *buf=NULL;
@@ -231,7 +230,7 @@ int do_copy_refobjs(hid_t fidin,
  */
    else if (H5Tequal(mtype_id, H5T_STD_REF_DSETREG)) 
    {
-    H5G_obj_t        obj_type;
+    H5G_obj_t1       obj_type;
     hid_t            refobj_id;
     hdset_reg_ref_t  *refbuf=NULL; /* input buffer for region references */
     hdset_reg_ref_t  *buf=NULL;    /* output buffer */
@@ -528,7 +527,7 @@ static int copy_refs_attr(hid_t loc_in,
  */
    if (H5Tequal(mtype_id, H5T_STD_REF_OBJ)) 
    {
-    H5G_obj_t   obj_type;
+    H5G_obj_t1  obj_type;
     hid_t       refobj_id;
     hobj_ref_t  *refbuf=NULL;
     unsigned    k;
@@ -605,7 +604,7 @@ static int copy_refs_attr(hid_t loc_in,
  */
    else if (H5Tequal(mtype_id, H5T_STD_REF_DSETREG)) 
    {
-    H5G_obj_t        obj_type;
+    H5G_obj_t1       obj_type;
     hid_t            refobj_id;
     hdset_reg_ref_t  *refbuf=NULL; /* input buffer for region references */
     hdset_reg_ref_t  *buf=NULL;    /* output buffer */
@@ -715,7 +714,7 @@ error:
  *-------------------------------------------------------------------------
  */
 
-static void close_obj(H5G_obj_t obj_type, hid_t obj_id)
+static void close_obj(H5G_obj_t1 obj_type, hid_t obj_id)
 {
  H5E_BEGIN_TRY 
  {