Brings over most of the HD prefix removal (#3293)

1 files changed, 15 insertions, 15 deletions

diff --git a/src/H5Zscaleoffset.c b/src/H5Zscaleoffset.c
index 6613ec2..57f807d 100644
--- a/src/H5Zscaleoffset.c
+++ b/src/H5Zscaleoffset.c
@@ -164,7 +164,7 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
             } while (_size_rem);                                                                             \
         } /* end if */                                                                                       \
         else {                                                                                               \
-            HDassert(H5T_native_order_g == H5T_ORDER_BE);                                                    \
+            assert(H5T_native_order_g == H5T_ORDER_BE);                                                      \
                                                                                                              \
             /* Copy 4 bytes at a time to each cd value, but start at the end                                 \
              * (highest address) of fill_val */                                                              \
@@ -183,7 +183,7 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
                     _fv_p -= _size_rem;                                                                      \
             } /* end while */                                                                                \
                                                                                                              \
-            HDassert(_fv_p == (char *)&(fill_val));                                                          \
+            assert(_fv_p == (char *)&(fill_val));                                                            \
             if (_size_rem) {                                                                                 \
                 /* Amount left to copy is smaller than a cd_value, initialize                                \
                  * _cd_value as it will not be fully overwritten and copy to the end                         \
@@ -291,7 +291,7 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
             } while (_size_rem);                                                                             \
         } /* end if */                                                                                       \
         else {                                                                                               \
-            HDassert(H5T_native_order_g == H5T_ORDER_BE);                                                    \
+            assert(H5T_native_order_g == H5T_ORDER_BE);                                                      \
                                                                                                              \
             /* Copy 4 bytes at a time to each cd value, but start at the end                                 \
              * (highest address) of fill_val */                                                              \
@@ -310,7 +310,7 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
                     _fv_p -= _size_rem;                                                                      \
             } /* end while */                                                                                \
                                                                                                              \
-            HDassert(_fv_p == (char *)&(fill_val));                                                          \
+            assert(_fv_p == (char *)&(fill_val));                                                            \
             if (_size_rem) {                                                                                 \
                 /* Amount left to copy is smaller than a cd_value, initialize                                \
                  * _cd_value as it will not be fully overwritten and copy to the end                         \
@@ -586,7 +586,7 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
             if (H5T_native_order_g == H5T_ORDER_LE)                                                          \
                 H5MM_memcpy(minval, &min, sizeof(type));                                                     \
             else {                                                                                           \
-                HDassert(H5T_native_order_g == H5T_ORDER_BE);                                                \
+                assert(H5T_native_order_g == H5T_ORDER_BE);                                                  \
                 H5MM_memcpy(((char *)minval) + (sizeof(long long) - sizeof(type)), &min, sizeof(type));      \
             } /* end else */                                                                                 \
         else                                                                                                 \
@@ -670,7 +670,7 @@ H5Z_class2_t H5Z_SCALEOFFSET[1] = {{
             if (H5T_native_order_g == H5T_ORDER_LE)                                                          \
                 H5MM_memcpy(&min, &minval, sizeof(type));                                                    \
             else {                                                                                           \
-                HDassert(H5T_native_order_g == H5T_ORDER_BE);                                                \
+                assert(H5T_native_order_g == H5T_ORDER_BE);                                                  \
                 H5MM_memcpy(&min, ((char *)&minval) + (sizeof(long long) - sizeof(type)), sizeof(type));     \
             } /* end else */                                                                                 \
         else                                                                                                 \
@@ -957,7 +957,7 @@ H5Z__set_local_scaleoffset(hid_t dcpl_id, hid_t type_id, hid_t space_id)
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
 
     /* Initialize the parameters to a known state */
-    HDmemset(cd_values, 0, sizeof(cd_values));
+    memset(cd_values, 0, sizeof(cd_values));
 
     /* Get the filter's current parameters */
     if (H5P_get_filter_by_id(dcpl_plist, H5Z_FILTER_SCALEOFFSET, &flags, &cd_nelmts, cd_values, (size_t)0,
@@ -1238,7 +1238,7 @@ H5Z__filter_scaleoffset(unsigned flags, size_t cd_nelmts, const unsigned cd_valu
             minval |= minval_mask;
         }
 
-        HDassert(minbits <= p.size * 8);
+        assert(minbits <= p.size * 8);
         p.minbits = minbits;
 
         /* calculate size of output buffer after decompression */
@@ -1296,7 +1296,7 @@ H5Z__filter_scaleoffset(unsigned flags, size_t cd_nelmts, const unsigned cd_valu
     }
     /* output; compress */
     else {
-        HDassert(nbytes == d_nelmts * p.size);
+        assert(nbytes == d_nelmts * p.size);
 
         /* before preprocess, convert to memory endianness order if needed */
         if (need_convert)
@@ -1317,7 +1317,7 @@ H5Z__filter_scaleoffset(unsigned flags, size_t cd_nelmts, const unsigned cd_valu
                     HGOTO_ERROR(H5E_PLINE, H5E_BADTYPE, 0, "pre-compression failed")
             }
 
-        HDassert(minbits <= p.size * 8);
+        assert(minbits <= p.size * 8);
 
         /* calculate buffer size after compression
          * minbits and minval are stored in the front of the compressed buffer
@@ -1347,7 +1347,7 @@ H5Z__filter_scaleoffset(unsigned flags, size_t cd_nelmts, const unsigned cd_valu
         /* (Looks like an error in the original determination of how many
          *      bytes would be needed for parameters. - QAK, 2010/08/19)
          */
-        HDmemset(outbuf + 13, 0, (size_t)8);
+        memset(outbuf + 13, 0, (size_t)8);
 
         /* special case: minbits equal to full precision */
         if (minbits == p.size * 8) {
@@ -1652,7 +1652,7 @@ H5Z__scaleoffset_decompress_one_atomic(unsigned char *data, size_t data_offset,
     unsigned dtype_len;
     int      k;
 
-    HDassert(p.minbits > 0);
+    assert(p.minbits > 0);
 
     dtype_len = p.size * 8;
 
@@ -1664,7 +1664,7 @@ H5Z__scaleoffset_decompress_one_atomic(unsigned char *data, size_t data_offset,
                                                  p, dtype_len);
     }
     else { /* big endian */
-        HDassert(p.mem_order == H5Z_SCALEOFFSET_ORDER_BE);
+        assert(p.mem_order == H5Z_SCALEOFFSET_ORDER_BE);
 
         begin_i = (dtype_len - p.minbits) / 8;
 
@@ -1736,7 +1736,7 @@ H5Z__scaleoffset_compress_one_atomic(unsigned char *data, size_t data_offset, un
     unsigned dtype_len;
     int      k;
 
-    HDassert(p.minbits > 0);
+    assert(p.minbits > 0);
 
     dtype_len = p.size * 8;
 
@@ -1748,7 +1748,7 @@ H5Z__scaleoffset_compress_one_atomic(unsigned char *data, size_t data_offset, un
                                                dtype_len);
     }
     else { /* big endian */
-        HDassert(p.mem_order == H5Z_SCALEOFFSET_ORDER_BE);
+        assert(p.mem_order == H5Z_SCALEOFFSET_ORDER_BE);
         begin_i = (dtype_len - p.minbits) / 8;
 
         for (k = (int)begin_i; k <= (int)(p.size - 1); k++)