From 7e2e0f164d6d19694adef92c7b76a7772df174c0 Mon Sep 17 00:00:00 2001
From: Quincey Koziol <koziol@hdfgroup.org>
Date: Thu, 3 Apr 2003 08:58:53 -0500
Subject: [svn-r6582] Purpose:     Code cleanup

Description:
    Updated copyright.

    Removed szip-specific testing in favor of standard testing, now that bugs
in the szip filter are fixed.

    Updated to latest version of H5Pset_szip API


Solution:

Platforms tested:
    FreeBSD 4.8 (sleipnir)
    IRIX64 6.5 (modi4) w/parallel

Misc. update:
---
 test/dsets.c | 397 +++++++----------------------------------------------------
 1 file changed, 46 insertions(+), 351 deletions(-)

diff --git a/test/dsets.c b/test/dsets.c
index b0317d5..32f25e4 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -1,7 +1,18 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+ * of the source code distribution tree; Copyright.html can be found at the  *
+ * root level of an installed copy of the electronic HDF5 document set and   *
+ * is linked from the top-level documents page.  It can also be found at     *
+ * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have     *
+ * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
 /*
- * Copyright (C) 1997 NCSA
- *		      All rights reserved.
- *
  * Programmer:	Robb Matzke <matzke@llnl.gov>
  *		Tuesday, December  9, 1997
  *
@@ -9,7 +20,6 @@
  */
 
 #include "h5test.h"
-#include "H5Zprivate.h"         /* Filter functions */
 
 const char *FILENAME[] = {
     "dataset",
@@ -20,6 +30,7 @@ const char *FILENAME[] = {
 
 #define FILE_DEFLATE_NAME       "deflate.h5"
 
+/* Dataset names for testing filters */
 #define DSET_DEFAULT_NAME	"default"
 #define DSET_CHUNKED_NAME	"chunked"
 #define DSET_COMPACT_NAME       "compact"
@@ -41,10 +52,13 @@ const char *FILENAME[] = {
 #define DSET_MISSING_NAME	"missing"
 #define DSET_ONEBYTE_SHUF_NAME   "onebyte_shuffle"
 
-#define USER_BLOCK              512 
+#define USER_BLOCK              1024
+
+/* Temporary filter IDs used for testing */
 #define H5Z_BOGUS		305
 #define H5Z_CORRUPT		306
 
+/* Flags for testing filters */
 #define DISABLE_FLETCHER32      0
 #define ENABLE_FLETCHER32       1
 #define DATA_CORRUPTED          1
@@ -768,8 +782,8 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32,
      * might as well test all we can!
      */
     if ((dxpl = H5Pcreate (H5P_DATASET_XFER))<0) goto error;
-    tconv_buf = malloc (80000);
-    if (H5Pset_buffer (dxpl, 80000, tconv_buf, NULL)<0) goto error;
+    tconv_buf = malloc (1000);
+    if (H5Pset_buffer (dxpl, 1000, tconv_buf, NULL)<0) goto error;
     if (if_fletcher32==DISABLE_FLETCHER32) {
         if(H5Pset_edc_check(dxpl, H5Z_DISABLE_EDC)<0)
             goto error;
@@ -818,13 +832,10 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32,
 	}
     }
 
-    if (H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, points)<0){
+    if (H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, points)<0)
 	goto error;
-    }
         
-    if((*dset_size=H5Dget_storage_size(dataset))==0) {
-      goto error;
-      }
+    if((*dset_size=H5Dget_storage_size(dataset))==0) goto error;
 
     PASSED();
 
@@ -910,7 +921,6 @@ test_filter_internal(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32,
         if(status>=0) goto error;
     } else {
         /* Read the dataset back and check it */
-        fflush(stdout);
         if (H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, check)<0)
 	   goto error;
 
@@ -1057,331 +1067,6 @@ error:
     return -1;
 }
 
-/*-------------------------------------------------------------------------
- * Function:	test_filter_internal_szip
- *
- * Purpose:	Tests dataset compression. If compression is requested when
- *		it hasn't been compiled into the library (such as when
- *		updating an existing compressed dataset) then data is sent to
- *		the file uncompressed but no errors are returned.
- *
- * Return:	Success:	0
- *		Failure:	-1
- *
- * Programmer:	Robb Matzke
- *              Wednesday, April 15, 1998
- *
- * Modifications:
- *              Moved out of main test_compression routine
- *              Quincey Koziol, November 14, 2002
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-test_filter_internal_szip(hid_t fid, const char *name, hid_t dcpl, int if_fletcher32, 
-                     int corrupted, hsize_t *dset_size)
-{
-    hid_t		dataset;        /* Dataset ID */
-    hid_t		dxpl;           /* Dataset xfer property list ID */
-    hid_t		sid;            /* Dataspace ID */
-    const hsize_t	size[2] = {100, 200};           /* Dataspace dimensions */
-    const hssize_t	hs_offset[2] = {7, 30}; /* Hyperslab offset */
-    const hsize_t	hs_size[2] = {4, 50};   /* Hyperslab size */
-    void		*tconv_buf = NULL;      /* Temporary conversion buffer */
-    hsize_t		i, j, n;        /* Local index variables */
-    herr_t              status;         /* Error status */
-
-    /* Create the data space */
-    if ((sid = H5Screate_simple(2, size, NULL))<0) goto error;
-
-    /*
-     * Create a small conversion buffer to test strip mining. We
-     * might as well test all we can!
-     */
-    if ((dxpl = H5Pcreate (H5P_DATASET_XFER))<0) goto error;
-    tconv_buf = malloc (80000);
-    if (H5Pset_buffer (dxpl, 80000, tconv_buf, NULL)<0) goto error;
-    if (if_fletcher32==DISABLE_FLETCHER32) {
-        if(H5Pset_edc_check(dxpl, H5Z_DISABLE_EDC)<0)
-            goto error;
-        if(H5Z_DISABLE_EDC != H5Pget_edc_check(dxpl))
-        goto error;
-    }
-    TESTING("    filters (setup)");
-    
-    /* Create the dataset */
-    if ((dataset = H5Dcreate(fid, name, H5T_NATIVE_INT, sid,
-			     dcpl))<0) goto error;
-    PASSED();
-
-    /*----------------------------------------------------------------------
-     * STEP 1: Read uninitialized data.  It should be zero.
-     *---------------------------------------------------------------------- 
-     */
-    TESTING("    filters (uninitialized read)");
-
-    if (H5Dread (dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, check)<0)
-	goto error;
-    
-    for (i=0; i<size[0]; i++) {
-	for (j=0; j<size[1]; j++) {
-	    if (0!=check[i][j]) {
-		H5_FAILED();
-		printf("    Read a non-zero value.\n");
-		printf("    At index %lu,%lu\n",
-		       (unsigned long)i, (unsigned long)j);
-		goto error;
-	    }
-	}
-    }
-    PASSED();
-
-    /*----------------------------------------------------------------------
-     * STEP 2: Test filters by setting up a chunked dataset and writing
-     * to it.
-     *---------------------------------------------------------------------- 
-     */
-    TESTING("    filters (write)");
-    
-    for (i=n=0; i<size[0]; i++) {
-	for (j=0; j<size[1]; j++) {
-	    points[i][j] = (int)(n++)%128;
-	}
-    }
-
-    if (H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, points)<0){
-        printf("writing dataset failed\n");
-	goto error;
-    }
-        
-     *dset_size = H5Dget_storage_size(dataset);
-    PASSED();
-
-    /*----------------------------------------------------------------------
-     * STEP 3: Try to read the data we just wrote.
-     *---------------------------------------------------------------------- 
-     */
-    TESTING("    filters (read)");
-
-    /* Read the dataset back */
-    if(corrupted) {
-        /* Default behavior is failure when data is corrupted. */
-        H5E_BEGIN_TRY {
-            status=H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, check);
-        } H5E_END_TRY;
-        if(status>=0) goto error;
-
-        /* Callback decides to continue inspite data is corrupted. */ 
-        if(H5Pset_filter_callback(dxpl, filter_cb_cont, NULL)<0) goto error;
-        if(H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, check)<0)
-            goto error;
-            
-        /* Callback decides to fail when data is corrupted. */ 
-        if(H5Pset_filter_callback(dxpl, filter_cb_fail, NULL)<0) goto error;
-        H5E_BEGIN_TRY {
-            status=H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, check);
-        } H5E_END_TRY;
-        if(status>=0) goto error;
-    } else {
-        if (H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, check)<0)
-	   goto error;
-
-        /* Check that the values read are the same as the values written */
-        for (i=0; i<size[0]; i++) {
-	   for (j=0; j<size[1]; j++) {
-	       if (points[i][j] != check[i][j]) {
-		  H5_FAILED();
-		  printf("    Read different values than written.\n");
-		  printf("    At index %lu,%lu\n",
-		           (unsigned long)i, (unsigned long)j);
-		  goto error;
-	       }
-	   }
-        }
-    }
-    
-    PASSED();
-
-    /*----------------------------------------------------------------------
-     * STEP 4: Write new data over the top of the old data.  The new data is
-     * random thus not very compressible, and will cause the chunks to move
-     * around as they grow.  We only change values for the left half of the
-     * dataset although we rewrite the whole thing.
-     *---------------------------------------------------------------------- 
-     */
-    TESTING("    filters (modify)");
-    
-    for (i=0; i<size[0]; i++) {
-	for (j=0; j<size[1]/2; j++) {
-	    points[i][j] = rand ();
-	}
-    }
-    if (H5Dwrite (dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, points)<0)
-	goto error;
-        
-    if(corrupted) {
-        /* Default behavior is failure when data is corrupted. */ 
-        H5E_BEGIN_TRY {
-            status=H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, check);
-        } H5E_END_TRY;
-        if(status>=0) goto error;
-
-        /* Callback decides to continue inspite data is corrupted. */ 
-        if(H5Pset_filter_callback(dxpl, filter_cb_cont, NULL)<0) goto error;
-        if(H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, check)<0)
-            goto error;
-            
-        /* Callback decides to fail when data is corrupted. */ 
-        if(H5Pset_filter_callback(dxpl, filter_cb_fail, NULL)<0) goto error;
-        H5E_BEGIN_TRY {
-            status=H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, check);
-        } H5E_END_TRY;
-        if(status>=0) goto error;
-    } else {
-        /* Read the dataset back and check it */
-        if (H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, check)<0)
-	   goto error;
-
-        /* Check that the values read are the same as the values written */
-        for (i=0; i<size[0]; i++) {
-	   for (j=0; j<size[1]; j++) {
-	       if (points[i][j] != check[i][j]) {
-		  H5_FAILED();
-		  printf("    Read different values than written.\n");
-		  printf("    At index %lu,%lu\n",
-		           (unsigned long)i, (unsigned long)j);
-		  goto error;
-	       }
-	   }
-        }
-    }
-    
- /*   if((*dset_size=H5Dget_storage_size(dataset))==0) goto error; */
-    PASSED();
-
-    /*----------------------------------------------------------------------
-     * STEP 5: Close the dataset and then open it and read it again.  This
-     * insures that the filters message is picked up properly from the
-     * object header.
-     *---------------------------------------------------------------------- 
-     */
-    TESTING("    filters (re-open)");
-    
-    if (H5Dclose (dataset)<0) goto error;
-    if ((dataset = H5Dopen (fid, name))<0) goto error;
-    
-    if(corrupted) {
-        /* Default behavior is failure when data is corrupted. */ 
-        H5E_BEGIN_TRY {
-            status=H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, check);
-        } H5E_END_TRY;
-        if(status>=0) goto error;
-
-        /* Callback decides to continue inspite data is corrupted. */ 
-        if(H5Pset_filter_callback(dxpl, filter_cb_cont, NULL)<0) goto error;
-        if(H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, check)<0)
-            goto error;
-            
-        /* Callback decides to fail when data is corrupted. */ 
-        if(H5Pset_filter_callback(dxpl, filter_cb_fail, NULL)<0) goto error;
-        H5E_BEGIN_TRY {
-            status=H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, check);
-        } H5E_END_TRY;
-        if(status>=0) goto error;
-    } else {
-        if (H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, check)<0)
-	   goto error;
-
-        /* Check that the values read are the same as the values written */
-        for (i=0; i<size[0]; i++) {
-	   for (j=0; j<size[1]; j++) {
-	       if (points[i][j] != check[i][j]) {
-		  H5_FAILED();
-		  printf("    Read different values than written.\n");
-		  printf("    At index %lu,%lu\n",
-		        (unsigned long)i, (unsigned long)j);
-		  goto error;
-	       }
-	   }
-        }
-    }
-    
-    PASSED();
-    
-
-    /*----------------------------------------------------------------------
-     * STEP 6: Test partial I/O by writing to and then reading from a
-     * hyperslab of the dataset.  The hyperslab does not line up on chunk
-     * boundaries (we know that case already works from above tests).
-     *---------------------------------------------------------------------- 
-     */
-    TESTING("    filters (partial I/O)");
-
-    for (i=0; i<hs_size[0]; i++) {
-	for (j=0; j<hs_size[1]; j++) {
-	    points[hs_offset[0]+i][hs_offset[1]+j] = rand ();
-	}
-    }
-    if (H5Sselect_hyperslab(sid, H5S_SELECT_SET, hs_offset, NULL, hs_size,
-			    NULL)<0) goto error;
-    if (H5Dwrite (dataset, H5T_NATIVE_INT, sid, sid, dxpl, points)<0)
-	goto error;
-     
-    if(corrupted) {
-        /* Default behavior is failure when data is corrupted. */ 
-        H5E_BEGIN_TRY {
-            status=H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, check);
-        } H5E_END_TRY;
-        if(status>=0) goto error;
-
-        /* Callback decides to continue inspite data is corrupted. */ 
-        if(H5Pset_filter_callback(dxpl, filter_cb_cont, NULL)<0) goto error;
-        if(H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, check)<0)
-            goto error;
-            
-        /* Callback decides to fail when data is corrupted. */ 
-        if(H5Pset_filter_callback(dxpl, filter_cb_fail, NULL)<0) goto error;
-        H5E_BEGIN_TRY {
-            status=H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, check);
-        } H5E_END_TRY;
-        if(status>=0) goto error;
-    } else {
-        if (H5Dread (dataset, H5T_NATIVE_INT, sid, sid, dxpl, check)<0)
-	   goto error;
-    
-        /* Check that the values read are the same as the values written */
-        for (i=0; i<hs_size[0]; i++) {
-	   for (j=0; j<hs_size[1]; j++) {
-	       if (points[hs_offset[0]+i][hs_offset[1]+j] !=
-		  check[hs_offset[0]+i][hs_offset[1]+j]) {
-		  H5_FAILED();
-		  printf("    Read different values than written.\n");
-		  printf("    At index %lu,%lu\n",
-		         (unsigned long)(hs_offset[0]+i),
-		         (unsigned long)(hs_offset[1]+j));
-		  printf("    At original: %d\n",
-		         (int)points[hs_offset[0]+i][hs_offset[1]+j]);
-		  printf("    At returned: %d\n",
-		         (int)check[hs_offset[0]+i][hs_offset[1]+j]);
-		  goto error;
-	       }
-	   }
-        }
-    }
-
-    PASSED();
-
-    /* Clean up objects used for this test */
-    if (H5Dclose (dataset)<0) goto error;
-    if (H5Sclose (sid)<0) goto error;
-    if (H5Pclose (dxpl)<0) goto error;
-    free (tconv_buf);
-
-    return(0);
-
-error:
-    return -1;
-}
 
 /*-------------------------------------------------------------------------
  * Function:	test_filters
@@ -1409,28 +1094,37 @@ test_filters(hid_t file)
 {
     hid_t	dc;                 /* Dataset creation property list ID */
     const hsize_t chunk_size[2] = {2, 25};  /* Chunk dimensions */
-    const hsize_t chunk_szipsize[2] = {100,200}; 
     hsize_t     null_size;          /* Size of dataset with null filter */
+
 #ifdef H5_HAVE_FILTER_FLETCHER32
     hsize_t     fletcher32_size;       /* Size of dataset with Fletcher32 checksum */
     unsigned    data_corrupt[3];     /* position and length of data to be corrupted */
 #endif /* H5_HAVE_FILTER_FLETCHER32 */
+
 #ifdef H5_HAVE_FILTER_DEFLATE
     hsize_t     deflate_size;       /* Size of dataset with deflate filter */
 #endif /* H5_HAVE_FILTER_DEFLATE */
 
 #ifdef H5_HAVE_FILTER_SZIP
     hsize_t     szip_size;       /* Size of dataset with szip filter */
-    const unsigned cd_values[4] = {SZ_RAW_OPTION_MASK|SZ_NN_OPTION_MASK,32,4,200};
+    int szip_options_mask=H5_SZIP_RAW_OPTION_MASK|H5_SZIP_NN_OPTION_MASK;
+    int szip_bits_per_pixel=32;
+    int szip_pixels_per_block=4;
+    int szip_pixels_per_scanline=200;
 #endif /* H5_HAVE_FILTER_SZIP */
+
 #ifdef H5_HAVE_FILTER_SHUFFLE
     hsize_t     shuffle_size;       /* Size of dataset with shuffle filter */
 #endif /* H5_HAVE_FILTER_SHUFFLE */
-#if defined H5_HAVE_FILTER_DEFLATE | defined H5_HAVE_FILTER_SZIP && defined H5_HAVE_FILTER_SHUFFLE && defined H5_HAVE_FILTER_FLETCHER32
+
+#if (defined H5_HAVE_FILTER_DEFLATE | defined H5_HAVE_FILTER_SZIP) && defined H5_HAVE_FILTER_SHUFFLE && defined H5_HAVE_FILTER_FLETCHER32
     hsize_t     combo_size;     /* Size of dataset with shuffle+deflate filter */
 #endif /* H5_HAVE_FILTER_DEFLATE && H5_HAVE_FILTER_SHUFFLE && H5_HAVE_FILTER_FLETCHER32 */
     
-    /* Test null I/O filter (by itself) */
+    /*----------------------------------------------------------
+     * STEP 0: Test null I/O filter by itself.
+     *----------------------------------------------------------
+     */
     puts("Testing 'null' filter");
     if((dc = H5Pcreate(H5P_DATASET_CREATE))<0) goto error;
     if (H5Pset_chunk (dc, 2, chunk_size)<0) goto error;
@@ -1518,11 +1212,11 @@ test_filters(hid_t file)
 #ifdef H5_HAVE_FILTER_SZIP
     puts("Testing szip filter");
     if((dc = H5Pcreate(H5P_DATASET_CREATE))<0) goto error;
-    if (H5Pset_chunk (dc, 2, chunk_szipsize)<0) goto error;
+    if (H5Pset_chunk (dc, 2, chunk_size)<0) goto error;
  
-    if (H5Pset_szip(dc, cd_values)<0) goto error;
+    if (H5Pset_szip(dc, szip_options_mask, szip_bits_per_pixel, szip_pixels_per_block, szip_pixels_per_scanline)<0) goto error;
 
-    if(test_filter_internal_szip(file,DSET_SZIP_NAME,dc,DISABLE_FLETCHER32,DATA_NOT_CORRUPTED,&szip_size)<0) goto error;
+    if(test_filter_internal(file,DSET_SZIP_NAME,dc,DISABLE_FLETCHER32,DATA_NOT_CORRUPTED,&szip_size)<0) goto error;
     if (H5Pclose (dc)<0) goto error;
 #else /* H5_HAVE_FILTER_SZIP */
     TESTING("szip filter");
@@ -1588,6 +1282,7 @@ test_filters(hid_t file)
     SKIPPED();
     puts("Deflate, shuffle, or Fletcher32 checksum filter not enabled");
 #endif /* H5_HAVE_FILTER_DEFLATE && H5_HAVE_FILTER_SHUFFLE && H5_HAVE_FILTER_FLETCHER32 */
+
     /*----------------------------------------------------------
      * STEP 6: Test shuffle + szip + checksum in any order.
      *----------------------------------------------------------
@@ -1596,24 +1291,24 @@ test_filters(hid_t file)
 
     puts("Testing shuffle+szip+checksum filters(checksum first)");
     if((dc = H5Pcreate(H5P_DATASET_CREATE))<0) goto error;
-    if (H5Pset_chunk (dc, 2, chunk_szipsize)<0) goto error;
+    if (H5Pset_chunk (dc, 2, chunk_size)<0) goto error;
     if (H5Pset_fletcher32 (dc)<0) goto error;
     if (H5Pset_shuffle (dc, sizeof(int))<0) goto error;
-    if (H5Pset_szip (dc, cd_values)<0) goto error;
+    if (H5Pset_szip(dc, szip_options_mask, szip_bits_per_pixel, szip_pixels_per_block, szip_pixels_per_scanline)<0) goto error;
 
-    if(test_filter_internal_szip(file,DSET_SHUF_SZIP_FLET_NAME,dc,ENABLE_FLETCHER32,DATA_NOT_CORRUPTED,&combo_size)<0) goto error;
+    if(test_filter_internal(file,DSET_SHUF_SZIP_FLET_NAME,dc,ENABLE_FLETCHER32,DATA_NOT_CORRUPTED,&combo_size)<0) goto error;
 
     /* Clean up objects used for this test */
     if (H5Pclose (dc)<0) goto error;
 
     puts("Testing shuffle+szip+checksum filters(checksum last)");
     if((dc = H5Pcreate(H5P_DATASET_CREATE))<0) goto error;
-    if (H5Pset_chunk (dc, 2, chunk_szipsize)<0) goto error;
+    if (H5Pset_chunk (dc, 2, chunk_size)<0) goto error;
     if (H5Pset_shuffle (dc, sizeof(int))<0) goto error;
-    if (H5Pset_szip (dc, cd_values)<0) goto error;
+    if (H5Pset_szip(dc, szip_options_mask, szip_bits_per_pixel, szip_pixels_per_block, szip_pixels_per_scanline)<0) goto error;
     if (H5Pset_fletcher32 (dc)<0) goto error;
 
-    if(test_filter_internal_szip(file,DSET_SHUF_SZIP_FLET_NAME_2,dc,ENABLE_FLETCHER32,DATA_NOT_CORRUPTED,&combo_size)<0) goto error;
+    if(test_filter_internal(file,DSET_SHUF_SZIP_FLET_NAME_2,dc,ENABLE_FLETCHER32,DATA_NOT_CORRUPTED,&combo_size)<0) goto error;
 
     /* Clean up objects used for this test */
     if (H5Pclose (dc)<0) goto error;
-- 
cgit v0.12