summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/h5repack/h5repack.c8
-rw-r--r--tools/h5repack/h5repack.h11
-rw-r--r--tools/h5repack/h5repack_copy.c14
-rw-r--r--tools/h5repack/h5repack_filters.c24
-rw-r--r--tools/h5repack/h5repack_list.c18
-rw-r--r--tools/h5repack/h5repack_main.c4
-rw-r--r--tools/h5repack/h5repack_verify.c4
-rw-r--r--tools/h5repack/testh5repack_main.c96
8 files changed, 92 insertions, 87 deletions
diff --git a/tools/h5repack/h5repack.c b/tools/h5repack/h5repack.c
index f90ff54..f8f7f53 100644
--- a/tools/h5repack/h5repack.c
+++ b/tools/h5repack/h5repack.c
@@ -64,18 +64,20 @@ static void aux_initglb_filter(pack_opt_t *options)
*/
int h5repack(const char* infile,
const char* outfile,
- pack_opt_t *options)
+ pack_opt_t *options,
+ int argc,
+ const char *argv[])
{
/* check input */
if (check_options(options)<0)
return -1;
/* check for objects in input that are in the file */
- if (check_objects(infile,options)<0)
+ if (check_objects(infile,options,argc,argv)<0)
return -1;
/* copy the objects */
- if (copy_objects(infile,outfile,options)<0)
+ if (copy_objects(infile,outfile,options,argc,argv)<0)
return -1;
diff --git a/tools/h5repack/h5repack.h b/tools/h5repack/h5repack.h
index 3647d43..e835b66 100644
--- a/tools/h5repack/h5repack.h
+++ b/tools/h5repack/h5repack.h
@@ -114,7 +114,8 @@ typedef struct {
extern "C" {
#endif
-int h5repack (const char* infile, const char* outfile, pack_opt_t *options);
+int h5repack (const char* infile, const char* outfile, pack_opt_t *options,
+ int argc, const char *argv[]);
int h5repack_addfilter (const char* str, pack_opt_t *options);
int h5repack_addlayout (const char* str, pack_opt_t *options);
int h5repack_init (pack_opt_t *options, int verbose);
@@ -137,11 +138,15 @@ int h5repack_cmpdcpl (const char *fname1,
int check_objects(const char* fname,
- pack_opt_t *options);
+ pack_opt_t *options,
+ int argc,
+ const char *argv[]);
int copy_objects(const char* fnamein,
const char* fnameout,
- pack_opt_t *options);
+ pack_opt_t *options,
+ int argc,
+ const char *argv[]);
void print_objlist(const char *filename,
int nobjects,
diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c
index e5d962a..436012a 100644
--- a/tools/h5repack/h5repack_copy.c
+++ b/tools/h5repack/h5repack_copy.c
@@ -145,7 +145,9 @@ static void print_obj(hid_t dcpl_id, char *name)
int copy_objects(const char* fnamein,
const char* fnameout,
- pack_opt_t *options)
+ pack_opt_t *options,
+ int argc,
+ const char *argv[])
{
hid_t fidin;
hid_t fidout=(-1);
@@ -155,12 +157,12 @@ int copy_objects(const char* fnamein,
* open the files
*-------------------------------------------------------------------------
*/
- if ((fidin=H5Fopen(fnamein,H5F_ACC_RDONLY,H5P_DEFAULT))<0 ){
- printf("h5repack: <%s>: %s\n", fnamein, H5FOPENERROR );
+ if ((fidin=h5tools_fopen(fnamein, NULL, NULL, 0, argc, argv))<0 ){
+ printf("<%s>: %s\n", fnamein, H5FOPENERROR );
goto out;
}
if ((fidout=H5Fcreate(fnameout,H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT))<0 ){
- printf("h5repack: <%s>: Could not create file\n", fnameout );
+ printf("<%s>: Could not create file\n", fnameout );
goto out;
}
@@ -179,7 +181,7 @@ int copy_objects(const char* fnamein,
*-------------------------------------------------------------------------
*/
if(do_copy_objects(fidin,fidout,travt,options)<0) {
- printf("h5repack: <%s>: Could not copy data to: %s\n", fnamein, fnameout);
+ printf("<%s>: Could not copy data to: %s\n", fnamein, fnameout);
goto out;
}
@@ -189,7 +191,7 @@ int copy_objects(const char* fnamein,
*-------------------------------------------------------------------------
*/
if(do_copy_refobjs(fidin,fidout,travt,options)<0) {
- printf("h5repack: <%s>: Could not copy data to: %s\n", fnamein, fnameout);
+ printf("<%s>: Could not copy data to: %s\n", fnamein, fnameout);
goto out;
}
diff --git a/tools/h5repack/h5repack_filters.c b/tools/h5repack/h5repack_filters.c
index 1f4c2d7..a96d5be 100644
--- a/tools/h5repack/h5repack_filters.c
+++ b/tools/h5repack/h5repack_filters.c
@@ -201,24 +201,25 @@ int apply_filters(const char* name, /* object name from traverse list */
int i;
pack_info_t obj;
-
if (rank==0)
goto out;
- /*-------------------------------------------------------------------------
- * initialize the assigment object
- *-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
+ * initialize the assigment object
+ *-------------------------------------------------------------------------
*/
init_packobject(&obj);
-
- /*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
* find options
*-------------------------------------------------------------------------
*/
if (aux_assign_obj(name,options,&obj)==0)
return 0;
+ /* get information about input filters */
+ if ((nfilters = H5Pget_nfilters(dcpl_id))<0)
+ return -1;
/* check for datasets too small */
if ((size=H5Tget_size(type_id))==0)
@@ -228,21 +229,18 @@ int apply_filters(const char* name, /* object name from traverse list */
nelmts*=dims[i];
if (nelmts*size < options->threshold )
{
- if (options->verbose)
+ if (nfilters && options->verbose)
printf("Warning: Filter not applied to <%s>. Dataset smaller than <%d> bytes\n",
name,(int)options->threshold);
return 0;
}
-
- /* get information about input filters */
- if ((nfilters = H5Pget_nfilters(dcpl_id))<0)
- return -1;
- /*-------------------------------------------------------------------------
+
+ /*-------------------------------------------------------------------------
* check if we have filters in the pipeline
* we want to replace them with the input filters
* only remove if we are inserting new ones
*-------------------------------------------------------------------------
- */
+ */
if (nfilters && obj.nfilters ) {
if (H5Premove_filter(dcpl_id,H5Z_FILTER_ALL)<0)
return -1;
diff --git a/tools/h5repack/h5repack_list.c b/tools/h5repack/h5repack_list.c
index ab7e5b2..b98af5c 100644
--- a/tools/h5repack/h5repack_list.c
+++ b/tools/h5repack/h5repack_list.c
@@ -35,7 +35,9 @@
*-------------------------------------------------------------------------
*/
int check_objects(const char* fname,
- pack_opt_t *options)
+ pack_opt_t *options,
+ int argc,
+ const char *argv[])
{
hid_t fid;
int i;
@@ -45,18 +47,10 @@ int check_objects(const char* fname,
* open the file
*-------------------------------------------------------------------------
*/
-
- /* disable out reporting */
- H5E_BEGIN_TRY {
-
- /* Open the files */
- if ((fid=H5Fopen(fname,H5F_ACC_RDONLY,H5P_DEFAULT))<0 ){
- printf("h5repack: <%s>: %s\n", fname, H5FOPENERROR );
- exit(1);
+ if ((fid=h5tools_fopen(fname, NULL, NULL, 0, argc, argv))<0){
+ printf("<%s>: %s\n", fname, H5FOPENERROR );
+ return -1;
}
- /* enable out reporting */
- } H5E_END_TRY;
-
/*-------------------------------------------------------------------------
* get the list of objects in the file
diff --git a/tools/h5repack/h5repack_main.c b/tools/h5repack/h5repack_main.c
index 127dc01..333a49a 100644
--- a/tools/h5repack/h5repack_main.c
+++ b/tools/h5repack/h5repack_main.c
@@ -16,6 +16,8 @@
#include <string.h>
#include "h5repack.h"
+const char *progname = "h5repack";
+int d_status = EXIT_SUCCESS;
static void usage(void);
/*-------------------------------------------------------------------------
@@ -108,7 +110,7 @@ int main(int argc, char **argv)
}
/* pack it */
- ret=h5repack(infile,outfile,&options);
+ ret=h5repack(infile,outfile,&options,argc,argv);
/* free tables */
h5repack_end(&options);
diff --git a/tools/h5repack/h5repack_verify.c b/tools/h5repack/h5repack_verify.c
index 6653233..6381075 100644
--- a/tools/h5repack/h5repack_verify.c
+++ b/tools/h5repack/h5repack_verify.c
@@ -366,12 +366,12 @@ int h5repack_cmpdcpl(const char *fname1,
/* Open the files */
if ((fid1=H5Fopen(fname1,H5F_ACC_RDONLY,H5P_DEFAULT))<0 )
{
- printf("h5repack: <%s>: %s\n", fname1, H5FOPENERROR );
+ printf("<%s>: %s\n", fname1, H5FOPENERROR );
return -1;
}
if ((fid2=H5Fopen(fname2,H5F_ACC_RDONLY,H5P_DEFAULT))<0 )
{
- printf("h5repack: <%s>: %s\n", fname2, H5FOPENERROR );
+ printf("<%s>: %s\n", fname2, H5FOPENERROR );
H5Fclose(fid1);
return -1;
}
diff --git a/tools/h5repack/testh5repack_main.c b/tools/h5repack/testh5repack_main.c
index 42beb76..19dc956 100644
--- a/tools/h5repack/testh5repack_main.c
+++ b/tools/h5repack/testh5repack_main.c
@@ -36,8 +36,10 @@
*-------------------------------------------------------------------------
*/
+const char *progname = "h5repacktst";
+int d_status = EXIT_SUCCESS;
-int main (void)
+int main (int argc, char **argv)
{
pack_opt_t pack_options;
diff_opt_t diff_options;
@@ -70,7 +72,7 @@ int main (void)
TESTING(" copy of datasets (fill values)");
if (h5repack_init (&pack_options, 0)<0)
TEST_ERROR;
- if (h5repack(FNAME0,FNAME0OUT,&pack_options)<0)
+ if (h5repack(FNAME0,FNAME0OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME0,FNAME0OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -91,7 +93,7 @@ int main (void)
TESTING(" copy of datasets (all datatypes)");
if (h5repack_init (&pack_options, 0)<0)
TEST_ERROR;
- if (h5repack(FNAME1,FNAME1OUT,&pack_options)<0)
+ if (h5repack(FNAME1,FNAME1OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME1,FNAME1OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -110,7 +112,7 @@ int main (void)
TESTING(" copy of datasets (attributes)");
if (h5repack_init (&pack_options, 0)<0)
TEST_ERROR;
- if (h5repack(FNAME2,FNAME2OUT,&pack_options)<0)
+ if (h5repack(FNAME2,FNAME2OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME2,FNAME2OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -130,7 +132,7 @@ int main (void)
TESTING(" copy of datasets (hardlinks)");
if (h5repack_init (&pack_options, 0)<0)
TEST_ERROR;
- if (h5repack(FNAME3,FNAME3OUT,&pack_options)<0)
+ if (h5repack(FNAME3,FNAME3OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME3,FNAME3OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -150,7 +152,7 @@ int main (void)
TESTING(" copy of allocation early file");
if (h5repack_init (&pack_options, 0)<0)
TEST_ERROR;
- if (h5repack(FNAME5,FNAME5OUT,&pack_options)<0)
+ if (h5repack(FNAME5,FNAME5OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME5,FNAME5OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -184,7 +186,7 @@ int main (void)
TEST_ERROR;
if (h5repack_addlayout("dset1:CHUNK=20x10",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -212,7 +214,7 @@ int main (void)
TEST_ERROR;
if (h5repack_addlayout("CHUNK=20x10",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -250,7 +252,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addlayout("dset2:CHUNK=20x10",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -280,7 +282,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addfilter("SZIP=8,NN",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -313,7 +315,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addlayout("dset1:CHUNK=20x10",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -342,7 +344,7 @@ TESTING(" addding shuffle filter to all");
TEST_ERROR;
if (h5repack_addlayout("CHUNK=20x10",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -373,7 +375,7 @@ TESTING(" addding shuffle filter to all");
TEST_ERROR;
if (h5repack_addlayout("dset1:CHUNK=20x10",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -403,7 +405,7 @@ TESTING(" addding shuffle filter to all");
TEST_ERROR;
if (h5repack_addlayout("CHUNK=20x10",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -452,7 +454,7 @@ if (szip_can_encode) {
TEST_ERROR;
#endif
- if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -475,7 +477,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addlayout("dset1:CHUNK=20x10",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -495,7 +497,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addlayout("CHUNK=20x10",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -516,7 +518,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addlayout("dset1:CONTI",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -537,7 +539,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addlayout("CONTI",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -559,7 +561,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addlayout("dset1:COMPA",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -580,7 +582,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addlayout("COMPA",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -602,7 +604,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addlayout("dset_compact:CONTI",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -622,7 +624,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addlayout("dset_compact:CHUNK=2x5",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -642,7 +644,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addlayout("dset_compact:COMPA",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -661,7 +663,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addlayout("dset_contiguous:COMPA",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -680,7 +682,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addlayout("dset_contiguous:CHUNK=3x6",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -700,7 +702,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addlayout("dset_contiguous:CONTI",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -719,7 +721,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addlayout("dset_chunk:COMPA",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -739,7 +741,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addlayout("dset_chunk:CONTI",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -758,7 +760,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addlayout("dset_chunk:CHUNK=18x13",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -786,7 +788,7 @@ if (szip_can_encode) {
if (szip_can_encode) {
if (h5repack_init (&pack_options, 0)<0)
TEST_ERROR;
- if (h5repack(FNAME7,FNAME7OUT,&pack_options)<0)
+ if (h5repack(FNAME7,FNAME7OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME7,FNAME7OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -811,7 +813,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addfilter("dset_szip:NONE",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME7,FNAME7OUT,&pack_options)<0)
+ if (h5repack(FNAME7,FNAME7OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME7,FNAME7OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -834,7 +836,7 @@ if (szip_can_encode) {
#ifdef H5_HAVE_FILTER_DEFLATE
if (h5repack_init (&pack_options, 0)<0)
TEST_ERROR;
- if (h5repack(FNAME8,FNAME8OUT,&pack_options)<0)
+ if (h5repack(FNAME8,FNAME8OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME8,FNAME8OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -856,7 +858,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addfilter("dset_deflate:NONE",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME8,FNAME8OUT,&pack_options)<0)
+ if (h5repack(FNAME8,FNAME8OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME8,FNAME8OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -877,7 +879,7 @@ if (szip_can_encode) {
#ifdef H5_HAVE_FILTER_SHUFFLE
if (h5repack_init (&pack_options, 0)<0)
TEST_ERROR;
- if (h5repack(FNAME9,FNAME9OUT,&pack_options)<0)
+ if (h5repack(FNAME9,FNAME9OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME9,FNAME9OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -898,7 +900,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addfilter("dset_shuffle:NONE",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME9,FNAME9OUT,&pack_options)<0)
+ if (h5repack(FNAME9,FNAME9OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME9,FNAME9OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -917,7 +919,7 @@ if (szip_can_encode) {
#ifdef H5_HAVE_FILTER_FLETCHER32
if (h5repack_init (&pack_options, 0)<0)
TEST_ERROR;
- if (h5repack(FNAME10,FNAME10OUT,&pack_options)<0)
+ if (h5repack(FNAME10,FNAME10OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME10,FNAME10OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -938,7 +940,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addfilter("dset_fletcher32:NONE",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME10,FNAME10OUT,&pack_options)<0)
+ if (h5repack(FNAME10,FNAME10OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME10,FNAME10OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -958,7 +960,7 @@ if (szip_can_encode) {
#ifdef H5_HAVE_FILTER_NBIT
if (h5repack_init (&pack_options, 0)<0)
TEST_ERROR;
- if (h5repack(FNAME12,FNAME12OUT,&pack_options)<0)
+ if (h5repack(FNAME12,FNAME12OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME12,FNAME12OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -979,7 +981,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addfilter("dset_nbit:NONE",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME12,FNAME12OUT,&pack_options)<0)
+ if (h5repack(FNAME12,FNAME12OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME12,FNAME12OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -1000,7 +1002,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addfilter("dset_int31:NBIT",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME12,FNAME12OUT,&pack_options)<0)
+ if (h5repack(FNAME12,FNAME12OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME12,FNAME12OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -1018,7 +1020,7 @@ if (szip_can_encode) {
#ifdef H5_HAVE_FILTER_SCALEOFFSET
if (h5repack_init (&pack_options, 0)<0)
TEST_ERROR;
- if (h5repack(FNAME13,FNAME13OUT,&pack_options)<0)
+ if (h5repack(FNAME13,FNAME13OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME13,FNAME13OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -1039,7 +1041,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addfilter("dset_scaleoffset:NONE",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME13,FNAME13OUT,&pack_options)<0)
+ if (h5repack(FNAME13,FNAME13OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME13,FNAME13OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -1061,7 +1063,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addfilter("dset_none:SOFF=31,IN",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME13,FNAME13OUT,&pack_options)<0)
+ if (h5repack(FNAME13,FNAME13OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME13,FNAME13OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -1097,7 +1099,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addfilter("dset_deflate:SZIP=8,NN",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME11,FNAME11OUT,&pack_options)<0)
+ if (h5repack(FNAME11,FNAME11OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME11,FNAME11OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -1125,7 +1127,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addfilter("dset_szip:GZIP=1",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME11,FNAME11OUT,&pack_options)<0)
+ if (h5repack(FNAME11,FNAME11OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME11,FNAME11OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -1157,7 +1159,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addfilter("NONE",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME11,FNAME11OUT,&pack_options)<0)
+ if (h5repack(FNAME11,FNAME11OUT,&pack_options,argc,argv)<0)
TEST_ERROR;
if (h5diff(FNAME11,FNAME11OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;