Remove HD from HDmem* calls (#3211)

7 files changed, 28 insertions, 28 deletions

diff --git a/tools/test/h5diff/h5diffgentest.c b/tools/test/h5diff/h5diffgentest.c
index 4276f7a..37c2cc3 100644
--- a/tools/test/h5diff/h5diffgentest.c
+++ b/tools/test/h5diff/h5diffgentest.c
@@ -8608,11 +8608,11 @@ test_hyperslab(const char *fname, int make_diffs /* flag to modify data buffers
         }
 
         /* set the hyperslab values */
-        HDmemset(buf, c, nelmts);
+        memset(buf, c, nelmts);
 
         /* make a different hyperslab at this position */
         if (make_diffs && i == 512 * 512)
-            HDmemset(buf, 0, nelmts);
+            memset(buf, 0, nelmts);
 
         hs_start[0] = (unsigned long long)i * GBLL / (1024 * 1024);
         if (H5Sselect_hyperslab(f_sid, H5S_SELECT_SET, hs_start, NULL, hs_size, NULL) < 0)
diff --git a/tools/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c
index 4c6304d..aad1b8d 100644
--- a/tools/test/h5dump/h5dumpgentest.c
+++ b/tools/test/h5dump/h5dumpgentest.c
@@ -3874,10 +3874,10 @@ gent_multi(void)
 
     fapl = H5Pcreate(H5P_FILE_ACCESS);
 
-    HDmemset(memb_map, 0, sizeof memb_map);
-    HDmemset(memb_fapl, 0, sizeof memb_fapl);
-    HDmemset(memb_name, 0, sizeof memb_name);
-    HDmemset(memb_addr, 0, sizeof memb_addr);
+    memset(memb_map, 0, sizeof memb_map);
+    memset(memb_fapl, 0, sizeof memb_fapl);
+    memset(memb_name, 0, sizeof memb_name);
+    memset(memb_addr, 0, sizeof memb_addr);
 
     assert(HDstrlen(multi_letters) == H5FD_MEM_NTYPES);
 
diff --git a/tools/test/h5format_convert/h5fc_gentest.c b/tools/test/h5format_convert/h5fc_gentest.c
index 9a3a891..5b8bfce 100644
--- a/tools/test/h5format_convert/h5fc_gentest.c
+++ b/tools/test/h5format_convert/h5fc_gentest.c
@@ -424,7 +424,7 @@ gen_err_level(const char *fname)
 
     /* Initialize data buffer */
     buf = (unsigned char *)malloc(NUM * sizeof(unsigned char *));
-    HDmemset(buf, 42, NUM * sizeof(unsigned char));
+    memset(buf, 42, NUM * sizeof(unsigned char));
 
     /* Create the test file */
     if ((fid = H5Fcreate(fname, H5F_ACC_TRUNC, fcpl, fapl)) < 0)
@@ -797,7 +797,7 @@ main(void)
         for (i = 0; i < 8; i++) {
             char filename[50];
 
-            HDmemset(filename, 0, sizeof(filename));
+            memset(filename, 0, sizeof(filename));
             if (!new_format)
                 HDstrcat(filename, "old_");
             HDstrcat(filename, FILENAME[i]);
diff --git a/tools/test/h5jam/h5jamgentest.c b/tools/test/h5jam/h5jamgentest.c
index 96e6407..d3b7388 100644
--- a/tools/test/h5jam/h5jamgentest.c
+++ b/tools/test/h5jam/h5jamgentest.c
@@ -326,7 +326,7 @@ gent_ub(const char *filename, size_t ub_size, size_t ub_fill)
             goto error;
 
         /* Fill buf with pattern */
-        HDmemset(buf, '\0', ub_size);
+        memset(buf, '\0', ub_size);
         bp = buf;
         for (u = 0; u < ub_fill; u++)
             *bp++ = pattern[u % 10];
diff --git a/tools/test/h5repack/h5repacktst.c b/tools/test/h5repack/h5repacktst.c
index cf42d07..a9e8b40 100644
--- a/tools/test/h5repack/h5repacktst.c
+++ b/tools/test/h5repack/h5repacktst.c
@@ -194,8 +194,8 @@ main(void)
     h5tools_init();
 
     /* initialize */
-    HDmemset(&diff_options, 0, sizeof(diff_opt_t));
-    HDmemset(&pack_options, 0, sizeof(pack_opt_t));
+    memset(&diff_options, 0, sizeof(diff_opt_t));
+    memset(&pack_options, 0, sizeof(pack_opt_t));
 
     /* run tests  */
     puts("Testing h5repack:");
@@ -4241,7 +4241,7 @@ write_dset_in(hid_t loc_id, const char *dset_name, /* for saving reference to da
      */
 
     if (make_diffs) {
-        HDmemset(buf12, 'z', sizeof buf12);
+        memset(buf12, 'z', sizeof buf12);
     }
 
     if ((tid = H5Tcopy(H5T_C_S1)) < 0)
@@ -4259,7 +4259,7 @@ write_dset_in(hid_t loc_id, const char *dset_name, /* for saving reference to da
      */
 
     if (make_diffs) {
-        HDmemset(buf22, 0, sizeof buf22);
+        memset(buf22, 0, sizeof buf22);
     }
 
     if ((tid = H5Tcopy(H5T_STD_B8LE)) < 0)
@@ -4288,7 +4288,7 @@ write_dset_in(hid_t loc_id, const char *dset_name, /* for saving reference to da
      */
 
     if (make_diffs) {
-        HDmemset(buf32, 0, sizeof buf32);
+        memset(buf32, 0, sizeof buf32);
     }
 
     if ((tid = H5Tcreate(H5T_COMPOUND, sizeof(s_t))) < 0)
@@ -4377,7 +4377,7 @@ write_dset_in(hid_t loc_id, const char *dset_name, /* for saving reference to da
      */
 
     if (make_diffs) {
-        HDmemset(buf62, 0, sizeof buf62);
+        memset(buf62, 0, sizeof buf62);
     }
 
     if ((tid = H5Tarray_create2(H5T_NATIVE_INT, 1, dimarray)) < 0)
@@ -4393,8 +4393,8 @@ write_dset_in(hid_t loc_id, const char *dset_name, /* for saving reference to da
      */
 
     if (make_diffs) {
-        HDmemset(buf72, 0, sizeof buf72);
-        HDmemset(buf82, 0, sizeof buf82);
+        memset(buf72, 0, sizeof buf72);
+        memset(buf82, 0, sizeof buf82);
     }
 
     if ((pid = H5Pcreate(H5P_DATASET_CREATE)) < 0)
@@ -4431,7 +4431,7 @@ write_dset_in(hid_t loc_id, const char *dset_name, /* for saving reference to da
      */
 
     if (make_diffs) {
-        HDmemset(buf13, 'z', sizeof buf13);
+        memset(buf13, 'z', sizeof buf13);
     }
 
     if ((tid = H5Tcopy(H5T_C_S1)) < 0)
@@ -5124,7 +5124,7 @@ write_attr_in(hid_t loc_id, const char *dset_name, /* for saving reference to da
      *-------------------------------------------------------------------------
      */
     if (make_diffs) {
-        HDmemset(buf12, 'z', sizeof buf12);
+        memset(buf12, 'z', sizeof buf12);
     }
 
     /*
@@ -5163,7 +5163,7 @@ write_attr_in(hid_t loc_id, const char *dset_name, /* for saving reference to da
      */
 
     if (make_diffs) {
-        HDmemset(buf22, 0, sizeof buf22);
+        memset(buf22, 0, sizeof buf22);
     }
 
     /*
@@ -5221,7 +5221,7 @@ write_attr_in(hid_t loc_id, const char *dset_name, /* for saving reference to da
      *-------------------------------------------------------------------------
      */
     if (make_diffs) {
-        HDmemset(buf32, 0, sizeof buf32);
+        memset(buf32, 0, sizeof buf32);
     }
 
     /*
@@ -5368,7 +5368,7 @@ write_attr_in(hid_t loc_id, const char *dset_name, /* for saving reference to da
      */
 
     if (make_diffs) {
-        HDmemset(buf62, 0, sizeof buf62);
+        memset(buf62, 0, sizeof buf62);
     }
     /*
     buf62[6][3]= {{1,2,3},{4,5,6},{7,8,9},{10,11,12},{13,14,15},{16,17,18}};
@@ -5410,8 +5410,8 @@ write_attr_in(hid_t loc_id, const char *dset_name, /* for saving reference to da
      */
 
     if (make_diffs) {
-        HDmemset(buf72, 0, sizeof buf72);
-        HDmemset(buf82, 0, sizeof buf82);
+        memset(buf72, 0, sizeof buf72);
+        memset(buf82, 0, sizeof buf82);
     }
     /*
     Attribute:   <integer2D> and <integer2D>
@@ -5451,7 +5451,7 @@ write_attr_in(hid_t loc_id, const char *dset_name, /* for saving reference to da
      */
 
     if (make_diffs) {
-        HDmemset(buf13, 'z', sizeof buf13);
+        memset(buf13, 'z', sizeof buf13);
     }
 
     /*
diff --git a/tools/test/perform/iopipe.c b/tools/test/perform/iopipe.c
index d536e7e..bc15fdf 100644
--- a/tools/test/perform/iopipe.c
+++ b/tools/test/perform/iopipe.c
@@ -148,7 +148,7 @@ main(void)
     the_data = (unsigned char *)malloc((size_t)(size[0] * size[1]));
 
     /* initial fill for lazy malloc */
-    HDmemset(the_data, 0xAA, (size_t)(size[0] * size[1]));
+    memset(the_data, 0xAA, (size_t)(size[0] * size[1]));
 
     /* Fill raw */
     synchronize();
@@ -160,7 +160,7 @@ main(void)
     for (u = 0; u < nwrite; u++) {
         HDputc(PROGRESS, stderr);
         fflush(stderr);
-        HDmemset(the_data, 0xAA, (size_t)(size[0] * size[1]));
+        memset(the_data, 0xAA, (size_t)(size[0] * size[1]));
     }
 #ifdef H5_HAVE_GETRUSAGE
     getrusage(RUSAGE_SELF, &r_stop);
diff --git a/tools/test/perform/zip_perf.c b/tools/test/perform/zip_perf.c
index 2bcdb2a..b8b80e8 100644
--- a/tools/test/perform/zip_perf.c
+++ b/tools/test/perform/zip_perf.c
@@ -342,7 +342,7 @@ fill_with_random_data(Bytef *src, uLongf src_len)
     if (compress_percent) {
         size_t s = (size_t)((src_len * (uLongf)compress_percent) / 100);
 
-        HDmemset(src, '\0', s);
+        memset(src, '\0', s);
     }
 }