summaryrefslogtreecommitdiffstats
path: root/tools/h5repack
diff options
context:
space:
mode:
Diffstat (limited to 'tools/h5repack')
-rw-r--r--tools/h5repack/h5repack.c8
-rw-r--r--tools/h5repack/h5repack.h12
-rw-r--r--tools/h5repack/h5repack_copy.c6
-rw-r--r--tools/h5repack/h5repack_filters.c1
-rw-r--r--tools/h5repack/h5repack_list.c4
-rw-r--r--tools/h5repack/h5repack_main.c2
-rw-r--r--tools/h5repack/testh5repack_attr.c6
-rw-r--r--tools/h5repack/testh5repack_dset.c6
-rw-r--r--tools/h5repack/testh5repack_main.c92
9 files changed, 62 insertions, 75 deletions
diff --git a/tools/h5repack/h5repack.c b/tools/h5repack/h5repack.c
index cc39201..3469704 100644
--- a/tools/h5repack/h5repack.c
+++ b/tools/h5repack/h5repack.c
@@ -68,20 +68,18 @@ static void aux_initglb_filter(pack_opt_t *options)
*/
int h5repack(const char* infile,
const char* outfile,
- pack_opt_t *options,
- int argc,
- const char *argv[])
+ pack_opt_t *options)
{
/* check input */
if (check_options(options)<0)
return -1;
/* check for objects in input that are in the file */
- if (check_objects(infile,options,argc,argv)<0)
+ if (check_objects(infile,options) < 0)
return -1;
/* copy the objects */
- if (copy_objects(infile,outfile,options,argc,argv)<0)
+ if (copy_objects(infile,outfile,options) < 0)
return -1;
diff --git a/tools/h5repack/h5repack.h b/tools/h5repack/h5repack.h
index e859347..29909b7 100644
--- a/tools/h5repack/h5repack.h
+++ b/tools/h5repack/h5repack.h
@@ -114,8 +114,7 @@ typedef struct {
extern "C" {
#endif
-int h5repack (const char* infile, const char* outfile, pack_opt_t *options,
- int argc, const char *argv[]);
+int h5repack (const char* infile, const char* outfile, pack_opt_t *options);
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);
@@ -138,15 +137,11 @@ int h5repack_cmpdcpl (const char *fname1,
int check_objects(const char* fname,
- pack_opt_t *options,
- int argc,
- const char *argv[]);
+ pack_opt_t *options);
int copy_objects(const char* fnamein,
const char* fnameout,
- pack_opt_t *options,
- int argc,
- const char *argv[]);
+ pack_opt_t *options);
void print_objlist(const char *filename,
int nobjects,
@@ -184,7 +179,6 @@ 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, /* dataset creation property list */
- hid_t type_id, /* datatype */
pack_opt_t *options); /* repack options */
int has_filter(hid_t dcpl_id,
diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c
index b2c375c..b0677ef 100644
--- a/tools/h5repack/h5repack_copy.c
+++ b/tools/h5repack/h5repack_copy.c
@@ -168,9 +168,7 @@ static void print_dataset_info(hid_t dcpl_id,
int copy_objects(const char* fnamein,
const char* fnameout,
- pack_opt_t *options,
- int argc,
- const char *argv[])
+ pack_opt_t *options)
{
hid_t fidin;
hid_t fidout;
@@ -431,7 +429,7 @@ int do_copy_objects(hid_t fidin,
*-------------------------------------------------------------------------
*/
if (apply_s){
- if (apply_filters(travt->objs[i].name,rank,dims,dcpl_out,mtype_id,options)<0)
+ if (apply_filters(travt->objs[i].name,rank,dims,dcpl_out,options)<0)
goto error;
}
diff --git a/tools/h5repack/h5repack_filters.c b/tools/h5repack/h5repack_filters.c
index 75ca771..60a0336 100644
--- a/tools/h5repack/h5repack_filters.c
+++ b/tools/h5repack/h5repack_filters.c
@@ -190,7 +190,6 @@ 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, /* dataset creation property list */
- hid_t type_id, /* dataset datatype */
pack_opt_t *options) /* repack options */
{
int nfilters; /* number of filters in DCPL */
diff --git a/tools/h5repack/h5repack_list.c b/tools/h5repack/h5repack_list.c
index 32cbc24..9912732 100644
--- a/tools/h5repack/h5repack_list.c
+++ b/tools/h5repack/h5repack_list.c
@@ -36,9 +36,7 @@ extern char *progname;
*-------------------------------------------------------------------------
*/
int check_objects(const char* fname,
- pack_opt_t *options,
- int argc,
- const char *argv[])
+ pack_opt_t *options)
{
hid_t fid;
int i;
diff --git a/tools/h5repack/h5repack_main.c b/tools/h5repack/h5repack_main.c
index 92433f9..074f937 100644
--- a/tools/h5repack/h5repack_main.c
+++ b/tools/h5repack/h5repack_main.c
@@ -120,7 +120,7 @@ int main(int argc, char **argv)
}
/* pack it */
- ret=h5repack(infile,outfile,&options,argc,argv);
+ ret=h5repack(infile,outfile,&options);
/* free tables */
h5repack_end(&options);
diff --git a/tools/h5repack/testh5repack_attr.c b/tools/h5repack/testh5repack_attr.c
index 7635cf2..5064aa1 100644
--- a/tools/h5repack/testh5repack_attr.c
+++ b/tools/h5repack/testh5repack_attr.c
@@ -319,7 +319,7 @@ position array of </g1> array of </g1> difference
[ 1 ] 5 0 5
[ 1 ] 6 0 6
*/
- type_id = H5Tarray_create(H5T_NATIVE_INT,1,dimarray,NULL);
+ type_id = H5Tarray_create(H5T_NATIVE_INT, 1, dimarray, NULL);
make_attr(loc_id,1,dims,"array",type_id,buf6);
status = H5Tclose(type_id);
@@ -598,7 +598,7 @@ position array2D of </g1> array2D of </g1> difference
[ 2 1 ] 17 0 17
[ 2 1 ] 18 0 18
*/
- type_id = H5Tarray_create(H5T_NATIVE_INT,1,dimarray,NULL);
+ type_id = H5Tarray_create(H5T_NATIVE_INT, 1, dimarray, NULL);
make_attr(loc_id,2,dims2,"array2D",type_id,buf62);
status = H5Tclose(type_id);
@@ -986,7 +986,7 @@ etc
etc
*/
- type_id = H5Tarray_create(H5T_NATIVE_INT,1,dimarray,NULL);
+ type_id = H5Tarray_create(H5T_NATIVE_INT, 1, dimarray, NULL);
make_attr(loc_id,3,dims3,"array3D",type_id,buf63);
status = H5Tclose(type_id);
diff --git a/tools/h5repack/testh5repack_dset.c b/tools/h5repack/testh5repack_dset.c
index 244aaae..0e6fbc2 100644
--- a/tools/h5repack/testh5repack_dset.c
+++ b/tools/h5repack/testh5repack_dset.c
@@ -255,7 +255,7 @@ void write_dset_in(hid_t loc_id,
}
}
- type_id = H5Tarray_create(H5T_NATIVE_INT,1,dimarray,NULL);
+ type_id = H5Tarray_create(H5T_NATIVE_INT, 1, dimarray, NULL);
write_dset(loc_id,1,dims,"array",type_id,buf6);
status = H5Tclose(type_id);
@@ -404,7 +404,7 @@ void write_dset_in(hid_t loc_id,
}
- type_id = H5Tarray_create(H5T_NATIVE_INT,1,dimarray,NULL);
+ type_id = H5Tarray_create(H5T_NATIVE_INT, 1, dimarray, NULL);
write_dset(loc_id,2,dims2,"array2D",type_id,buf62);
status = H5Tclose(type_id);
@@ -587,7 +587,7 @@ void write_dset_in(hid_t loc_id,
}
}
- type_id = H5Tarray_create(H5T_NATIVE_INT,1,dimarray,NULL);
+ type_id = H5Tarray_create(H5T_NATIVE_INT, 1, dimarray, NULL);
write_dset(loc_id,3,dims3,"array3D",type_id,buf63);
status = H5Tclose(type_id);
diff --git a/tools/h5repack/testh5repack_main.c b/tools/h5repack/testh5repack_main.c
index e219497..9ecef36 100644
--- a/tools/h5repack/testh5repack_main.c
+++ b/tools/h5repack/testh5repack_main.c
@@ -69,7 +69,7 @@ int main (int argc, const char *argv[])
TESTING(" copy of datasets (fill values)");
if (h5repack_init (&pack_options, 0)<0)
TEST_ERROR;
- if (h5repack(FNAME0,FNAME0OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME0,FNAME0OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME0,FNAME0OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -90,7 +90,7 @@ int main (int argc, const char *argv[])
TESTING(" copy of datasets (all datatypes)");
if (h5repack_init (&pack_options, 0)<0)
TEST_ERROR;
- if (h5repack(FNAME1,FNAME1OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME1,FNAME1OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME1,FNAME1OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -109,7 +109,7 @@ int main (int argc, const char *argv[])
TESTING(" copy of datasets (attributes)");
if (h5repack_init (&pack_options, 0)<0)
TEST_ERROR;
- if (h5repack(FNAME2,FNAME2OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME2,FNAME2OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME2,FNAME2OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -129,7 +129,7 @@ int main (int argc, const char *argv[])
TESTING(" copy of datasets (hardlinks)");
if (h5repack_init (&pack_options, 0)<0)
TEST_ERROR;
- if (h5repack(FNAME3,FNAME3OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME3,FNAME3OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME3,FNAME3OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -149,7 +149,7 @@ int main (int argc, const char *argv[])
TESTING(" copy of allocation early file");
if (h5repack_init (&pack_options, 0)<0)
TEST_ERROR;
- if (h5repack(FNAME5,FNAME5OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME5,FNAME5OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME5,FNAME5OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -183,7 +183,7 @@ int main (int argc, const char *argv[])
TEST_ERROR;
if (h5repack_addlayout("dset1:CHUNK=20x10",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -211,7 +211,7 @@ int main (int argc, const char *argv[])
TEST_ERROR;
if (h5repack_addlayout("CHUNK=20x10",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -249,7 +249,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addlayout("dset2:CHUNK=20x10",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -279,7 +279,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addfilter("SZIP=8,NN",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -312,7 +312,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addlayout("dset1:CHUNK=20x10",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -341,7 +341,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,argc,argv)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -372,7 +372,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,argc,argv)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -402,7 +402,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,argc,argv)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -451,7 +451,7 @@ if (szip_can_encode) {
TEST_ERROR;
#endif
- if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -474,7 +474,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addlayout("dset1:CHUNK=20x10",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -494,7 +494,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addlayout("CHUNK=20x10",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -515,7 +515,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addlayout("dset1:CONTI",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -536,7 +536,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addlayout("CONTI",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -558,7 +558,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addlayout("dset1:COMPA",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -579,7 +579,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addlayout("COMPA",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -601,7 +601,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addlayout("dset_compact:CONTI",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -621,7 +621,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,argc,argv)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -641,7 +641,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addlayout("dset_compact:COMPA",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -660,7 +660,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addlayout("dset_contiguous:COMPA",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -679,7 +679,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,argc,argv)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -699,7 +699,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addlayout("dset_contiguous:CONTI",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -718,7 +718,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addlayout("dset_chunk:COMPA",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -738,7 +738,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addlayout("dset_chunk:CONTI",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME4,FNAME4OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -757,7 +757,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,argc,argv)<0)
+ if (h5repack(FNAME4,FNAME4OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME4,FNAME4OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -785,7 +785,7 @@ if (szip_can_encode) {
if (szip_can_encode) {
if (h5repack_init (&pack_options, 0)<0)
TEST_ERROR;
- if (h5repack(FNAME7,FNAME7OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME7,FNAME7OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME7,FNAME7OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -810,7 +810,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addfilter("dset_szip:NONE",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME7,FNAME7OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME7,FNAME7OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME7,FNAME7OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -833,7 +833,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,argc,argv)<0)
+ if (h5repack(FNAME8,FNAME8OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME8,FNAME8OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -855,7 +855,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addfilter("dset_deflate:NONE",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME8,FNAME8OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME8,FNAME8OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME8,FNAME8OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -876,7 +876,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,argc,argv)<0)
+ if (h5repack(FNAME9,FNAME9OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME9,FNAME9OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -897,7 +897,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addfilter("dset_shuffle:NONE",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME9,FNAME9OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME9,FNAME9OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME9,FNAME9OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -916,7 +916,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,argc,argv)<0)
+ if (h5repack(FNAME10,FNAME10OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME10,FNAME10OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -937,7 +937,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addfilter("dset_fletcher32:NONE",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME10,FNAME10OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME10,FNAME10OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME10,FNAME10OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -957,7 +957,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,argc,argv)<0)
+ if (h5repack(FNAME12,FNAME12OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME12,FNAME12OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -978,7 +978,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addfilter("dset_nbit:NONE",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME12,FNAME12OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME12,FNAME12OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME12,FNAME12OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -999,7 +999,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addfilter("dset_int31:NBIT",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME12,FNAME12OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME12,FNAME12OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME12,FNAME12OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -1017,7 +1017,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,argc,argv)<0)
+ if (h5repack(FNAME13,FNAME13OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME13,FNAME13OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -1038,7 +1038,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addfilter("dset_scaleoffset:NONE",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME13,FNAME13OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME13,FNAME13OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME13,FNAME13OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -1060,7 +1060,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,argc,argv)<0)
+ if (h5repack(FNAME13,FNAME13OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME13,FNAME13OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -1096,7 +1096,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,argc,argv)<0)
+ if (h5repack(FNAME11,FNAME11OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME11,FNAME11OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -1124,7 +1124,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,argc,argv)<0)
+ if (h5repack(FNAME11,FNAME11OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME11,FNAME11OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
@@ -1156,7 +1156,7 @@ if (szip_can_encode) {
TEST_ERROR;
if (h5repack_addfilter("NONE",&pack_options)<0)
TEST_ERROR;
- if (h5repack(FNAME11,FNAME11OUT,&pack_options,argc,argv)<0)
+ if (h5repack(FNAME11,FNAME11OUT,&pack_options) < 0)
TEST_ERROR;
if (h5diff(FNAME11,FNAME11OUT,NULL,NULL,&diff_options) == 1)
TEST_ERROR;
generated by cgit v0.12 at 2024-09-07 03:59:30 (GMT)