diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2007-10-17 12:48:04 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-10-17 12:48:04 (GMT) |
| commit | 13c484162cc9098e6538deec931563848011bdb5 (patch) | |
| tree | c33201bfab0f74c7e3bff9b17a55d92deb852118 /tools/lib | |
| parent | be729e5f78ae9308dd4a305039e8ddd58068d477 (diff) | |
| download | hdf5-13c484162cc9098e6538deec931563848011bdb5.zip hdf5-13c484162cc9098e6538deec931563848011bdb5.tar.gz hdf5-13c484162cc9098e6538deec931563848011bdb5.tar.bz2 | |
[svn-r14206] Description:
Make H5Pget_filter API versioned and switch internal usage to
H5Pget_filter2.
Add regression test for H5Pget_filter1.
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
Mac OS X/32 10.4.10 (amazon) in debug mode
Diffstat (limited to 'tools/lib')
| -rw-r--r-- | tools/lib/h5tools_filters.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/tools/lib/h5tools_filters.c b/tools/lib/h5tools_filters.c index 9ba9492..325023d 100644 --- a/tools/lib/h5tools_filters.c +++ b/tools/lib/h5tools_filters.c @@ -85,24 +85,20 @@ int h5tools_canreadf(const char* name, /* object name, serves also as boolean pr return 1; /* check availability of filters */ - for (i=0; i<nfilters; i++) + for(i = 0; i < nfilters; i++) { -#ifdef H5_WANT_H5_V1_6_COMPAT - if ((filtn = H5Pget_filter(dcpl_id,(unsigned)i,0,0,0,0,0))<0) -#else - if ((filtn = H5Pget_filter(dcpl_id,(unsigned)i,0,0,0,0,0,NULL))<0) -#endif + if((filtn = H5Pget_filter2(dcpl_id, (unsigned)i, 0, 0, 0, 0, 0, NULL)) < 0) return -1; - switch (filtn) + switch(filtn) { /*------------------------------------------------------------------------- * user defined filter *------------------------------------------------------------------------- */ default: - if (name) - print_warning(name,"user defined"); + if(name) + print_warning(name, "user defined"); return 0; /*------------------------------------------------------------------------- |