[svn-r15533] #1184

Add a userblock to an HDF5 file during the repack.  The user gives  
give a filename and userblock size as command line parameters to  
h5repack and the contents of that file are stored in the  
userblock for the HDF5 file created by h5repack.


New flags to handle this -u and -b
Tested : windows, linux

1 files changed, 6 insertions, 10 deletions

diff --git a/tools/h5repack/h5repack.h b/tools/h5repack/h5repack.h
index baa888e..42b9bbc 100644
--- a/tools/h5repack/h5repack.h
+++ b/tools/h5repack/h5repack.h
@@ -19,17 +19,12 @@
 
 #include "hdf5.h"
 #include "h5trav.h"
-#include "H5Zprivate.h"	/* H5Z_COMMON_CD_VALUES */	
-
-
 
 #define H5FOPENERROR "unable to open file"
-
-#define PFORMAT  "%-7s %-7s %-7s\n" /*chunk info, compression info, name*/
-#define PFORMAT1 "%-7s %-7s %-7s"     /*chunk info, compression info, name*/
-
-#define MAX_NC_NAME 256 /* max length of a name */
-#define MAX_VAR_DIMS 32 /* max per variable dimensions */
+#define PFORMAT  "%-7s %-7s %-7s\n"   /* chunk info, compression info, name*/
+#define PFORMAT1 "%-7s %-7s %-7s"     /* chunk info, compression info, name*/
+#define MAX_NC_NAME 256               /* max length of a name */
+#define MAX_VAR_DIMS 32               /* max per variable dimensions */
 
 /*-------------------------------------------------------------------------
  * data structures for command line options
@@ -53,7 +48,6 @@ typedef struct {
  H5Z_FILTER_SCALEOFFSET 6 , scaleoffset compression
 */
 
-/* #define CD_VALUES H5Z_COMMON_CD_VALUES */
 #define CD_VALUES 20
 
 typedef struct {
@@ -112,6 +106,8 @@ typedef struct {
  int             grp_indexed; /* Set the minimum number of links to store in the indexed format */
  int             msg_size[8]; /* Minumum size of shared messages: dataspace, 
                                  datatype, fill value, filter pipleline, attribute */
+ const char      *ublock_filename; /* user block file name */
+ int             ublock_size;      /* user block size */
 } pack_opt_t;