[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

1 files changed, 12 insertions, 25 deletions

diff --git a/tools/h5repack/h5repack_copy.c b/tools/h5repack/h5repack_copy.c
index b1417e1..e6c32c6 100644
--- a/tools/h5repack/h5repack_copy.c
+++ b/tools/h5repack/h5repack_copy.c
@@ -1053,36 +1053,19 @@ static void print_dataset_info(hid_t dcpl_id,
  strcpy(strfilter,"\0");
 
  /* get information about input filters */
- if ((nfilters = H5Pget_nfilters(dcpl_id)) < 0)
+ if((nfilters = H5Pget_nfilters(dcpl_id)) < 0)
   return;
 
- for ( i=0; i<nfilters; i++)
- {
+ for(i = 0; i < nfilters; i++) {
   cd_nelmts = NELMTS(cd_values);
 
-#ifdef H5_WANT_H5_V1_6_COMPAT
-  filtn = H5Pget_filter(dcpl_id,
-   (unsigned)i,
-   &filt_flags,
-   &cd_nelmts,
-   cd_values,
-   sizeof(f_objname),
-   f_objname);
-#else
-  filtn = H5Pget_filter(dcpl_id,
-   (unsigned)i,
-   &filt_flags,
-   &cd_nelmts,
-   cd_values,
-   sizeof(f_objname),
-   f_objname,
-   NULL);
-#endif /* H5_WANT_H5_V1_6_COMPAT */
-
-  switch (filtn)
-  {
+  filtn = H5Pget_filter2(dcpl_id, (unsigned)i, &filt_flags, &cd_nelmts,
+   cd_values, sizeof(f_objname), f_objname, NULL);
+
+  switch(filtn) {
   default:
    break;
+
   case H5Z_FILTER_DEFLATE:
    strcat(strfilter,"GZIP ");
 
@@ -1093,8 +1076,8 @@ static void print_dataset_info(hid_t dcpl_id,
     strcat(strfilter,temp);
    }
 #endif
-
    break;
+
   case H5Z_FILTER_SZIP:
    strcat(strfilter,"SZIP ");
 
@@ -1114,15 +1097,19 @@ static void print_dataset_info(hid_t dcpl_id,
 #endif
 
    break;
+
   case H5Z_FILTER_SHUFFLE:
    strcat(strfilter,"SHUF ");
    break;
+
   case H5Z_FILTER_FLETCHER32:
    strcat(strfilter,"FLET ");
    break;
+
   case H5Z_FILTER_NBIT:
    strcat(strfilter,"NBIT ");
    break;
+
   case H5Z_FILTER_SCALEOFFSET:
    strcat(strfilter,"SCALEOFFSET ");
    break;