Remove HD from HDmem* calls (#3211)

5 files changed, 23 insertions, 23 deletions

diff --git a/tools/src/h5repack/h5repack.c b/tools/src/h5repack/h5repack.c
index a6d83ea..7849e29 100644
--- a/tools/src/h5repack/h5repack.c
+++ b/tools/src/h5repack/h5repack.c
@@ -71,7 +71,7 @@ h5repack_init(pack_opt_t *options, int verbose, hbool_t latest)
 {
     int k, n;
 
-    HDmemset(options, 0, sizeof(pack_opt_t));
+    memset(options, 0, sizeof(pack_opt_t));
     options->min_comp   = 0;
     options->verbose    = verbose;
     options->latest     = latest;
@@ -259,7 +259,7 @@ copy_named_datatype(hid_t type_in, hid_t fidout, named_dt_t **named_dt_head_p, t
                 *named_dt_head_p = dt;
 
                 /* Update the token/address and id */
-                HDmemcpy(&dt->obj_token, &travt->objs[i].obj_token, sizeof(H5O_token_t));
+                memcpy(&dt->obj_token, &travt->objs[i].obj_token, sizeof(H5O_token_t));
                 dt->id_out = H5I_INVALID_HID;
 
                 /* Check if this type is the one requested */
@@ -282,7 +282,7 @@ copy_named_datatype(hid_t type_in, hid_t fidout, named_dt_t **named_dt_head_p, t
         *named_dt_head_p = dt_ret;
 
         /* Update the token/address and id */
-        HDmemcpy(&dt_ret->obj_token, &oinfo.token, sizeof(H5O_token_t));
+        memcpy(&dt_ret->obj_token, &oinfo.token, sizeof(H5O_token_t));
         dt_ret->id_out = H5I_INVALID_HID;
     } /* end if requested datatype not found */
 
@@ -854,7 +854,7 @@ check_objects(const char *fname, pack_opt_t *options)
                             H5TOOLS_GOTO_ERROR((-1), "H5Dget_space failed");
                         if ((rank = H5Sget_simple_extent_ndims(sid)) < 0)
                             H5TOOLS_GOTO_ERROR((-1), "H5Sget_simple_extent_ndims failed");
-                        HDmemset(dims, 0, sizeof dims);
+                        memset(dims, 0, sizeof dims);
                         if (H5Sget_simple_extent_dims(sid, dims, NULL) < 0)
                             H5TOOLS_GOTO_ERROR((-1), "H5Sget_simple_extent_dims failed");
                         for (j = 0; j < rank; j++)
diff --git a/tools/src/h5repack/h5repack_copy.c b/tools/src/h5repack/h5repack_copy.c
index be3fddf..0f270c5 100644
--- a/tools/src/h5repack/h5repack_copy.c
+++ b/tools/src/h5repack/h5repack_copy.c
@@ -658,7 +658,7 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
     int                ret_value = 0;
 
     /* init linkinfo struct */
-    HDmemset(&linkinfo, 0, sizeof(h5tool_link_info_t));
+    memset(&linkinfo, 0, sizeof(h5tool_link_info_t));
 
     /*-------------------------------------------------------------------------
      * copy the supplied object list
@@ -877,7 +877,7 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
                             H5TOOLS_GOTO_ERROR((-1), "H5Dget_create_plist failed");
                         if ((rank = H5Sget_simple_extent_ndims(f_space_id)) < 0)
                             H5TOOLS_GOTO_ERROR((-1), "H5Sget_simple_extent_ndims failed");
-                        HDmemset(dims, 0, sizeof dims);
+                        memset(dims, 0, sizeof dims);
                         if (H5Sget_simple_extent_dims(f_space_id, dims, NULL) < 0)
                             H5TOOLS_GOTO_ERROR((-1), "H5Sget_simple_extent_dims failed");
                         if (H5Dget_space_status(dset_in, &space_status) < 0)
@@ -1116,8 +1116,8 @@ do_copy_objects(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
                                         hslab_space  = H5Screate_simple(1, &hslab_nelmts, NULL);
 
                                         /* the hyperslab selection loop */
-                                        HDmemset(hs_sel_offset, 0, sizeof hs_sel_offset);
-                                        HDmemset(zero, 0, sizeof zero);
+                                        memset(hs_sel_offset, 0, sizeof hs_sel_offset);
+                                        memset(zero, 0, sizeof zero);
 
                                         for (elmtno = 0; elmtno < p_nelmts; elmtno += hs_select_nelmts) {
                                             if (rank > 0) {
diff --git a/tools/src/h5repack/h5repack_main.c b/tools/src/h5repack/h5repack_main.c
index c0a245a..33e3b83 100644
--- a/tools/src/h5repack/h5repack_main.c
+++ b/tools/src/h5repack/h5repack_main.c
@@ -535,10 +535,10 @@ parse_command_line(int argc, const char *const *argv, pack_opt_t *options)
     int                ret_value = 0;
 
     /* Initialize fapl info structs */
-    HDmemset(&in_vol_info, 0, sizeof(h5tools_vol_info_t));
-    HDmemset(&out_vol_info, 0, sizeof(h5tools_vol_info_t));
-    HDmemset(&in_vfd_info, 0, sizeof(h5tools_vfd_info_t));
-    HDmemset(&out_vfd_info, 0, sizeof(h5tools_vfd_info_t));
+    memset(&in_vol_info, 0, sizeof(h5tools_vol_info_t));
+    memset(&out_vol_info, 0, sizeof(h5tools_vol_info_t));
+    memset(&in_vfd_info, 0, sizeof(h5tools_vfd_info_t));
+    memset(&out_vfd_info, 0, sizeof(h5tools_vfd_info_t));
 
     /* parse command line options */
     while (EOF != (opt = H5_get_option(argc, argv, s_opts, l_opts))) {
@@ -966,7 +966,7 @@ main(int argc, char **argv)
     pack_opt_t options; /*the global options */
     int        parse_ret;
 
-    HDmemset(&options, 0, sizeof(pack_opt_t));
+    memset(&options, 0, sizeof(pack_opt_t));
 
     /* Initialize h5tools lib */
     h5tools_init();
diff --git a/tools/src/h5repack/h5repack_parse.c b/tools/src/h5repack/h5repack_parse.c
index 5954a01..3d6f829 100644
--- a/tools/src/h5repack/h5repack_parse.c
+++ b/tools/src/h5repack/h5repack_parse.c
@@ -52,7 +52,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
     unsigned    pixels_per_block;
 
     /* initialize compression  info */
-    HDmemset(filt, 0, sizeof(filter_info_t));
+    memset(filt, 0, sizeof(filter_info_t));
     *is_glb = 0;
 
     /* check for the end of object list and number of objects */
@@ -95,7 +95,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
                     sobj[k + 1] = '\0';
 
                 HDstrcpy(obj_list[n].obj, sobj);
-                HDmemset(sobj, 0, sizeof(sobj));
+                memset(sobj, 0, sizeof(sobj));
                 n++;
                 k = -1;
             }
@@ -492,9 +492,9 @@ parse_layout(const char *str, unsigned *n_objs, pack_info_t *pack, /* info about
     char        sdim[10];
     char        slayout[10];
 
-    HDmemset(sdim, '\0', sizeof(sdim));
-    HDmemset(sobj, '\0', sizeof(sobj));
-    HDmemset(slayout, '\0', sizeof(slayout));
+    memset(sdim, '\0', sizeof(sdim));
+    memset(sobj, '\0', sizeof(sobj));
+    memset(slayout, '\0', sizeof(slayout));
 
     /* check for the end of object list and number of objects */
     for (i = 0, n = 0; i < len; i++) {
@@ -528,7 +528,7 @@ parse_layout(const char *str, unsigned *n_objs, pack_info_t *pack, /* info about
                 else
                     sobj[k + 1] = '\0';
                 HDstrcpy(obj_list[n].obj, sobj);
-                HDmemset(sobj, 0, sizeof(sobj));
+                memset(sobj, 0, sizeof(sobj));
                 n++;
                 k = -1;
             }
diff --git a/tools/src/h5repack/h5repack_refs.c b/tools/src/h5repack/h5repack_refs.c
index 222447d..ce4a5cf 100644
--- a/tools/src/h5repack/h5repack_refs.c
+++ b/tools/src/h5repack/h5repack_refs.c
@@ -666,7 +666,7 @@ copy_refs_attr(hid_t loc_in, hid_t loc_out, trav_table_t *travt, hid_t fidout) /
                         for (j = 0; j < ((hvl_t *)buf)[i].len; j++) {
                             if (update_ref_value(attr_id, H5R_OBJECT, &(ptr[j]), fidout, &ref_out, travt) < 0)
                                 continue;
-                            HDmemcpy(&(ptr[j]), &ref_out, msize);
+                            memcpy(&(ptr[j]), &ref_out, msize);
                         }
                     } /* for (i=0; i<nelems; i++) */
                 }
@@ -680,7 +680,7 @@ copy_refs_attr(hid_t loc_in, hid_t loc_out, trav_table_t *travt, hid_t fidout) /
                             if (update_ref_value(attr_id, H5R_DATASET_REGION, &(ptr[j]), fidout, &ref_out,
                                                  travt) < 0)
                                 continue;
-                            HDmemcpy(&(ptr[j]), &ref_out, msize);
+                            memcpy(&(ptr[j]), &ref_out, msize);
                         }
                     } /* for (i=0; i<nelems; i++) */
                 }
@@ -711,7 +711,7 @@ copy_refs_attr(hid_t loc_in, hid_t loc_out, trav_table_t *travt, hid_t fidout) /
                                                  travt) < 0) /* Extra (void *) cast to quiet "cast to create
                                                                 alignment" warning - 2019/07/05, QAK */
                                 continue;
-                            HDmemcpy(((char *)buf) + idx, &ref_out, ref_comp_size[j]);
+                            memcpy(((char *)buf) + idx, &ref_out, ref_comp_size[j]);
                         } /* if */
                         else if (ref_comp_size[j] == H5R_DSET_REG_REF_BUF_SIZE) {
                             size_t idx = i * msize + H5Tget_member_offset(mtype_id, ref_comp_index[j]);
@@ -721,7 +721,7 @@ copy_refs_attr(hid_t loc_in, hid_t loc_out, trav_table_t *travt, hid_t fidout) /
                                                  (hdset_reg_ref_t *)(((char *)buf) + idx), fidout, &ref_out,
                                                  travt) < 0)
                                 continue;
-                            HDmemcpy(((char *)buf) + idx, &ref_out, ref_comp_size[j]);
+                            memcpy(((char *)buf) + idx, &ref_out, ref_comp_size[j]);
                         } /* else if */
                     }     /* j */
                 }         /* i */