[svn-r15221] Description:

	Bring changes from trunk from the time the branch was created (r14280)
up to the 1.8.0 release (r14525) back into the metadata journaling branch.

Tested on:
        FreeBSD/32 6.2 (duty) in debug mode
        FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
                                in debug mode
        Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
                                in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                                in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                                w/szip filter, in production mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode

1 files changed, 26 insertions, 42 deletions

diff --git a/tools/h5repack/h5repack.h b/tools/h5repack/h5repack.h
index d986cc0..baa888e 100644
--- a/tools/h5repack/h5repack.h
+++ b/tools/h5repack/h5repack.h
@@ -19,6 +19,8 @@
 
 #include "hdf5.h"
 #include "h5trav.h"
+#include "H5Zprivate.h"	/* H5Z_COMMON_CD_VALUES */	
+
 
 
 #define H5FOPENERROR "unable to open file"
@@ -51,11 +53,13 @@ typedef struct {
  H5Z_FILTER_SCALEOFFSET 6 , scaleoffset compression
 */
 
-#define CDVALUES 2
+/* #define CD_VALUES H5Z_COMMON_CD_VALUES */
+#define CD_VALUES 20
 
 typedef struct {
- H5Z_filter_t filtn;               /* filter identification number */
- int          cd_values[CDVALUES]; /* filter client data values */
+ H5Z_filter_t filtn;                           /* filter identification number */
+ unsigned     cd_values[CD_VALUES];            /* filter client data values */
+ size_t       cd_nelmts;                       /* filter client number of values */
 } filter_info_t;
 
 /* chunk lengths along each dimension and rank */
@@ -96,7 +100,8 @@ typedef struct {
  pack_opttbl_t   *op_tbl;     /*table with all -c and -f options */
  int             all_layout;  /*apply the layout to all objects */
  int             all_filter;  /*apply the filter to all objects */
- filter_info_t   filter_g;    /*global filter INFO for the ALL case */
+ filter_info_t   filter_g[H5_REPACK_MAX_NFILTERS];    /*global filter array for the ALL case */
+ int             n_filter_g;  /*number of global filters */
  chunk_info_t    chunk_g;     /*global chunk INFO for the ALL case */
  H5D_layout_t    layout_g;    /*global layout information for the ALL case */
  int             verbose;     /*verbose mode */
@@ -142,58 +147,38 @@ int h5repack_cmpdcpl   (const char *fname1,
  */
 
 
-int check_objects(const char* fname,
-                  pack_opt_t *options);
+/*-------------------------------------------------------------------------
+ * copy module
+ *-------------------------------------------------------------------------
+ */
 
-int copy_objects(const char* fnamein,
-                 const char* fnameout,
-                 pack_opt_t *options);
+int copy_objects   (const char* fnamein,
+                    const char* fnameout,
+                    pack_opt_t *options);
 
 int do_copy_refobjs(hid_t fidin,
                     hid_t fidout,
                     trav_table_t *travt,
-                    pack_opt_t *options); /* repack options */
-
+                    pack_opt_t *options); 
 
-void read_info(const char *filename,pack_opt_t *options);
+/*-------------------------------------------------------------------------
+ * filters and verify module
+ *-------------------------------------------------------------------------
+ */
 void init_packobject(pack_info_t *obj);
-int print_filters(hid_t dcpl_id);
-int have_request(pack_opt_t *options);
-
 
 
 /*-------------------------------------------------------------------------
- * filters
+ * filters and copy module
  *-------------------------------------------------------------------------
  */
 
 int apply_filters(const char* name,    /* object name from traverse list */
                   int rank,            /* rank of dataset */
                   hsize_t *dims,       /* dimensions of dataset */
-                  hid_t dcpl_id,       /* (IN,OUT) dataset creation property list */
+                  hid_t dcpl_id,       /* dataset creation property list */
                   pack_opt_t *options, /* repack options */
-                  int *has_filter);     /* (OUT) object NAME has a filter */
-
-int can_read(const char* name,    /* object name from traverse list */
-             hid_t dcpl_id,       /* dataset creation property list */
-             pack_opt_t *options); /* repack options */
-
-
-/*-------------------------------------------------------------------------
- * layout functions
- *-------------------------------------------------------------------------
- */
-
-int has_layout(hid_t dcpl_id,
-               pack_info_t *obj);
-
-int layout_this(hid_t dcpl_id,             /* DCPL from input object */
-                const char* name,          /* object name from traverse list */
-                pack_opt_t *options,       /* repack options */
-                pack_info_t *pack /*OUT*/) /* object to apply layout */;
-
-int apply_layout(hid_t dcpl_id,
-                 pack_info_t *pack);  /* info about object  */
+                  int *has_filter);    /* (OUT) object NAME has a filter */
 
 
 /*-------------------------------------------------------------------------
@@ -221,15 +206,14 @@ pack_info_t* options_get_object( const char *path,
 obj_list_t* parse_filter(const char *str,
                          int *n_objs,
                          filter_info_t *filt,
-                         pack_opt_t *options);
+                         pack_opt_t *options,
+                         int *is_glb);
 
 obj_list_t* parse_layout(const char *str,
                          int *n_objs,
                          pack_info_t *pack,    /* info about object */
                          pack_opt_t *options);
 
-const char* get_sfilter (H5Z_filter_t filtn);
-int         parse_number(char *str);