diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2006-04-07 17:45:40 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2006-04-07 17:45:40 (GMT) |
| commit | 8ba0c76fe5e1989c503f395e3c1aafa3dff7c53b (patch) | |
| tree | 18eb3be7fb637974337624fa38f2f0322c5cad78 /tools | |
| parent | e3cdaeab1c75130cd0d20af7d2949dd83f50a344 (diff) | |
| download | hdf5-8ba0c76fe5e1989c503f395e3c1aafa3dff7c53b.zip hdf5-8ba0c76fe5e1989c503f395e3c1aafa3dff7c53b.tar.gz hdf5-8ba0c76fe5e1989c503f395e3c1aafa3dff7c53b.tar.bz2 | |
[svn-r12211] Purpose:
new feature
Description
some more check in related to the print of compression ratios: print warning messages after the print of the dataset name and compression:
Solution:
Platforms tested:
linux
solaris
AIX
Misc. update:
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/h5repack/h5repack.h | 3 | ||||
| -rw-r--r-- | tools/h5repack/h5repack_copy.c | 2 | ||||
| -rw-r--r-- | tools/h5repack/h5repack_filters.c | 9 |
3 files changed, 5 insertions, 9 deletions
diff --git a/tools/h5repack/h5repack.h b/tools/h5repack/h5repack.h index c4e70db..e835b66 100644 --- a/tools/h5repack/h5repack.h +++ b/tools/h5repack/h5repack.h @@ -185,8 +185,7 @@ int apply_filters(const char* name, /* object name from traverse list */ 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 *apply_f); + pack_opt_t *options); /* repack options */ int has_filter(hid_t dcpl_id, H5Z_filter_t filtnin); diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c index 666a7fa..55b56d1 100644 --- a/tools/h5repack/h5repack_copy.c +++ b/tools/h5repack/h5repack_copy.c @@ -428,7 +428,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,&apply_f)<0) + if (apply_filters(travt->objs[i].name,rank,dims,dcpl_out,mtype_id,options)<0) goto error; } diff --git a/tools/h5repack/h5repack_filters.c b/tools/h5repack/h5repack_filters.c index a3ba70d..9f3b192 100644 --- a/tools/h5repack/h5repack_filters.c +++ b/tools/h5repack/h5repack_filters.c @@ -191,8 +191,7 @@ int apply_filters(const char* name, /* object name from traverse list */ 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 *apply_f) + pack_opt_t *options) /* repack options */ { int nfilters; /* number of filters in DCPL */ hsize_t chsize[64]; /* chunk size in elements */ @@ -200,11 +199,9 @@ int apply_filters(const char* name, /* object name from traverse list */ int i; pack_info_t obj; - if (rank==0) - { - *apply_f=0; + if (rank==0) /* scalar dataset, do not apply */ return 0; - } + /*------------------------------------------------------------------------- * initialize the assigment object |