HDFFV-10297 - Fix test errors - five remaining

2 files changed, 97 insertions, 107 deletions

diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c
index 74607da..9bebcbe 100644
--- a/tools/lib/h5diff_attr.c
+++ b/tools/lib/h5diff_attr.c
@@ -472,8 +472,8 @@ hsize_t diff_attr(hid_t loc1_id,
             for(j = 0; j < rank1; j++)
                 nelmts1 *= dims1[j];
 
-            buf1 = (void *)HDmalloc((size_t)(nelmts1 * msize1));
-            buf2 = (void *)HDmalloc((size_t)(nelmts1 * msize2));
+            buf1 = (void *)HDcalloc((size_t)(nelmts1), msize1);
+            buf2 = (void *)HDcalloc((size_t)(nelmts1), msize2);
             if(buf1 == NULL || buf2 == NULL) {
                 parallel_print("cannot read into memory\n");
                 goto error;
diff --git a/tools/lib/h5tools_filters.c b/tools/lib/h5tools_filters.c
index 6ee58c5..28c123f 100644
--- a/tools/lib/h5tools_filters.c
+++ b/tools/lib/h5tools_filters.c
@@ -20,9 +20,9 @@
  */
 static void print_warning(const char *dname, const char *fname)
 {
-	fprintf(stderr,
-			"warning: dataset <%s> cannot be read, %s filter is not available\n",
-			dname, fname);
+    fprintf(stderr,
+            "warning: dataset <%s> cannot be read, %s filter is not available\n",
+            dname, fname);
 }
 
 /*-------------------------------------------------------------------------
@@ -34,100 +34,95 @@ static void print_warning(const char *dname, const char *fname)
  * 2) the internal filters might be turned off
  *
  * Return: 1, can read, 0, cannot, -1 error
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: March 1, 2004
- *
  *-------------------------------------------------------------------------
  */
 int h5tools_canreadf(const char* name, /* object name, serves also as boolean print */
                      hid_t dcpl_id)    /* dataset creation property list */
 {
 
-	int nfilters; /* number of filters */
-	H5Z_filter_t filtn; /* filter identification number */
-	int i; /* index */
-	int udfilter_avail; /* index */
-
-	/* get information about filters */
-	if ((nfilters = H5Pget_nfilters(dcpl_id)) < 0)
-		return -1;
-
-	/* if we do not have filters, we can read the dataset safely */
-	if (!nfilters)
-		return 1;
-
-	/* check availability of filters */
-	for (i = 0; i < nfilters; i++) {
-		if ((filtn = H5Pget_filter2(dcpl_id, (unsigned) i, 0, 0, 0, (size_t) 0, 0, NULL)) < 0)
-			return -1;
-
-		switch (filtn) {
-		/*-------------------------------------------------------------------------
-		 * user defined filter
-		 *-------------------------------------------------------------------------
-		 */
-		default:
-			if ((udfilter_avail = H5Zfilter_avail(filtn)) < 0)
-				return -1;
-			else if (udfilter_avail == 0) {
-				if (name)
-					print_warning(name, "user defined");
-				return 0;
-			}
-			break;
-
-			/*-------------------------------------------------------------------------
-			 * H5Z_FILTER_DEFLATE      1 , deflation like gzip
-			 *-------------------------------------------------------------------------
-			 */
-		case H5Z_FILTER_DEFLATE:
+    int nfilters;       /* number of filters */
+    H5Z_filter_t filtn; /* filter identification number */
+    int i;              /* index */
+    int udfilter_avail; /* index */
+
+    /* get information about filters */
+    if ((nfilters = H5Pget_nfilters(dcpl_id)) < 0)
+        return -1;
+
+    /* if we do not have filters, we can read the dataset safely */
+    if (!nfilters)
+        return 1;
+
+    /* check availability of filters */
+    for (i = 0; i < nfilters; i++) {
+        if ((filtn = H5Pget_filter2(dcpl_id, (unsigned) i, 0, 0, 0, (size_t) 0, 0, NULL)) < 0)
+            return -1;
+
+        switch (filtn) {
+        /*-------------------------------------------------------------------------
+         * user defined filter
+         *-------------------------------------------------------------------------
+         */
+        default:
+            if ((udfilter_avail = H5Zfilter_avail(filtn)) < 0)
+                return -1;
+            else if (udfilter_avail == 0) {
+                if (name)
+                    print_warning(name, "user defined");
+                return 0;
+            }
+            break;
+
+            /*-------------------------------------------------------------------------
+             * H5Z_FILTER_DEFLATE      1 , deflation like gzip
+             *-------------------------------------------------------------------------
+             */
+        case H5Z_FILTER_DEFLATE:
 #ifndef H5_HAVE_FILTER_DEFLATE
-			if (name)
-				print_warning(name,"deflate");
-			return 0;
+            if (name)
+                print_warning(name,"deflate");
+            return 0;
 #endif
-			break;
-			/*-------------------------------------------------------------------------
-			 * H5Z_FILTER_SZIP       4 , szip compression
-			 *-------------------------------------------------------------------------
-			 */
-		case H5Z_FILTER_SZIP:
+            break;
+            /*-------------------------------------------------------------------------
+             * H5Z_FILTER_SZIP       4 , szip compression
+             *-------------------------------------------------------------------------
+             */
+        case H5Z_FILTER_SZIP:
 #ifndef H5_HAVE_FILTER_SZIP
-			if (name)
-				print_warning(name,"SZIP");
-			return 0;
+            if (name)
+                print_warning(name,"SZIP");
+            return 0;
 #endif
-			break;
-			/*-------------------------------------------------------------------------
-			 * H5Z_FILTER_SHUFFLE    2 , shuffle the data
-			 *-------------------------------------------------------------------------
-			 */
-		case H5Z_FILTER_SHUFFLE:
-			break;
-			/*-------------------------------------------------------------------------
-			 * H5Z_FILTER_FLETCHER32 3 , fletcher32 checksum of EDC
-			 *-------------------------------------------------------------------------
-			 */
-		case H5Z_FILTER_FLETCHER32:
-			break;
-			/*-------------------------------------------------------------------------
-			 * H5Z_FILTER_NBIT
-			 *-------------------------------------------------------------------------
-			 */
-		case H5Z_FILTER_NBIT:
-			break;
-			/*-------------------------------------------------------------------------
-			 * H5Z_FILTER_SCALEOFFSET
-			 *-------------------------------------------------------------------------
-			 */
-		case H5Z_FILTER_SCALEOFFSET:
-			break;
-		}/*switch*/
-	}/*for*/
-
-	return 1;
+            break;
+            /*-------------------------------------------------------------------------
+             * H5Z_FILTER_SHUFFLE    2 , shuffle the data
+             *-------------------------------------------------------------------------
+             */
+        case H5Z_FILTER_SHUFFLE:
+            break;
+            /*-------------------------------------------------------------------------
+             * H5Z_FILTER_FLETCHER32 3 , fletcher32 checksum of EDC
+             *-------------------------------------------------------------------------
+             */
+        case H5Z_FILTER_FLETCHER32:
+            break;
+            /*-------------------------------------------------------------------------
+             * H5Z_FILTER_NBIT
+             *-------------------------------------------------------------------------
+             */
+        case H5Z_FILTER_NBIT:
+            break;
+            /*-------------------------------------------------------------------------
+             * H5Z_FILTER_SCALEOFFSET
+             *-------------------------------------------------------------------------
+             */
+        case H5Z_FILTER_SCALEOFFSET:
+            break;
+        }/*switch*/
+    }/*for*/
+
+    return 1;
 }
 
 /*-------------------------------------------------------------------------
@@ -138,31 +133,26 @@ int h5tools_canreadf(const char* name, /* object name, serves also as boolean pr
  * except SZIP, which may be configured decoder-only.
  *
  * Return: 1, can write, 0, cannot, -1 error
- *
- * Programmer:
- *
- * Date: October 5, 2004
- *
  *-------------------------------------------------------------------------
  */
 H5_ATTR_CONST int
 h5tools_can_encode(H5Z_filter_t filtn) {
     switch (filtn) {
-	/* user defined filter     */
-	default:
+    /* user defined filter     */
+    default:
             return 0;
 
-	case H5Z_FILTER_DEFLATE:
+    case H5Z_FILTER_DEFLATE:
 #ifndef H5_HAVE_FILTER_DEFLATE
             return 0;
 #endif
             break;
 
-	case H5Z_FILTER_SZIP:
+    case H5Z_FILTER_SZIP:
 #ifndef H5_HAVE_FILTER_SZIP
             return 0;
 #else
-	{
+    {
             unsigned int filter_config_flags;
 
             if (H5Zget_filter_info(filtn, &filter_config_flags) < 0)
@@ -171,36 +161,36 @@ h5tools_can_encode(H5Z_filter_t filtn) {
                     & (H5Z_FILTER_CONFIG_ENCODE_ENABLED | H5Z_FILTER_CONFIG_DECODE_ENABLED)) == 0) {
                 /* filter present but neither encode nor decode is supported (???) */
                 return -1;
-            } 
+            }
             else if ((filter_config_flags
                         & (H5Z_FILTER_CONFIG_ENCODE_ENABLED | H5Z_FILTER_CONFIG_DECODE_ENABLED)) == H5Z_FILTER_CONFIG_DECODE_ENABLED) {
                 /* decoder only: read but not write */
                 return 0;
-            } 
+            }
             else if ((filter_config_flags
                         & (H5Z_FILTER_CONFIG_ENCODE_ENABLED | H5Z_FILTER_CONFIG_DECODE_ENABLED)) == H5Z_FILTER_CONFIG_ENCODE_ENABLED) {
                 /* encoder only: write but not read (???) */
                 return -1;
-            } 
+            }
             else if ((filter_config_flags
                         & (H5Z_FILTER_CONFIG_ENCODE_ENABLED | H5Z_FILTER_CONFIG_DECODE_ENABLED))
                         == (H5Z_FILTER_CONFIG_ENCODE_ENABLED | H5Z_FILTER_CONFIG_DECODE_ENABLED)) {
                 return 1;
             }
-	}
+    }
 #endif
             break;
 
-	case H5Z_FILTER_SHUFFLE:
+    case H5Z_FILTER_SHUFFLE:
             break;
 
-	case H5Z_FILTER_FLETCHER32:
+    case H5Z_FILTER_FLETCHER32:
             break;
 
-	case H5Z_FILTER_NBIT:
+    case H5Z_FILTER_NBIT:
             break;
 
-	case H5Z_FILTER_SCALEOFFSET:
+    case H5Z_FILTER_SCALEOFFSET:
             break;
     }/*switch*/