diff options
320 files changed, 2914 insertions, 2934 deletions
diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp index 301272b..e1cee97 100644 --- a/c++/test/dsets.cpp +++ b/c++/test/dsets.cpp @@ -726,8 +726,8 @@ test_nbit_compression(H5File &file) SUBTEST("N-bit compression (setup)"); - HDmemset(orig_data, 0, DIM1 * DIM2 * sizeof(s1_t)); - HDmemset(new_data, 0, DIM1 * DIM2 * sizeof(s1_t)); + memset(orig_data, 0, DIM1 * DIM2 * sizeof(s1_t)); + memset(new_data, 0, DIM1 * DIM2 * sizeof(s1_t)); try { // Define datatypes of members of compound datatype @@ -1093,7 +1093,7 @@ test_getnativeinfo(H5File &file) // Get dataset header info H5O_native_info_t ninfo; - HDmemset(&ninfo, 0, sizeof(ninfo)); + memset(&ninfo, 0, sizeof(ninfo)); dataset.getNativeObjinfo(ninfo, H5O_NATIVE_INFO_HDR); verify_val(static_cast<long>(ninfo.hdr.nchunks), 1, "DataSet::getNativeObjinfo", __LINE__, __FILE__); dataset.close(); @@ -1101,7 +1101,7 @@ test_getnativeinfo(H5File &file) // Open the dataset we created above and then close it. This is one // way to open an existing dataset for accessing. dataset = file.openDataSet(DSET_DEFAULT_NAME); - HDmemset(&ninfo, 0, sizeof(ninfo)); + memset(&ninfo, 0, sizeof(ninfo)); dataset.getNativeObjinfo(ninfo, H5O_NATIVE_INFO_ALL); verify_val(static_cast<long>(ninfo.hdr.nchunks), 1, "DataSet::getNativeObjinfo", __LINE__, __FILE__); dataset.close(); diff --git a/c++/test/tarray.cpp b/c++/test/tarray.cpp index e207592..f616dcd 100644 --- a/c++/test/tarray.cpp +++ b/c++/test/tarray.cpp @@ -239,7 +239,7 @@ test_array_compound_array() verify_val(ndims, ARRAY1_RANK, "f2_atype_check.getArrayNDims", __LINE__, __FILE__); // Get the array dimensions - HDmemset(rdims1, 0, sizeof(rdims1)); + memset(rdims1, 0, sizeof(rdims1)); f2_atype_check.getArrayDims(rdims1); // Check the array dimensions diff --git a/c++/test/tattr.cpp b/c++/test/tattr.cpp index fe27cb5..e018ab1 100644 --- a/c++/test/tattr.cpp +++ b/c++/test/tattr.cpp @@ -297,7 +297,7 @@ test_attr_getname(FileAccPropList &fapl) // 1. With arbitrary buf_size that is larger than the name size size_t buf_size = FATTR1_NAME.length() + 10; char *fattr1_name = new char[buf_size + 1]; - HDmemset(fattr1_name, 0, buf_size + 1); + memset(fattr1_name, 0, buf_size + 1); ssize_t name_size = 0; // actual length of attribute name name_size = fattr1.getName(fattr1_name, buf_size + 1); CHECK(name_size, FAIL, "Attribute::getName", __LINE__, __FILE__); @@ -312,7 +312,7 @@ test_attr_getname(FileAccPropList &fapl) buf_size = 4; char short_name[5] = "File"; // to verify the read name fattr1_name = new char[buf_size + 1]; - HDmemset(fattr1_name, 0, buf_size + 1); + memset(fattr1_name, 0, buf_size + 1); name_size = fattr1.getName(fattr1_name, buf_size + 1); CHECK(name_size, FAIL, "Attribute::getName", __LINE__, __FILE__); verify_val(static_cast<size_t>(name_size), FATTR1_NAME.size(), "Attribute::getName", __LINE__, @@ -324,7 +324,7 @@ test_attr_getname(FileAccPropList &fapl) // 3. With a buf_size that equals the name's length. buf_size = FATTR1_NAME.length(); fattr1_name = new char[buf_size + 1]; - HDmemset(fattr1_name, 0, buf_size + 1); + memset(fattr1_name, 0, buf_size + 1); name_size = fattr1.getName(fattr1_name, buf_size + 1); CHECK(name_size, FAIL, "Attribute::getName", __LINE__, __FILE__); verify_val(fattr1_name, FATTR1_NAME, "Attribute::getName", __LINE__, __FILE__); @@ -531,7 +531,7 @@ test_attr_basic_read(FileAccPropList &fapl) // Verify the correct number of attributes another way H5O_info2_t oinfo; - HDmemset(&oinfo, 0, sizeof(oinfo)); + memset(&oinfo, 0, sizeof(oinfo)); dataset.getObjinfo(oinfo, H5O_INFO_NUM_ATTRS); verify_val(static_cast<long>(oinfo.num_attrs), 3, "DataSet::getObjinfo", __LINE__, __FILE__); @@ -560,7 +560,7 @@ test_attr_basic_read(FileAccPropList &fapl) verify_val(num_attrs, 1, "Group::getNumAttrs", __LINE__, __FILE__); // Verify the correct number of attributes another way - HDmemset(&oinfo, 0, sizeof(oinfo)); + memset(&oinfo, 0, sizeof(oinfo)); group.getObjinfo(oinfo, H5O_INFO_NUM_ATTRS); verify_val(static_cast<long>(oinfo.num_attrs), 1, "Group::getObjinfo", __LINE__, __FILE__); @@ -686,7 +686,7 @@ test_attr_compound_read(FileAccPropList &fapl) // Verify the correct number of attributes another way H5O_info2_t oinfo; - HDmemset(&oinfo, 0, sizeof(oinfo)); + memset(&oinfo, 0, sizeof(oinfo)); dataset.getObjinfo(oinfo, H5O_INFO_NUM_ATTRS); verify_val(static_cast<long>(oinfo.num_attrs), 1, "DataSet::getObjinfo", __LINE__, __FILE__); @@ -789,7 +789,7 @@ test_attr_compound_read(FileAccPropList &fapl) hsize_t ii, jj; for (ii = 0; ii < ATTR4_DIM1; ii++) for (jj = 0; jj < ATTR4_DIM2; jj++) - if (HDmemcmp(&attr_data4[ii][jj], &read_data4[ii][jj], sizeof(struct attr4_struct)) != 0) { + if (memcmp(&attr_data4[ii][jj], &read_data4[ii][jj], sizeof(struct attr4_struct)) != 0) { TestErrPrintf("%d:attribute data different: attr_data4[%" PRIuHSIZE "][%" PRIuHSIZE "].i=%d, " "read_data4[%" PRIuHSIZE "][%" PRIuHSIZE "].i=%d\n", diff --git a/c++/test/tcompound.cpp b/c++/test/tcompound.cpp index 2ec9e25..53939dd 100644 --- a/c++/test/tcompound.cpp +++ b/c++/test/tcompound.cpp @@ -108,7 +108,7 @@ test_compound_2() s_ptr->d = i * 8 + 6; s_ptr->e = i * 8 + 7; } - HDmemcpy(buf, orig, nelmts * sizeof(src_typ_t)); + memcpy(buf, orig, nelmts * sizeof(src_typ_t)); // Build hdf5 datatypes array_dt = new ArrayType(PredType::NATIVE_INT, 1, &four); diff --git a/c++/test/tdspl.cpp b/c++/test/tdspl.cpp index e076c5a..bccc41a 100644 --- a/c++/test/tdspl.cpp +++ b/c++/test/tdspl.cpp @@ -61,7 +61,7 @@ test_transfplist() // for it, then read and verify the expression from the copied plist size_t tran_len = static_cast<size_t>(dxpl_c_to_f_copy.getDataTransform(NULL)); char *c_to_f_read = static_cast<char *>(malloc(tran_len + 1)); - HDmemset(c_to_f_read, 0, tran_len + 1); + memset(c_to_f_read, 0, tran_len + 1); dxpl_c_to_f_copy.getDataTransform(c_to_f_read, tran_len + 1); verify_val(const_cast<const char *>(c_to_f_read), const_cast<const char *>(c_to_f), "DSetMemXferPropList::getDataTransform", __LINE__, __FILE__); @@ -76,7 +76,7 @@ test_transfplist() // ssize_t getDataTransform(char* exp, const size_t buf_size [default=0]) tran_len = static_cast<size_t>(dxpl_c_to_f.getDataTransform(NULL)); c_to_f_read = static_cast<char *>(malloc(tran_len + 1)); - HDmemset(c_to_f_read, 0, tran_len + 1); + memset(c_to_f_read, 0, tran_len + 1); dxpl_c_to_f.getDataTransform(c_to_f_read, tran_len + 1); verify_val(const_cast<const char *>(c_to_f_read), const_cast<const char *>(c_to_f), "DSetMemXferPropList::getDataTransform", __LINE__, __FILE__); @@ -92,7 +92,7 @@ test_transfplist() // ssize_t getDataTransform(char* exp, const size_t buf_size) tran_len = static_cast<size_t>(dxpl_utrans_inv.getDataTransform(NULL, 0)); char *utrans_inv_read = static_cast<char *>(malloc(tran_len + 1)); - HDmemset(utrans_inv_read, 0, tran_len + 1); + memset(utrans_inv_read, 0, tran_len + 1); dxpl_utrans_inv.getDataTransform(utrans_inv_read, tran_len + 1); verify_val(const_cast<const char *>(utrans_inv_read), const_cast<const char *>(utrans_inv), "DSetMemXferPropList::getDataTransform", __LINE__, __FILE__); diff --git a/c++/test/tfile.cpp b/c++/test/tfile.cpp index 97b3a36..212a241 100644 --- a/c++/test/tfile.cpp +++ b/c++/test/tfile.cpp @@ -626,7 +626,7 @@ test_file_attribute() verify_val(n_attrs, 1, "DataSet::getNumAttrs()", __LINE__, __FILE__); // Read back attribute's data - HDmemset(rdata, 0, sizeof(rdata)); + memset(rdata, 0, sizeof(rdata)); dattr.read(PredType::NATIVE_INT, rdata); /* Check results */ for (i = 0; i < ATTR1_DIM1; i++) { @@ -682,7 +682,7 @@ test_libver_bounds_real(H5F_libver_t libver_create, unsigned oh_vers_create, H5F // Verify object header version another way H5O_native_info_t ninfo; - HDmemset(&ninfo, 0, sizeof(ninfo)); + memset(&ninfo, 0, sizeof(ninfo)); file.getNativeObjinfo(ninfo, H5O_NATIVE_INFO_HDR); verify_val(ninfo.hdr.version, oh_vers_create, "H5File::getNativeObjinfo", __LINE__, __FILE__); @@ -709,7 +709,7 @@ test_libver_bounds_real(H5F_libver_t libver_create, unsigned oh_vers_create, H5F verify_val(obj_version, oh_vers_mod, "Group::objVersion", __LINE__, __FILE__); // Verify object header version another way - HDmemset(&ninfo, 0, sizeof(ninfo)); + memset(&ninfo, 0, sizeof(ninfo)); group.getNativeObjinfo(ninfo, H5O_NATIVE_INFO_HDR); verify_val(ninfo.hdr.version, oh_vers_mod, "Group::getNativeObjinfo", __LINE__, __FILE__); diff --git a/c++/test/th5s.cpp b/c++/test/th5s.cpp index e0a12b4..04bc3c0 100644 --- a/c++/test/th5s.cpp +++ b/c++/test/th5s.cpp @@ -116,8 +116,8 @@ test_h5s_basic() hsize_t tdims[4]; // Dimension array to test with ndims = sid1.getSimpleExtentDims(tdims); verify_val(ndims, SPACE1_RANK, "DataSpace::getSimpleExtentDims", __LINE__, __FILE__); - verify_val(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(unsigned)), 0, - "DataSpace::getSimpleExtentDims", __LINE__, __FILE__); + verify_val(memcmp(tdims, dims1, SPACE1_RANK * sizeof(unsigned)), 0, "DataSpace::getSimpleExtentDims", + __LINE__, __FILE__); // Create simple dataspace sid2 hsize_t max2[] = {SPACE2_MAX1, SPACE2_MAX2, SPACE2_MAX3, SPACE2_MAX4}; @@ -135,9 +135,9 @@ test_h5s_basic() // Retrieves dimension size and max size of dataspace sid2 and // verify them ndims = sid2.getSimpleExtentDims(tdims, tmax); - verify_val(HDmemcmp(tdims, dims2, SPACE2_RANK * sizeof(unsigned)), 0, - "DataSpace::getSimpleExtentDims", __LINE__, __FILE__); - verify_val(HDmemcmp(tmax, max2, SPACE2_RANK * sizeof(unsigned)), 0, "DataSpace::getSimpleExtentDims", + verify_val(memcmp(tdims, dims2, SPACE2_RANK * sizeof(unsigned)), 0, "DataSpace::getSimpleExtentDims", + __LINE__, __FILE__); + verify_val(memcmp(tmax, max2, SPACE2_RANK * sizeof(unsigned)), 0, "DataSpace::getSimpleExtentDims", __LINE__, __FILE__); // Check to be sure we can't create a simple data space that has too @@ -444,7 +444,7 @@ test_h5s_compound_scalar_read() dataset.read(&rdata, type); // Verify read data - if (HDmemcmp(&space4_data, &rdata, sizeof(struct space4_struct)) != 0) { + if (memcmp(&space4_data, &rdata, sizeof(struct space4_struct)) != 0) { cerr << "scalar data different: space4_data.c1=" << space4_data.c1 << ", read_data4.c1=" << rdata.c1 << endl; cerr << "scalar data different: space4_data.u=" << space4_data.u << ", read_data4.u=" << rdata.u diff --git a/c++/test/tobject.cpp b/c++/test/tobject.cpp index dc67ea2..741c628 100644 --- a/c++/test/tobject.cpp +++ b/c++/test/tobject.cpp @@ -536,8 +536,8 @@ test_getobjectinfo_same_file() Group grp2(file1.createGroup(GROUP2NAME)); // Reset object info - HDmemset(&oinfo1, 0, sizeof(oinfo1)); - HDmemset(&oinfo2, 0, sizeof(oinfo2)); + memset(&oinfo1, 0, sizeof(oinfo1)); + memset(&oinfo2, 0, sizeof(oinfo2)); // Query the info of two groups and verify that they have the same // file number @@ -559,8 +559,8 @@ test_getobjectinfo_same_file() grp2 = file2.openGroup(GROUP2NAME); // Reset object info - HDmemset(&oinfo1, 0, sizeof(oinfo1)); - HDmemset(&oinfo2, 0, sizeof(oinfo2)); + memset(&oinfo1, 0, sizeof(oinfo1)); + memset(&oinfo2, 0, sizeof(oinfo2)); // Query the info of two groups and verify that they have the same // file number @@ -569,8 +569,8 @@ test_getobjectinfo_same_file() verify_val(oinfo1.fileno, oinfo2.fileno, "file number from getObjinfo", __LINE__, __FILE__); // Reset object info - HDmemset(&oinfo1, 0, sizeof(oinfo1)); - HDmemset(&oinfo2, 0, sizeof(oinfo2)); + memset(&oinfo1, 0, sizeof(oinfo1)); + memset(&oinfo2, 0, sizeof(oinfo2)); file1.getObjinfo(GROUP1NAME, oinfo1); file1.getObjinfo(GROUP2NAME, oinfo2); diff --git a/c++/test/trefer.cpp b/c++/test/trefer.cpp index f207eb7..31c5022 100644 --- a/c++/test/trefer.cpp +++ b/c++/test/trefer.cpp @@ -488,14 +488,14 @@ test_reference_group() // Check object type using Group::getObjinfo() H5O_info2_t oinfo; - HDmemset(&oinfo, 0, sizeof(oinfo)); + memset(&oinfo, 0, sizeof(oinfo)); group.getObjinfo(".", H5_INDEX_NAME, H5_ITER_INC, 0, oinfo); verify_val(static_cast<long>(oinfo.type), static_cast<long>(H5O_TYPE_DATASET), "Group::getObjinfo", __LINE__, __FILE__); // Check for out of bound query by index try { - HDmemset(&oinfo, 0, sizeof(oinfo)); + memset(&oinfo, 0, sizeof(oinfo)); group.getObjinfo(".", H5_INDEX_NAME, H5_ITER_INC, 9, oinfo); // Should FAIL but didn't, so throw an invalid action exception diff --git a/c++/test/tvlstr.cpp b/c++/test/tvlstr.cpp index a9178af..748333f 100644 --- a/c++/test/tvlstr.cpp +++ b/c++/test/tvlstr.cpp @@ -179,7 +179,7 @@ test_vlstring_dataset() dset1 = root.createDataSet("test_scalar_small", vlst, ds_space); dynstring_ds_write = static_cast<char *>(calloc(2, sizeof(char))); - HDmemset(dynstring_ds_write, 'A', 1); + memset(dynstring_ds_write, 'A', 1); // Write data to the dataset, then read it back. dset1.write(&dynstring_ds_write, vlst); @@ -277,7 +277,7 @@ test_vlstring_array_dataset() // Create and write another dataset. DataSet dataset2(file1->createDataSet("Dataset2", vlst, scalar_space)); char *wdata2 = static_cast<char *>(calloc(65534, sizeof(char))); - HDmemset(wdata2, 'A', 65533); + memset(wdata2, 'A', 65533); dataset2.write(&wdata2, vlst); char *rdata2; @@ -654,7 +654,7 @@ test_vlstring_attribute() gr_attr = root.createAttribute("test_scalar_large", vlst, att_space); string_att_write = static_cast<char *>(calloc(8192, sizeof(char))); - HDmemset(string_att_write, 'A', 8191); + memset(string_att_write, 'A', 8191); // Write data to the attribute, then read it back. gr_attr.write(vlst, &string_att_write); diff --git a/hl/c++/test/ptableTest.cpp b/hl/c++/test/ptableTest.cpp index 746fa09..a77a8e1 100644 --- a/hl/c++/test/ptableTest.cpp +++ b/hl/c++/test/ptableTest.cpp @@ -685,7 +685,7 @@ TestHDFFV_9758() ptable.ResetIndex(); for (size_t i = 0; i < NUM_PACKETS; i++) { s1_t s2; - HDmemset(&s2, 0, sizeof(s1_t)); + memset(&s2, 0, sizeof(s1_t)); err = ptable.GetNextPacket(&s2); if (err < 0) goto error; @@ -183,7 +183,7 @@ H5_init_library(void) /* * Make sure the package information is updated. */ - HDmemset(&H5_debug_g, 0, sizeof H5_debug_g); + memset(&H5_debug_g, 0, sizeof H5_debug_g); H5_debug_g.pkg[H5_PKG_A].name = "a"; H5_debug_g.pkg[H5_PKG_AC].name = "ac"; H5_debug_g.pkg[H5_PKG_B].name = "b"; diff --git a/src/H5Adense.c b/src/H5Adense.c index db3886f..248f5a7 100644 --- a/src/H5Adense.c +++ b/src/H5Adense.c @@ -177,7 +177,7 @@ H5A__dense_create(H5F_t *f, H5O_ainfo_t *ainfo) /* Set fractal heap creation parameters */ /* XXX: Give some control of these to applications? */ - HDmemset(&fheap_cparam, 0, sizeof(fheap_cparam)); + memset(&fheap_cparam, 0, sizeof(fheap_cparam)); fheap_cparam.managed.width = H5O_FHEAP_MAN_WIDTH; fheap_cparam.managed.start_block_size = H5O_FHEAP_MAN_START_BLOCK_SIZE; fheap_cparam.managed.max_direct_size = H5O_FHEAP_MAN_MAX_DIRECT_SIZE; @@ -206,7 +206,7 @@ H5A__dense_create(H5F_t *f, H5O_ainfo_t *ainfo) #endif /* NDEBUG */ /* Create the name index v2 B-tree */ - HDmemset(&bt2_cparam, 0, sizeof(bt2_cparam)); + memset(&bt2_cparam, 0, sizeof(bt2_cparam)); bt2_cparam.cls = H5A_BT2_NAME; bt2_cparam.node_size = (size_t)H5A_NAME_BT2_NODE_SIZE; bt2_cparam.rrec_size = 4 + /* Name's hash value */ @@ -225,7 +225,7 @@ H5A__dense_create(H5F_t *f, H5O_ainfo_t *ainfo) /* Check if we should create a creation order index v2 B-tree */ if (ainfo->index_corder) { /* Create the creation order index v2 B-tree */ - HDmemset(&bt2_cparam, 0, sizeof(bt2_cparam)); + memset(&bt2_cparam, 0, sizeof(bt2_cparam)); bt2_cparam.cls = H5A_BT2_CORDER; bt2_cparam.node_size = (size_t)H5A_CORDER_BT2_NODE_SIZE; bt2_cparam.rrec_size = 4 + /* Creation order index */ diff --git a/src/H5Aint.c b/src/H5Aint.c index 64d4b4a..85739d0 100644 --- a/src/H5Aint.c +++ b/src/H5Aint.c @@ -710,7 +710,7 @@ H5A__read(const H5A_t *attr, const H5T_t *mem_type, void *buf) /* Check if the attribute has any data yet, if not, fill with zeroes */ if (attr->obj_opened && !attr->shared->data) - HDmemset(buf, 0, (dst_type_size * nelmts)); + memset(buf, 0, (dst_type_size * nelmts)); else { /* Attribute exists and has a value */ /* Convert memory buffer into disk buffer */ /* Set up type conversion function */ @@ -869,7 +869,7 @@ H5A__write(H5A_t *attr, const H5T_t *mem_type, const void *buf) /* Clear background buffer if it's not supposed to be initialized with file * contents */ if (need_bkg == H5T_BKG_TEMP) - HDmemset(bkg_buf, 0, dst_type_size * nelmts); + memset(bkg_buf, 0, dst_type_size * nelmts); } else if (NULL == (bkg_buf = H5FL_BLK_CALLOC(attr_buf, buf_size))) HGOTO_ERROR(H5E_ATTR, H5E_CANTALLOC, FAIL, "memory allocation failed") @@ -2281,7 +2281,7 @@ H5A__attr_copy_file(const H5A_t *attr_src, H5F_t *file_dst, hbool_t *recompute_s /* Set background buffer to all zeros */ if (bkg_buf) - HDmemset(bkg_buf, 0, buf_size); + memset(bkg_buf, 0, buf_size); /* Convert from memory to destination file */ if (H5T_convert(tpath_mem_dst, tid_mem, tid_dst, nelmts, (size_t)0, (size_t)0, buf, bkg_buf) < 0) @@ -2424,7 +2424,7 @@ H5A__attr_post_copy_file(const H5O_loc_t *src_oloc, const H5A_t *attr_src, H5O_l } /* end if */ else /* Reset value to zero */ - HDmemset(attr_dst->shared->data, 0, attr_dst->shared->data_size); + memset(attr_dst->shared->data, 0, attr_dst->shared->data_size); } /* end if */ done: @@ -215,7 +215,7 @@ H5B_create(H5F_t *f, const H5B_class_t *type, void *udata, haddr_t *addr_p /*out */ if (NULL == (bt = H5FL_MALLOC(H5B_t))) HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, FAIL, "memory allocation failed for B-tree root node") - HDmemset(&bt->cache_info, 0, sizeof(H5AC_info_t)); + memset(&bt->cache_info, 0, sizeof(H5AC_info_t)); bt->level = 0; bt->left = HADDR_UNDEF; bt->right = HADDR_UNDEF; @@ -703,7 +703,7 @@ H5B__insert_child(H5B_t *bt, unsigned *bt_flags, unsigned idx, haddr_t child, H5 } /* end if */ else { /* Make room for the new key */ - HDmemmove(base + shared->type->sizeof_nkey, base, (bt->nchildren - idx) * shared->type->sizeof_nkey); + memmove(base + shared->type->sizeof_nkey, base, (bt->nchildren - idx) * shared->type->sizeof_nkey); H5MM_memcpy(base, md_key, shared->type->sizeof_nkey); /* The MD_KEY is the left key of the new node */ @@ -711,7 +711,7 @@ H5B__insert_child(H5B_t *bt, unsigned *bt_flags, unsigned idx, haddr_t child, H5 idx++; /* Make room for the new child address */ - HDmemmove(bt->child + idx + 1, bt->child + idx, (bt->nchildren - idx) * sizeof(haddr_t)); + memmove(bt->child + idx + 1, bt->child + idx, (bt->nchildren - idx) * sizeof(haddr_t)); } /* end if */ bt->child[idx] = child; @@ -1401,8 +1401,7 @@ H5B__remove_helper(H5F_t *f, haddr_t addr, const H5B_class_t *type, int level, u */ if (type->critical_key == H5B_LEFT) { /* Slide all keys down 1, update lt_key */ - HDmemmove(H5B_NKEY(bt, shared, 0), H5B_NKEY(bt, shared, 1), - bt->nchildren * type->sizeof_nkey); + memmove(H5B_NKEY(bt, shared, 0), H5B_NKEY(bt, shared, 1), bt->nchildren * type->sizeof_nkey); H5MM_memcpy(lt_key, H5B_NKEY(bt, shared, 0), type->sizeof_nkey); *lt_key_changed = TRUE; } @@ -1410,10 +1409,10 @@ H5B__remove_helper(H5F_t *f, haddr_t addr, const H5B_class_t *type, int level, u /* Slide all but the leftmost 2 keys down, leaving the leftmost * key intact (the right key of the leftmost child is * overwritten) */ - HDmemmove(H5B_NKEY(bt, shared, 1), H5B_NKEY(bt, shared, 2), - (bt->nchildren - 1) * type->sizeof_nkey); + memmove(H5B_NKEY(bt, shared, 1), H5B_NKEY(bt, shared, 2), + (bt->nchildren - 1) * type->sizeof_nkey); - HDmemmove(bt->child, bt->child + 1, (bt->nchildren - 1) * sizeof(haddr_t)); + memmove(bt->child, bt->child + 1, (bt->nchildren - 1) * sizeof(haddr_t)); bt->nchildren -= 1; bt_flags |= H5AC__DIRTIED_FLAG; @@ -1428,8 +1427,8 @@ H5B__remove_helper(H5F_t *f, haddr_t addr, const H5B_class_t *type, int level, u if (type->critical_key == H5B_LEFT) /* Slide the rightmost key down one, overwriting the left key of * the deleted (rightmost) child */ - HDmemmove(H5B_NKEY(bt, shared, bt->nchildren - 1), H5B_NKEY(bt, shared, bt->nchildren), - type->sizeof_nkey); + memmove(H5B_NKEY(bt, shared, bt->nchildren - 1), H5B_NKEY(bt, shared, bt->nchildren), + type->sizeof_nkey); else { /* Just update rt_key */ H5MM_memcpy(rt_key, H5B_NKEY(bt, shared, bt->nchildren - 1), type->sizeof_nkey); @@ -1449,13 +1448,13 @@ H5B__remove_helper(H5F_t *f, haddr_t addr, const H5B_class_t *type, int level, u * Return H5B_INS_NOOP. */ if (type->critical_key == H5B_LEFT) - HDmemmove(H5B_NKEY(bt, shared, idx), H5B_NKEY(bt, shared, idx + 1), - (bt->nchildren - idx) * type->sizeof_nkey); + memmove(H5B_NKEY(bt, shared, idx), H5B_NKEY(bt, shared, idx + 1), + (bt->nchildren - idx) * type->sizeof_nkey); else - HDmemmove(H5B_NKEY(bt, shared, idx + 1), H5B_NKEY(bt, shared, idx + 2), - (bt->nchildren - 1 - idx) * type->sizeof_nkey); + memmove(H5B_NKEY(bt, shared, idx + 1), H5B_NKEY(bt, shared, idx + 2), + (bt->nchildren - 1 - idx) * type->sizeof_nkey); - HDmemmove(bt->child + idx, bt->child + idx + 1, (bt->nchildren - 1 - idx) * sizeof(haddr_t)); + memmove(bt->child + idx, bt->child + idx + 1, (bt->nchildren - 1 - idx) * sizeof(haddr_t)); bt->nchildren -= 1; bt_flags |= H5AC__DIRTIED_FLAG; @@ -1662,7 +1661,7 @@ H5B_shared_new(const H5F_t *f, const H5B_class_t *type, size_t sizeof_rkey) /* Allocate and clear shared buffers */ if (NULL == (shared->page = H5FL_BLK_MALLOC(page, shared->sizeof_rnode))) HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, NULL, "memory allocation failed for B-tree page") - HDmemset(shared->page, 0, shared->sizeof_rnode); + memset(shared->page, 0, shared->sizeof_rnode); if (NULL == (shared->nkey = H5FL_SEQ_MALLOC(size_t, (size_t)(shared->two_k + 1)))) HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, NULL, "memory allocation failed for B-tree native keys") @@ -1750,7 +1749,7 @@ H5B__copy(const H5B_t *old_bt) H5MM_memcpy(new_node, old_bt, sizeof(H5B_t)); /* Reset cache info */ - HDmemset(&new_node->cache_info, 0, sizeof(H5AC_info_t)); + memset(&new_node->cache_info, 0, sizeof(H5AC_info_t)); if (NULL == (new_node->native = H5FL_BLK_MALLOC(native_block, shared->sizeof_keys)) || NULL == (new_node->child = H5FL_SEQ_MALLOC(haddr_t, (size_t)shared->two_k))) @@ -1907,7 +1906,7 @@ H5B_get_info(H5F_t *f, const H5B_class_t *type, haddr_t addr, H5B_info_t *bt_inf assert(udata); /* Portably initialize B-tree info struct */ - HDmemset(bt_info, 0, sizeof(*bt_info)); + memset(bt_info, 0, sizeof(*bt_info)); /* Set up internal user-data for the B-tree 'get info' helper routine */ info_udata.bt_info = bt_info; diff --git a/src/H5B2cache.c b/src/H5B2cache.c index 9aa6ade..5fe7fd8 100644 --- a/src/H5B2cache.c +++ b/src/H5B2cache.c @@ -242,7 +242,7 @@ H5B2__cache_hdr_deserialize(const void *_image, size_t H5_ATTR_UNUSED len, void HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, NULL, "allocation failed for B-tree header") /* Magic number */ - if (HDmemcmp(image, H5B2_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) + if (memcmp(image, H5B2_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) HGOTO_ERROR(H5E_BTREE, H5E_BADVALUE, NULL, "wrong B-tree header signature") image += H5_SIZEOF_MAGIC; @@ -620,7 +620,7 @@ H5B2__cache_int_deserialize(const void *_image, size_t H5_ATTR_UNUSED len, void internal->shadow_epoch = udata->hdr->shadow_epoch; /* Magic number */ - if (HDmemcmp(image, H5B2_INT_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) + if (memcmp(image, H5B2_INT_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) HGOTO_ERROR(H5E_BTREE, H5E_BADVALUE, NULL, "wrong B-tree internal node signature") image += H5_SIZEOF_MAGIC; @@ -800,7 +800,7 @@ H5B2__cache_int_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED le assert((size_t)(image - (uint8_t *)_image) <= len); /* Clear rest of internal node */ - HDmemset(image, 0, len - (size_t)(image - (uint8_t *)_image)); + memset(image, 0, len - (size_t)(image - (uint8_t *)_image)); done: FUNC_LEAVE_NOAPI(ret_value) @@ -1016,7 +1016,7 @@ H5B2__cache_leaf_deserialize(const void *_image, size_t H5_ATTR_UNUSED len, void leaf->shadow_epoch = udata->hdr->shadow_epoch; /* Magic number */ - if (HDmemcmp(image, H5B2_LEAF_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) + if (memcmp(image, H5B2_LEAF_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) HGOTO_ERROR(H5E_BTREE, H5E_BADVALUE, NULL, "wrong B-tree leaf node signature") image += H5_SIZEOF_MAGIC; @@ -1159,7 +1159,7 @@ H5B2__cache_leaf_serialize(const H5F_t H5_ATTR_UNUSED *f, void *_image, size_t H assert((size_t)(image - (uint8_t *)_image) <= len); /* Clear rest of leaf node */ - HDmemset(image, 0, len - (size_t)(image - (uint8_t *)_image)); + memset(image, 0, len - (size_t)(image - (uint8_t *)_image)); done: FUNC_LEAVE_NOAPI(ret_value) diff --git a/src/H5B2hdr.c b/src/H5B2hdr.c index 1df02fd..6c07835 100644 --- a/src/H5B2hdr.c +++ b/src/H5B2hdr.c @@ -129,7 +129,7 @@ H5B2__hdr_init(H5B2_hdr_t *hdr, const H5B2_create_t *cparam, void *ctx_udata, ui /* Allocate "page" for node I/O */ if (NULL == (hdr->page = H5FL_BLK_MALLOC(node_page, hdr->node_size))) HGOTO_ERROR(H5E_BTREE, H5E_NOSPACE, FAIL, "memory allocation failed") - HDmemset(hdr->page, 0, hdr->node_size); + memset(hdr->page, 0, hdr->node_size); /* Allocate array of node info structs */ if (NULL == (hdr->node_info = H5FL_SEQ_MALLOC(H5B2_node_info_t, (size_t)(hdr->depth + 1)))) diff --git a/src/H5B2int.c b/src/H5B2int.c index c30ecce..e9238c9 100644 --- a/src/H5B2int.c +++ b/src/H5B2int.c @@ -151,10 +151,10 @@ H5B2__split1(H5B2_hdr_t *hdr, uint16_t depth, H5B2_node_ptr_t *curr_node_ptr, /* Slide records in parent node up one space, to make room for promoted record */ if (idx < internal->nrec) { - HDmemmove(H5B2_INT_NREC(internal, hdr, idx + 1), H5B2_INT_NREC(internal, hdr, idx), - hdr->cls->nrec_size * (internal->nrec - idx)); - HDmemmove(&(internal->node_ptrs[idx + 2]), &(internal->node_ptrs[idx + 1]), - sizeof(H5B2_node_ptr_t) * (internal->nrec - idx)); + memmove(H5B2_INT_NREC(internal, hdr, idx + 1), H5B2_INT_NREC(internal, hdr, idx), + hdr->cls->nrec_size * (internal->nrec - idx)); + memmove(&(internal->node_ptrs[idx + 2]), &(internal->node_ptrs[idx + 1]), + sizeof(H5B2_node_ptr_t) * (internal->nrec - idx)); } /* end if */ /* Check for the kind of B-tree node to split */ @@ -521,8 +521,8 @@ H5B2__redistribute2(H5B2_hdr_t *hdr, uint16_t depth, H5B2_internal_t *internal, hdr->cls->nrec_size); /* Slide records in right node down */ - HDmemmove(H5B2_NAT_NREC(right_native, hdr, 0), H5B2_NAT_NREC(right_native, hdr, move_nrec), - hdr->cls->nrec_size * new_right_nrec); + memmove(H5B2_NAT_NREC(right_native, hdr, 0), H5B2_NAT_NREC(right_native, hdr, move_nrec), + hdr->cls->nrec_size * new_right_nrec); /* Handle node pointers, if we have an internal node */ if (depth > 1) { @@ -540,8 +540,8 @@ H5B2__redistribute2(H5B2_hdr_t *hdr, uint16_t depth, H5B2_internal_t *internal, sizeof(H5B2_node_ptr_t) * move_nrec); /* Slide node pointers in right node down */ - HDmemmove(&(right_node_ptrs[0]), &(right_node_ptrs[move_nrec]), - sizeof(H5B2_node_ptr_t) * (new_right_nrec + (unsigned)1)); + memmove(&(right_node_ptrs[0]), &(right_node_ptrs[move_nrec]), + sizeof(H5B2_node_ptr_t) * (new_right_nrec + (unsigned)1)); } /* end if */ /* Update flush dependencies for grandchildren, if using SWMR */ @@ -571,8 +571,8 @@ H5B2__redistribute2(H5B2_hdr_t *hdr, uint16_t depth, H5B2_internal_t *internal, assert(*left_nrec > *right_nrec); /* Slide records in right node up */ - HDmemmove(H5B2_NAT_NREC(right_native, hdr, move_nrec), H5B2_NAT_NREC(right_native, hdr, 0), - hdr->cls->nrec_size * (*right_nrec)); + memmove(H5B2_NAT_NREC(right_native, hdr, move_nrec), H5B2_NAT_NREC(right_native, hdr, 0), + hdr->cls->nrec_size * (*right_nrec)); /* Copy record from parent node down into right child */ H5MM_memcpy(H5B2_NAT_NREC(right_native, hdr, (move_nrec - 1)), H5B2_INT_NREC(internal, hdr, idx), @@ -594,8 +594,8 @@ H5B2__redistribute2(H5B2_hdr_t *hdr, uint16_t depth, H5B2_internal_t *internal, unsigned u; /* Local index variable */ /* Slide node pointers in right node up */ - HDmemmove(&(right_node_ptrs[move_nrec]), &(right_node_ptrs[0]), - sizeof(H5B2_node_ptr_t) * (size_t)(*right_nrec + 1)); + memmove(&(right_node_ptrs[move_nrec]), &(right_node_ptrs[0]), + sizeof(H5B2_node_ptr_t) * (size_t)(*right_nrec + 1)); /* Copy node pointers from left node to right */ H5MM_memcpy(&(right_node_ptrs[0]), &(left_node_ptrs[new_left_nrec + 1]), @@ -813,9 +813,9 @@ H5B2__redistribute3(H5B2_hdr_t *hdr, uint16_t depth, H5B2_internal_t *internal, moved_middle_nrec++; /* Slide records in middle node down */ - HDmemmove(H5B2_NAT_NREC(middle_native, hdr, 0), - H5B2_NAT_NREC(middle_native, hdr, moved_middle_nrec), - hdr->cls->nrec_size * (size_t)(*middle_nrec - moved_middle_nrec)); + memmove(H5B2_NAT_NREC(middle_native, hdr, 0), + H5B2_NAT_NREC(middle_native, hdr, moved_middle_nrec), + hdr->cls->nrec_size * (size_t)(*middle_nrec - moved_middle_nrec)); /* Move node pointers also if this is an internal node */ if (depth > 1) { @@ -835,8 +835,8 @@ H5B2__redistribute3(H5B2_hdr_t *hdr, uint16_t depth, H5B2_internal_t *internal, middle_moved_nrec -= (hssize_t)(moved_nrec + move_nptrs); /* Slide the node pointers in middle node down */ - HDmemmove(&(middle_node_ptrs[0]), &(middle_node_ptrs[move_nptrs]), - sizeof(H5B2_node_ptr_t) * ((*middle_nrec - move_nptrs) + 1)); + memmove(&(middle_node_ptrs[0]), &(middle_node_ptrs[move_nptrs]), + sizeof(H5B2_node_ptr_t) * ((*middle_nrec - move_nptrs) + 1)); } /* end if */ /* Update flush dependencies for grandchildren, if using SWMR */ @@ -860,8 +860,8 @@ H5B2__redistribute3(H5B2_hdr_t *hdr, uint16_t depth, H5B2_internal_t *internal, (unsigned)(new_right_nrec - *right_nrec); /* Number of records to move out of right node */ /* Slide records in right node up */ - HDmemmove(H5B2_NAT_NREC(right_native, hdr, right_nrec_move), H5B2_NAT_NREC(right_native, hdr, 0), - hdr->cls->nrec_size * (*right_nrec)); + memmove(H5B2_NAT_NREC(right_native, hdr, right_nrec_move), H5B2_NAT_NREC(right_native, hdr, 0), + hdr->cls->nrec_size * (*right_nrec)); /* Move right parent record down to right node */ H5MM_memcpy(H5B2_NAT_NREC(right_native, hdr, right_nrec_move - 1), @@ -884,8 +884,8 @@ H5B2__redistribute3(H5B2_hdr_t *hdr, uint16_t depth, H5B2_internal_t *internal, unsigned u; /* Local index variable */ /* Slide the node pointers in right node up */ - HDmemmove(&(right_node_ptrs[right_nrec_move]), &(right_node_ptrs[0]), - sizeof(H5B2_node_ptr_t) * (size_t)(*right_nrec + 1)); + memmove(&(right_node_ptrs[right_nrec_move]), &(right_node_ptrs[0]), + sizeof(H5B2_node_ptr_t) * (size_t)(*right_nrec + 1)); /* Move middle node pointers into right node */ H5MM_memcpy(&(right_node_ptrs[0]), @@ -920,8 +920,8 @@ H5B2__redistribute3(H5B2_hdr_t *hdr, uint16_t depth, H5B2_internal_t *internal, (unsigned)(*left_nrec - new_left_nrec); /* Number of records to move out of left node */ /* Slide middle records up */ - HDmemmove(H5B2_NAT_NREC(middle_native, hdr, left_nrec_move), H5B2_NAT_NREC(middle_native, hdr, 0), - hdr->cls->nrec_size * curr_middle_nrec); + memmove(H5B2_NAT_NREC(middle_native, hdr, left_nrec_move), H5B2_NAT_NREC(middle_native, hdr, 0), + hdr->cls->nrec_size * curr_middle_nrec); /* Move left parent record down to middle node */ H5MM_memcpy(H5B2_NAT_NREC(middle_native, hdr, left_nrec_move - 1), @@ -929,9 +929,9 @@ H5B2__redistribute3(H5B2_hdr_t *hdr, uint16_t depth, H5B2_internal_t *internal, /* Move left records to middle node */ if (left_nrec_move > 1) - HDmemmove(H5B2_NAT_NREC(middle_native, hdr, 0), - H5B2_NAT_NREC(left_native, hdr, new_left_nrec + 1), - hdr->cls->nrec_size * (left_nrec_move - 1)); + memmove(H5B2_NAT_NREC(middle_native, hdr, 0), + H5B2_NAT_NREC(left_native, hdr, new_left_nrec + 1), + hdr->cls->nrec_size * (left_nrec_move - 1)); /* Move left parent record up from left node */ H5MM_memcpy(H5B2_INT_NREC(internal, hdr, idx - 1), H5B2_NAT_NREC(left_native, hdr, new_left_nrec), @@ -943,8 +943,8 @@ H5B2__redistribute3(H5B2_hdr_t *hdr, uint16_t depth, H5B2_internal_t *internal, unsigned u; /* Local index variable */ /* Slide the node pointers in middle node up */ - HDmemmove(&(middle_node_ptrs[left_nrec_move]), &(middle_node_ptrs[0]), - sizeof(H5B2_node_ptr_t) * (size_t)(curr_middle_nrec + 1)); + memmove(&(middle_node_ptrs[left_nrec_move]), &(middle_node_ptrs[0]), + sizeof(H5B2_node_ptr_t) * (size_t)(curr_middle_nrec + 1)); /* Move left node pointers into middle node */ H5MM_memcpy(&(middle_node_ptrs[0]), &(left_node_ptrs[new_left_nrec + 1]), @@ -981,16 +981,16 @@ H5B2__redistribute3(H5B2_hdr_t *hdr, uint16_t depth, H5B2_internal_t *internal, H5B2_INT_NREC(internal, hdr, idx), hdr->cls->nrec_size); /* Move right records to middle node */ - HDmemmove(H5B2_NAT_NREC(middle_native, hdr, (curr_middle_nrec + 1)), - H5B2_NAT_NREC(right_native, hdr, 0), hdr->cls->nrec_size * (right_nrec_move - 1)); + memmove(H5B2_NAT_NREC(middle_native, hdr, (curr_middle_nrec + 1)), + H5B2_NAT_NREC(right_native, hdr, 0), hdr->cls->nrec_size * (right_nrec_move - 1)); /* Move right parent record up from right node */ H5MM_memcpy(H5B2_INT_NREC(internal, hdr, idx), H5B2_NAT_NREC(right_native, hdr, right_nrec_move - 1), hdr->cls->nrec_size); /* Slide right records down */ - HDmemmove(H5B2_NAT_NREC(right_native, hdr, 0), H5B2_NAT_NREC(right_native, hdr, right_nrec_move), - hdr->cls->nrec_size * new_right_nrec); + memmove(H5B2_NAT_NREC(right_native, hdr, 0), H5B2_NAT_NREC(right_native, hdr, right_nrec_move), + hdr->cls->nrec_size * new_right_nrec); /* Move node pointers also if this is an internal node */ if (depth > 1) { @@ -1008,8 +1008,8 @@ H5B2__redistribute3(H5B2_hdr_t *hdr, uint16_t depth, H5B2_internal_t *internal, middle_moved_nrec += (hssize_t)(moved_nrec + right_nrec_move); /* Slide the node pointers in right node down */ - HDmemmove(&(right_node_ptrs[0]), &(right_node_ptrs[right_nrec_move]), - sizeof(H5B2_node_ptr_t) * (size_t)(new_right_nrec + 1)); + memmove(&(right_node_ptrs[0]), &(right_node_ptrs[right_nrec_move]), + sizeof(H5B2_node_ptr_t) * (size_t)(new_right_nrec + 1)); } /* end if */ /* Update flush dependencies for grandchildren, if using SWMR */ @@ -1218,10 +1218,10 @@ H5B2__merge2(H5B2_hdr_t *hdr, uint16_t depth, H5B2_node_ptr_t *curr_node_ptr, /* Slide records in parent node down, to eliminate demoted record */ if ((idx + 1) < internal->nrec) { - HDmemmove(H5B2_INT_NREC(internal, hdr, idx), H5B2_INT_NREC(internal, hdr, idx + 1), - hdr->cls->nrec_size * (internal->nrec - (idx + 1))); - HDmemmove(&(internal->node_ptrs[idx + 1]), &(internal->node_ptrs[idx + 2]), - sizeof(H5B2_node_ptr_t) * (internal->nrec - (idx + 1))); + memmove(H5B2_INT_NREC(internal, hdr, idx), H5B2_INT_NREC(internal, hdr, idx + 1), + hdr->cls->nrec_size * (internal->nrec - (idx + 1))); + memmove(&(internal->node_ptrs[idx + 1]), &(internal->node_ptrs[idx + 2]), + sizeof(H5B2_node_ptr_t) * (internal->nrec - (idx + 1))); } /* end if */ /* Update # of records in parent node */ @@ -1396,8 +1396,8 @@ H5B2__merge3(H5B2_hdr_t *hdr, uint16_t depth, H5B2_node_ptr_t *curr_node_ptr, H5B2_NAT_NREC(middle_native, hdr, (middle_nrec_move - 1)), hdr->cls->nrec_size); /* Slide records in middle node down */ - HDmemmove(H5B2_NAT_NREC(middle_native, hdr, 0), H5B2_NAT_NREC(middle_native, hdr, middle_nrec_move), - hdr->cls->nrec_size * (*middle_nrec - middle_nrec_move)); + memmove(H5B2_NAT_NREC(middle_native, hdr, 0), H5B2_NAT_NREC(middle_native, hdr, middle_nrec_move), + hdr->cls->nrec_size * (*middle_nrec - middle_nrec_move)); /* Move node pointers also if this is an internal node */ if (depth > 1) { @@ -1412,8 +1412,8 @@ H5B2__merge3(H5B2_hdr_t *hdr, uint16_t depth, H5B2_node_ptr_t *curr_node_ptr, middle_moved_nrec += middle_node_ptrs[u].all_nrec; /* Slide the node pointers in middle node down */ - HDmemmove(&(middle_node_ptrs[0]), &(middle_node_ptrs[middle_nrec_move]), - sizeof(H5B2_node_ptr_t) * (size_t)((unsigned)(*middle_nrec + 1) - middle_nrec_move)); + memmove(&(middle_node_ptrs[0]), &(middle_node_ptrs[middle_nrec_move]), + sizeof(H5B2_node_ptr_t) * (size_t)((unsigned)(*middle_nrec + 1) - middle_nrec_move)); } /* end if */ /* Update flush dependencies for grandchildren, if using SWMR */ @@ -1475,10 +1475,10 @@ H5B2__merge3(H5B2_hdr_t *hdr, uint16_t depth, H5B2_node_ptr_t *curr_node_ptr, /* Slide records in parent node down, to eliminate demoted record */ if ((idx + 1) < internal->nrec) { - HDmemmove(H5B2_INT_NREC(internal, hdr, idx), H5B2_INT_NREC(internal, hdr, idx + 1), - hdr->cls->nrec_size * (internal->nrec - (idx + 1))); - HDmemmove(&(internal->node_ptrs[idx + 1]), &(internal->node_ptrs[idx + 2]), - sizeof(H5B2_node_ptr_t) * (internal->nrec - (idx + 1))); + memmove(H5B2_INT_NREC(internal, hdr, idx), H5B2_INT_NREC(internal, hdr, idx + 1), + hdr->cls->nrec_size * (internal->nrec - (idx + 1))); + memmove(&(internal->node_ptrs[idx + 1]), &(internal->node_ptrs[idx + 2]), + sizeof(H5B2_node_ptr_t) * (internal->nrec - (idx + 1))); } /* end if */ /* Update # of records in parent node */ diff --git a/src/H5B2internal.c b/src/H5B2internal.c index 205d0b7..e3f1cf9 100644 --- a/src/H5B2internal.c +++ b/src/H5B2internal.c @@ -104,14 +104,14 @@ H5B2__create_internal(H5B2_hdr_t *hdr, void *parent, H5B2_node_ptr_t *node_ptr, if (NULL == (internal->int_native = (uint8_t *)H5FL_FAC_MALLOC(hdr->node_info[depth].nat_rec_fac))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for B-tree internal native keys") - HDmemset(internal->int_native, 0, hdr->cls->nrec_size * hdr->node_info[depth].max_nrec); + memset(internal->int_native, 0, hdr->cls->nrec_size * hdr->node_info[depth].max_nrec); /* Allocate space for the node pointers in memory */ if (NULL == (internal->node_ptrs = (H5B2_node_ptr_t *)H5FL_FAC_MALLOC(hdr->node_info[depth].node_ptr_fac))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for B-tree internal node pointers") - HDmemset(internal->node_ptrs, 0, sizeof(H5B2_node_ptr_t) * (hdr->node_info[depth].max_nrec + 1)); + memset(internal->node_ptrs, 0, sizeof(H5B2_node_ptr_t) * (hdr->node_info[depth].max_nrec + 1)); /* Set depth of the node */ internal->depth = depth; diff --git a/src/H5B2leaf.c b/src/H5B2leaf.c index 0297153..ff6cb9e 100644 --- a/src/H5B2leaf.c +++ b/src/H5B2leaf.c @@ -103,7 +103,7 @@ H5B2__create_leaf(H5B2_hdr_t *hdr, void *parent, H5B2_node_ptr_t *node_ptr) /* Allocate space for the native keys in memory */ if (NULL == (leaf->leaf_native = (uint8_t *)H5FL_FAC_MALLOC(hdr->node_info[0].nat_rec_fac))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for B-tree leaf native keys") - HDmemset(leaf->leaf_native, 0, hdr->cls->nrec_size * hdr->node_info[0].max_nrec); + memset(leaf->leaf_native, 0, hdr->cls->nrec_size * hdr->node_info[0].max_nrec); /* Set parent */ leaf->parent = parent; @@ -360,8 +360,8 @@ H5B2__insert_leaf(H5B2_hdr_t *hdr, H5B2_node_ptr_t *curr_node_ptr, H5B2_nodepos_ /* Make room for new record */ if (idx < leaf->nrec) - HDmemmove(H5B2_LEAF_NREC(leaf, hdr, idx + 1), H5B2_LEAF_NREC(leaf, hdr, idx), - hdr->cls->nrec_size * (leaf->nrec - idx)); + memmove(H5B2_LEAF_NREC(leaf, hdr, idx + 1), H5B2_LEAF_NREC(leaf, hdr, idx), + hdr->cls->nrec_size * (leaf->nrec - idx)); } /* end else */ /* Make callback to store record in native form */ @@ -479,8 +479,8 @@ H5B2__update_leaf(H5B2_hdr_t *hdr, H5B2_node_ptr_t *curr_node_ptr, H5B2_update_s /* Make room for new record */ if (idx < leaf->nrec) - HDmemmove(H5B2_LEAF_NREC(leaf, hdr, idx + 1), H5B2_LEAF_NREC(leaf, hdr, idx), - hdr->cls->nrec_size * (leaf->nrec - idx)); + memmove(H5B2_LEAF_NREC(leaf, hdr, idx + 1), H5B2_LEAF_NREC(leaf, hdr, idx), + hdr->cls->nrec_size * (leaf->nrec - idx)); } /* end if */ } /* end else */ @@ -801,8 +801,8 @@ H5B2__remove_leaf(H5B2_hdr_t *hdr, H5B2_node_ptr_t *curr_node_ptr, H5B2_nodepos_ /* Pack record out of leaf */ if (idx < leaf->nrec) - HDmemmove(H5B2_LEAF_NREC(leaf, hdr, idx), H5B2_LEAF_NREC(leaf, hdr, (idx + 1)), - hdr->cls->nrec_size * (leaf->nrec - idx)); + memmove(H5B2_LEAF_NREC(leaf, hdr, idx), H5B2_LEAF_NREC(leaf, hdr, (idx + 1)), + hdr->cls->nrec_size * (leaf->nrec - idx)); /* Mark leaf node as dirty also */ leaf_flags |= H5AC__DIRTIED_FLAG; @@ -899,8 +899,8 @@ H5B2__remove_leaf_by_idx(H5B2_hdr_t *hdr, H5B2_node_ptr_t *curr_node_ptr, H5B2_n /* Pack record out of leaf */ if (idx < leaf->nrec) - HDmemmove(H5B2_LEAF_NREC(leaf, hdr, idx), H5B2_LEAF_NREC(leaf, hdr, (idx + 1)), - hdr->cls->nrec_size * (leaf->nrec - idx)); + memmove(H5B2_LEAF_NREC(leaf, hdr, idx), H5B2_LEAF_NREC(leaf, hdr, (idx + 1)), + hdr->cls->nrec_size * (leaf->nrec - idx)); /* Mark leaf node as dirty also */ leaf_flags |= H5AC__DIRTIED_FLAG; diff --git a/src/H5Bcache.c b/src/H5Bcache.c index 692b1ce..ada63ae 100644 --- a/src/H5Bcache.c +++ b/src/H5Bcache.c @@ -138,7 +138,7 @@ H5B__cache_deserialize(const void *_image, size_t len, void *_udata, hbool_t H5_ /* Allocate the B-tree node in memory */ if (NULL == (bt = H5FL_MALLOC(H5B_t))) HGOTO_ERROR(H5E_BTREE, H5E_CANTALLOC, NULL, "can't allocate B-tree struct") - HDmemset(&bt->cache_info, 0, sizeof(H5AC_info_t)); + memset(&bt->cache_info, 0, sizeof(H5AC_info_t)); /* Set & increment the ref-counted "shared" B-tree information for the node */ bt->rc_shared = udata->rc_shared; @@ -158,7 +158,7 @@ H5B__cache_deserialize(const void *_image, size_t len, void *_udata, hbool_t H5_ /* Magic number */ if (H5_IS_BUFFER_OVERFLOW(image, H5_SIZEOF_MAGIC, p_end)) HGOTO_ERROR(H5E_BTREE, H5E_OVERFLOW, NULL, "ran off end of input buffer while decoding"); - if (HDmemcmp(image, H5B_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) + if (memcmp(image, H5B_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) HGOTO_ERROR(H5E_BTREE, H5E_BADVALUE, NULL, "wrong B-tree signature") image += H5_SIZEOF_MAGIC; @@ -325,7 +325,7 @@ H5B__cache_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_UNUSED len, vo assert((size_t)(image - (uint8_t *)_image) <= len); /* Clear rest of node */ - HDmemset(image, 0, len - (size_t)(image - (uint8_t *)_image)); + memset(image, 0, len - (size_t)(image - (uint8_t *)_image)); done: FUNC_LEAVE_NOAPI(ret_value) @@ -302,7 +302,7 @@ H5C_create(size_t max_cache_size, size_t min_clean_size, int max_type_id, cache_ptr->epoch_marker_ringbuf_size = 0; /* Initialize all epoch marker entries' fields to zero/FALSE/NULL */ - HDmemset(cache_ptr->epoch_markers, 0, sizeof(cache_ptr->epoch_markers)); + memset(cache_ptr->epoch_markers, 0, sizeof(cache_ptr->epoch_markers)); /* Set non-zero/FALSE/NULL fields for epoch markers */ for (i = 0; i < H5C__MAX_EPOCH_MARKERS; i++) { @@ -248,7 +248,7 @@ H5CS_copy_stack(void) /* Copy pointers on old stack to new one */ /* (Strings don't need to be duplicated, they are statically allocated) */ - HDmemcpy(new_stack->rec, old_stack->rec, sizeof(char *) * old_stack->nused); + memcpy(new_stack->rec, old_stack->rec, sizeof(char *) * old_stack->nused); new_stack->nused = new_stack->nalloc = old_stack->nused; /* Set the return value */ @@ -488,7 +488,7 @@ H5CX_init(void) FUNC_ENTER_NOAPI(FAIL) /* Reset the "default DXPL cache" information */ - HDmemset(&H5CX_def_dxpl_cache, 0, sizeof(H5CX_dxpl_cache_t)); + memset(&H5CX_def_dxpl_cache, 0, sizeof(H5CX_dxpl_cache_t)); /* Get the default DXPL cache information */ @@ -585,7 +585,7 @@ H5CX_init(void) HGOTO_ERROR(H5E_CONTEXT, H5E_CANTGET, FAIL, "Can't retrieve modify write buffer property") /* Reset the "default LCPL cache" information */ - HDmemset(&H5CX_def_lcpl_cache, 0, sizeof(H5CX_lcpl_cache_t)); + memset(&H5CX_def_lcpl_cache, 0, sizeof(H5CX_lcpl_cache_t)); /* Get the default LCPL cache information */ @@ -602,7 +602,7 @@ H5CX_init(void) HGOTO_ERROR(H5E_CONTEXT, H5E_CANTGET, FAIL, "Can't retrieve intermediate group creation flag") /* Reset the "default LAPL cache" information */ - HDmemset(&H5CX_def_lapl_cache, 0, sizeof(H5CX_lapl_cache_t)); + memset(&H5CX_def_lapl_cache, 0, sizeof(H5CX_lapl_cache_t)); /* Get the default LAPL cache information */ @@ -615,7 +615,7 @@ H5CX_init(void) HGOTO_ERROR(H5E_CONTEXT, H5E_CANTGET, FAIL, "Can't retrieve number of soft / UD links to traverse") /* Reset the "default DCPL cache" information */ - HDmemset(&H5CX_def_dcpl_cache, 0, sizeof(H5CX_dcpl_cache_t)); + memset(&H5CX_def_dcpl_cache, 0, sizeof(H5CX_dcpl_cache_t)); /* Get the default DCPL cache information */ @@ -632,7 +632,7 @@ H5CX_init(void) HGOTO_ERROR(H5E_CONTEXT, H5E_CANTGET, FAIL, "Can't retrieve object header flags") /* Reset the "default DAPL cache" information */ - HDmemset(&H5CX_def_dapl_cache, 0, sizeof(H5CX_dapl_cache_t)); + memset(&H5CX_def_dapl_cache, 0, sizeof(H5CX_dapl_cache_t)); /* Get the default DAPL cache information */ @@ -649,7 +649,7 @@ H5CX_init(void) HGOTO_ERROR(H5E_CONTEXT, H5E_CANTGET, FAIL, "Can't retrieve prefix for VDS") /* Reset the "default FAPL cache" information */ - HDmemset(&H5CX_def_fapl_cache, 0, sizeof(H5CX_fapl_cache_t)); + memset(&H5CX_def_fapl_cache, 0, sizeof(H5CX_fapl_cache_t)); /* Get the default FAPL cache information */ @@ -1629,7 +1629,7 @@ H5CX_get_vol_connector_prop(H5VL_connector_prop_t *vol_connector_prop) /* Get the value */ H5MM_memcpy(vol_connector_prop, &(*head)->ctx.vol_connector_prop, sizeof(H5VL_connector_prop_t)); else - HDmemset(vol_connector_prop, 0, sizeof(H5VL_connector_prop_t)); + memset(vol_connector_prop, 0, sizeof(H5VL_connector_prop_t)); FUNC_LEAVE_NOAPI(ret_value) } /* end H5CX_get_vol_connector_prop() */ diff --git a/src/H5Centry.c b/src/H5Centry.c index 994487e..b1f02b2 100644 --- a/src/H5Centry.c +++ b/src/H5Centry.c @@ -374,8 +374,8 @@ H5C__generate_image(H5F_t *f, H5C_t *cache_ptr, H5C_cache_entry_t *entry_ptr) HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to serialize entry") #if H5C_DO_MEMORY_SANITY_CHECKS - assert(0 == HDmemcmp(((uint8_t *)entry_ptr->image_ptr) + entry_ptr->size, H5C_IMAGE_SANITY_VALUE, - H5C_IMAGE_EXTRA_SPACE)); + assert(0 == memcmp(((uint8_t *)entry_ptr->image_ptr) + entry_ptr->size, H5C_IMAGE_SANITY_VALUE, + H5C_IMAGE_EXTRA_SPACE)); #endif /* H5C_DO_MEMORY_SANITY_CHECKS */ entry_ptr->image_up_to_date = TRUE; @@ -1076,7 +1076,7 @@ H5C__load_entry(H5F_t *f, #ifdef H5_HAVE_PARALLEL if (coll_access) { /* Push an error, but still participate in following MPI_Bcast */ - HDmemset(image, 0, len); + memset(image, 0, len); HDONE_ERROR(H5E_CACHE, H5E_READERROR, NULL, "Can't read image*") } else @@ -1134,7 +1134,7 @@ H5C__load_entry(H5F_t *f, #ifdef H5_HAVE_PARALLEL if (coll_access) { /* Push an error, but still participate in following MPI_Bcast */ - HDmemset(image + len, 0, actual_len - len); + memset(image + len, 0, actual_len - len); HDONE_ERROR(H5E_CACHE, H5E_CANTLOAD, NULL, "can't read image") } else @@ -3954,8 +3954,8 @@ H5C_destroy_flush_dependency(void *parent_thing, void *child_thing) /* Remove parent entry from child's parent array */ if (u < (child_entry->flush_dep_nparents - 1)) - HDmemmove(&child_entry->flush_dep_parent[u], &child_entry->flush_dep_parent[u + 1], - (child_entry->flush_dep_nparents - u - 1) * sizeof(child_entry->flush_dep_parent[0])); + memmove(&child_entry->flush_dep_parent[u], &child_entry->flush_dep_parent[u + 1], + (child_entry->flush_dep_nparents - u - 1) * sizeof(child_entry->flush_dep_parent[0])); child_entry->flush_dep_nparents--; /* Adjust parent entry's nchildren and unpin parent if it goes to zero */ diff --git a/src/H5Cimage.c b/src/H5Cimage.c index f8eef6b..0bdd9b9 100644 --- a/src/H5Cimage.c +++ b/src/H5Cimage.c @@ -351,8 +351,8 @@ H5C__construct_cache_image_buffer(H5F_t *f, H5C_t *cache_ptr) assert(cache_ptr->image_entries[u].image_ptr); assert(fake_cache_ptr->image_entries[u].image_ptr); - assert(!HDmemcmp(cache_ptr->image_entries[u].image_ptr, - fake_cache_ptr->image_entries[u].image_ptr, cache_ptr->image_entries[u].size)); + assert(!memcmp(cache_ptr->image_entries[u].image_ptr, fake_cache_ptr->image_entries[u].image_ptr, + cache_ptr->image_entries[u].size)); fake_cache_ptr->image_entries[u].image_ptr = H5MM_xfree(fake_cache_ptr->image_entries[u].image_ptr); @@ -1286,7 +1286,7 @@ H5C__decode_cache_image_header(const H5F_t *f, H5C_t *cache_ptr, const uint8_t * p = *buf; /* Check signature */ - if (HDmemcmp(p, H5C__MDCI_BLOCK_SIGNATURE, (size_t)H5C__MDCI_BLOCK_SIGNATURE_LEN) != 0) + if (memcmp(p, H5C__MDCI_BLOCK_SIGNATURE, (size_t)H5C__MDCI_BLOCK_SIGNATURE_LEN) != 0) HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, FAIL, "Bad metadata cache image header signature") p += H5C__MDCI_BLOCK_SIGNATURE_LEN; diff --git a/src/H5Clog_json.c b/src/H5Clog_json.c index 44eaa93..64aa0a4 100644 --- a/src/H5Clog_json.c +++ b/src/H5Clog_json.c @@ -171,7 +171,7 @@ H5C__json_write_log_message(H5C_log_json_udata_t *json_udata) n_chars = HDstrlen(json_udata->message); if ((int)n_chars != fprintf(json_udata->outfile, "%s", json_udata->message)) HGOTO_ERROR(H5E_CACHE, H5E_LOGGING, FAIL, "error writing log message") - HDmemset((void *)(json_udata->message), 0, (size_t)(n_chars * sizeof(char))); + memset((void *)(json_udata->message), 0, (size_t)(n_chars * sizeof(char))); done: FUNC_LEAVE_NOAPI(ret_value) diff --git a/src/H5Clog_trace.c b/src/H5Clog_trace.c index 5889d1d..4d8e6a8 100644 --- a/src/H5Clog_trace.c +++ b/src/H5Clog_trace.c @@ -166,7 +166,7 @@ H5C__trace_write_log_message(H5C_log_trace_udata_t *trace_udata) n_chars = HDstrlen(trace_udata->message); if ((int)n_chars != fprintf(trace_udata->outfile, "%s", trace_udata->message)) HGOTO_ERROR(H5E_CACHE, H5E_LOGGING, FAIL, "error writing log message") - HDmemset((void *)(trace_udata->message), 0, (size_t)(n_chars * sizeof(char))); + memset((void *)(trace_udata->message), 0, (size_t)(n_chars * sizeof(char))); done: FUNC_LEAVE_NOAPI(ret_value) diff --git a/src/H5Cmpio.c b/src/H5Cmpio.c index d423c9e..d5fa05d 100644 --- a/src/H5Cmpio.c +++ b/src/H5Cmpio.c @@ -186,13 +186,13 @@ H5C_apply_candidate_list(H5F_t *f, H5C_t *cache_ptr, unsigned num_candidates, ha assert(mpi_rank < mpi_size); /* Initialize the entries_to_flush and entries_to_clear arrays */ - HDmemset(entries_to_flush, 0, sizeof(entries_to_flush)); - HDmemset(entries_to_clear, 0, sizeof(entries_to_clear)); + memset(entries_to_flush, 0, sizeof(entries_to_flush)); + memset(entries_to_clear, 0, sizeof(entries_to_clear)); #if H5C_APPLY_CANDIDATE_LIST__DEBUG fprintf(stdout, "%s:%d: setting up candidate assignment table.\n", __func__, mpi_rank); - HDmemset(tbl_buf, 0, sizeof(tbl_buf)); + memset(tbl_buf, 0, sizeof(tbl_buf)); HDsnprintf(tbl_buf, sizeof(tbl_buf), "candidate list = "); for (u = 0; u < num_candidates; u++) diff --git a/src/H5Dbtree.c b/src/H5Dbtree.c index d29fcca..b82fdf7 100644 --- a/src/H5Dbtree.c +++ b/src/H5Dbtree.c @@ -1028,7 +1028,7 @@ H5D__btree_idx_iterate(const H5D_chk_idx_info_t *idx_info, H5D_chunk_cb_func_t c assert(chunk_udata); /* Initialize userdata */ - HDmemset(&udata, 0, sizeof udata); + memset(&udata, 0, sizeof udata); udata.common.layout = idx_info->layout; udata.common.storage = idx_info->storage; udata.cb = chunk_cb; @@ -1114,7 +1114,7 @@ H5D__btree_idx_delete(const H5D_chk_idx_info_t *idx_info) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't create wrapper for shared B-tree info") /* Set up B-tree user data */ - HDmemset(&udata, 0, sizeof udata); + memset(&udata, 0, sizeof udata); udata.layout = idx_info->layout; udata.storage = &tmp_storage; @@ -1234,7 +1234,7 @@ H5D__btree_idx_size(const H5D_chk_idx_info_t *idx_info, hsize_t *index_size) assert(index_size); /* Initialize B-tree node user-data */ - HDmemset(&udata, 0, sizeof udata); + memset(&udata, 0, sizeof udata); udata.layout = idx_info->layout; udata.storage = idx_info->storage; @@ -1350,11 +1350,11 @@ H5D_btree_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth, un FUNC_ENTER_NOAPI(FAIL) /* Reset "fake" storage info */ - HDmemset(&storage, 0, sizeof(storage)); + memset(&storage, 0, sizeof(storage)); storage.idx_type = H5D_CHUNK_IDX_BTREE; /* Reset "fake" layout info */ - HDmemset(&layout, 0, sizeof(layout)); + memset(&layout, 0, sizeof(layout)); layout.ndims = ndims; for (u = 0; u < ndims; u++) layout.dim[u] = dim[u]; diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c index 00639fd..a9f649e 100644 --- a/src/H5Dchunk.c +++ b/src/H5Dchunk.c @@ -1604,7 +1604,7 @@ H5D__create_piece_file_map_all(H5D_dset_io_info_t *di, H5D_io_info_t *io_info) /* Set initial chunk location, partial dimensions, etc */ num_partial_dims = 0; - HDmemset(zeros, 0, sizeof(zeros)); + memset(zeros, 0, sizeof(zeros)); for (u = 0; u < fm->f_ndims; u++) { /* Validate this chunk dimension */ if (di->layout->u.chunk.dim[u] == 0) @@ -2771,7 +2771,7 @@ H5D__chunk_read(H5D_io_info_t *io_info, H5D_dset_io_info_t *dset_info) /* Set up contiguous I/O info object */ H5MM_memcpy(&ctg_io_info, io_info, sizeof(ctg_io_info)); - HDmemcpy(&ctg_dset_info, dset_info, sizeof(ctg_dset_info)); + memcpy(&ctg_dset_info, dset_info, sizeof(ctg_dset_info)); ctg_dset_info.store = &ctg_store; ctg_dset_info.layout_ops = *H5D_LOPS_CONTIG; ctg_io_info.dsets_info = &ctg_dset_info; @@ -2783,7 +2783,7 @@ H5D__chunk_read(H5D_io_info_t *io_info, H5D_dset_io_info_t *dset_info) /* Set up compact I/O info object */ H5MM_memcpy(&cpt_io_info, io_info, sizeof(cpt_io_info)); - HDmemcpy(&cpt_dset_info, dset_info, sizeof(cpt_dset_info)); + memcpy(&cpt_dset_info, dset_info, sizeof(cpt_dset_info)); cpt_dset_info.store = &cpt_store; cpt_dset_info.layout_ops = *H5D_LOPS_COMPACT; cpt_io_info.dsets_info = &cpt_dset_info; @@ -2930,7 +2930,7 @@ H5D__chunk_write(H5D_io_info_t *io_info, H5D_dset_io_info_t *dset_info) /* Set up contiguous I/O info object */ H5MM_memcpy(&ctg_io_info, io_info, sizeof(ctg_io_info)); - HDmemcpy(&ctg_dset_info, dset_info, sizeof(ctg_dset_info)); + memcpy(&ctg_dset_info, dset_info, sizeof(ctg_dset_info)); ctg_dset_info.store = &ctg_store; ctg_dset_info.layout_ops = *H5D_LOPS_CONTIG; ctg_io_info.dsets_info = &ctg_dset_info; @@ -2942,7 +2942,7 @@ H5D__chunk_write(H5D_io_info_t *io_info, H5D_dset_io_info_t *dset_info) /* Set up compact I/O info object */ H5MM_memcpy(&cpt_io_info, io_info, sizeof(cpt_io_info)); - HDmemcpy(&cpt_dset_info, dset_info, sizeof(cpt_dset_info)); + memcpy(&cpt_dset_info, dset_info, sizeof(cpt_dset_info)); cpt_dset_info.store = &cpt_store; cpt_dset_info.layout_ops = *H5D_LOPS_COMPACT; cpt_io_info.dsets_info = &cpt_dset_info; @@ -3422,7 +3422,7 @@ H5D__chunk_dest(H5D_t *dset) /* Release cache structures */ if (rdcc->slot) rdcc->slot = H5FL_SEQ_FREE(H5D_rdcc_ent_ptr_t, rdcc->slot); - HDmemset(rdcc, 0, sizeof(H5D_rdcc_t)); + memset(rdcc, 0, sizeof(H5D_rdcc_t)); /* Compose chunked index info struct */ idx_info.f = dset->oloc.file; @@ -4398,7 +4398,7 @@ H5D__chunk_lock(const H5D_io_info_t H5_ATTR_NDEBUG_UNUSED *io_info, const H5D_ds /* In the case that some dataset functions look through this data, * clear it to all 0s. */ - HDmemset(chunk, 0, chunk_size); + memset(chunk, 0, chunk_size); } /* end if */ else { /* @@ -4490,7 +4490,7 @@ H5D__chunk_lock(const H5D_io_info_t H5_ATTR_NDEBUG_UNUSED *io_info, const H5D_ds HGOTO_ERROR(H5E_DATASET, H5E_CANTCONVERT, NULL, "can't refill fill value buffer") } /* end if */ else - HDmemset(chunk, 0, chunk_size); + memset(chunk, 0, chunk_size); /* Increment # of creations */ rdcc->stats.ninits++; @@ -4650,7 +4650,7 @@ H5D__chunk_unlock(const H5D_io_info_t H5_ATTR_NDEBUG_UNUSED *io_info, const H5D_ if (dirty) { H5D_rdcc_ent_t fake_ent; /* "fake" chunk cache entry */ - HDmemset(&fake_ent, 0, sizeof(fake_ent)); + memset(&fake_ent, 0, sizeof(fake_ent)); fake_ent.dirty = TRUE; if (is_unfiltered_edge_chunk) fake_ent.edge_chunk_state = H5D_RDCC_DISABLE_FILTERS; @@ -4992,7 +4992,7 @@ H5D__chunk_allocate(const H5D_t *dset, hbool_t full_overwrite, const hsize_t old continue; else { /* Reset the chunk offset indices */ - HDmemset(scaled, 0, (space_ndims * sizeof(scaled[0]))); + memset(scaled, 0, (space_ndims * sizeof(scaled[0]))); scaled[op_dim] = min_unalloc[op_dim]; if (has_unfilt_edge_chunks) { @@ -5356,7 +5356,7 @@ H5D__chunk_update_old_edge_chunks(H5D_t *dset, hsize_t old_dim[]) assert(max_edge_chunk_sc[op_dim] == old_edge_chunk_sc[op_dim]); /* Reset the chunk offset indices */ - HDmemset(chunk_sc, 0, (space_ndims * sizeof(chunk_sc[0]))); + memset(chunk_sc, 0, (space_ndims * sizeof(chunk_sc[0]))); chunk_sc[op_dim] = old_edge_chunk_sc[op_dim]; carry = FALSE; @@ -5985,7 +5985,7 @@ H5D__chunk_prune_by_extent(H5D_t *dset, const hsize_t *old_dim) /* Reset hyperslab start array */ /* (hyperslabs will always start from origin) */ - HDmemset(hyper_start, 0, sizeof(hyper_start)); + memset(hyper_start, 0, sizeof(hyper_start)); /* Set up chunked I/O info object, for operations on chunks (in callback) * Note that we only need to set scaled once, as the array's address @@ -6007,7 +6007,7 @@ H5D__chunk_prune_by_extent(H5D_t *dset, const hsize_t *old_dim) idx_info.storage = &dset->shared->layout.storage.u.chunk; /* Initialize the user data for the iteration */ - HDmemset(&udata, 0, sizeof udata); + memset(&udata, 0, sizeof udata); udata.common.layout = &layout->u.chunk; udata.common.storage = sc; udata.common.scaled = scaled; @@ -6032,8 +6032,8 @@ H5D__chunk_prune_by_extent(H5D_t *dset, const hsize_t *old_dim) /* * Determine the chunks which need to be filled or removed */ - HDmemset(min_mod_chunk_sc, 0, sizeof(min_mod_chunk_sc)); - HDmemset(max_mod_chunk_sc, 0, sizeof(max_mod_chunk_sc)); + memset(min_mod_chunk_sc, 0, sizeof(min_mod_chunk_sc)); + memset(max_mod_chunk_sc, 0, sizeof(max_mod_chunk_sc)); for (op_dim = 0; op_dim < (unsigned)space_ndims; op_dim++) { /* Validate this chunk dimension */ if (chunk_dim[op_dim] == 0) @@ -6099,7 +6099,7 @@ H5D__chunk_prune_by_extent(H5D_t *dset, const hsize_t *old_dim) assert(max_mod_chunk_sc[op_dim] >= min_mod_chunk_sc[op_dim]); /* Reset the chunk offset indices */ - HDmemset(scaled, 0, (space_ndims * sizeof(scaled[0]))); + memset(scaled, 0, (space_ndims * sizeof(scaled[0]))); scaled[op_dim] = min_mod_chunk_sc[op_dim]; /* Initialize "dims_outside_fill" array */ @@ -6302,7 +6302,7 @@ H5D__chunk_addrmap(const H5D_t *dset, haddr_t chunk_addr[]) assert(chunk_addr); /* Set up user data for B-tree callback */ - HDmemset(&udata, 0, sizeof(udata)); + memset(&udata, 0, sizeof(udata)); udata.common.layout = &dset->shared->layout.u.chunk; udata.common.storage = sc; udata.chunk_addr = chunk_addr; @@ -6360,7 +6360,7 @@ H5D__chunk_delete(H5F_t *f, H5O_t *oh, H5O_storage_t *storage) pline_read = TRUE; } /* end else if */ else - HDmemset(&pline, 0, sizeof(pline)); + memset(&pline, 0, sizeof(pline)); /* Retrieve dataset layout message */ if ((exists = H5O_msg_exists_oh(oh, H5O_LAYOUT_ID)) < 0) @@ -6425,7 +6425,7 @@ H5D__chunk_update_cache(H5D_t *dset) assert((dset->shared->layout.u.chunk.ndims - 1) > 1); /* Add temporary entry list to rdcc */ - (void)HDmemset(&tmp_head, 0, sizeof(tmp_head)); + (void)memset(&tmp_head, 0, sizeof(tmp_head)); rdcc->tmp_head = &tmp_head; tmp_tail = &tmp_head; @@ -6580,7 +6580,7 @@ H5D__chunk_copy_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata) "memory allocation failed for raw data chunk") udata->bkg = new_buf; if (!udata->cpy_info->expand_ref) - HDmemset((uint8_t *)udata->bkg + buf_size, 0, (size_t)(nbytes - buf_size)); + memset((uint8_t *)udata->bkg + buf_size, 0, (size_t)(nbytes - buf_size)); bkg = udata->bkg; } /* end if */ @@ -6669,7 +6669,7 @@ H5D__chunk_copy_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata) H5MM_memcpy(reclaim_buf, buf, reclaim_buf_size); /* Set background buffer to all zeros */ - HDmemset(bkg, 0, buf_size); + memset(bkg, 0, buf_size); /* Convert from memory to destination file */ if (H5T_convert(tpath_mem_dst, tid_mem, tid_dst, udata->nelmts, (size_t)0, (size_t)0, buf, bkg) < 0) @@ -6803,7 +6803,7 @@ H5D__chunk_copy(H5F_t *f_src, H5O_storage_chunk_t *storage_src, H5O_layout_chunk /* Initialize the temporary pipeline info */ if (NULL == pline_src) { - HDmemset(&_pline, 0, sizeof(_pline)); + memset(&_pline, 0, sizeof(_pline)); pline = &_pline; } /* end if */ else @@ -6940,7 +6940,7 @@ H5D__chunk_copy(H5F_t *f_src, H5O_storage_chunk_t *storage_src, H5O_layout_chunk /* Check for reference datatype and no expanding references & clear background buffer */ if (!cpy_info->expand_ref && ((H5T_get_class(dt_src, FALSE) == H5T_REFERENCE) && (f_src != f_dst))) /* Reset value to zero */ - HDmemset(bkg, 0, buf_size); + memset(bkg, 0, buf_size); } /* end if */ /* Allocate memory for copying the chunk */ @@ -6948,7 +6948,7 @@ H5D__chunk_copy(H5F_t *f_src, H5O_storage_chunk_t *storage_src, H5O_layout_chunk HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for raw data chunk") /* Initialize the callback structure for the source */ - HDmemset(&udata, 0, sizeof udata); + memset(&udata, 0, sizeof udata); udata.common.layout = layout_src; udata.common.storage = storage_src; udata.file_src = f_src; @@ -7070,7 +7070,7 @@ H5D__chunk_bh_info(const H5O_loc_t *loc, H5O_t *oh, H5O_layout_t *layout, hsize_ pline_read = TRUE; } /* end else if */ else - HDmemset(&pline, 0, sizeof(pline)); + memset(&pline, 0, sizeof(pline)); /* Compose chunked index info struct */ idx_info.f = loc->file; @@ -8216,7 +8216,7 @@ H5D__chunk_get_offset_copy(const H5D_t *dset, const hsize_t *offset, hsize_t *of * So transfer the offset array to an internal offset array that we * can properly terminate (handled via the memset call). */ - HDmemset(offset_copy, 0, H5O_LAYOUT_NDIMS * sizeof(hsize_t)); + memset(offset_copy, 0, H5O_LAYOUT_NDIMS * sizeof(hsize_t)); for (u = 0; u < dset->shared->ndims; u++) { /* Make sure the offset doesn't exceed the dataset's dimensions */ diff --git a/src/H5Dcompact.c b/src/H5Dcompact.c index c255f7e..aec476a 100644 --- a/src/H5Dcompact.c +++ b/src/H5Dcompact.c @@ -590,7 +590,7 @@ H5D__compact_copy(H5F_t *f_src, H5O_storage_compact_t *_storage_src, H5F_t *f_ds H5MM_memcpy(reclaim_buf, buf, buf_size); /* Set background buffer to all zeros */ - HDmemset(bkg, 0, buf_size); + memset(bkg, 0, buf_size); /* Convert from memory to destination file */ if (H5T_convert(tpath_mem_dst, tid_mem, tid_dst, nelmts, (size_t)0, (size_t)0, buf, bkg) < 0) @@ -613,7 +613,7 @@ H5D__compact_copy(H5F_t *f_src, H5O_storage_compact_t *_storage_src, H5F_t *f_ds } /* end if */ else /* Reset value to zero */ - HDmemset(storage_dst->buf, 0, storage_src->size); + memset(storage_dst->buf, 0, storage_src->size); } /* end if */ else /* Type conversion not necessary */ diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c index 36ce31b..90d25d4 100644 --- a/src/H5Dcontig.c +++ b/src/H5Dcontig.c @@ -1267,7 +1267,7 @@ H5D__contig_writevv_sieve_cb(hsize_t dst_off, hsize_t src_off, size_t len, void /* Clear memory */ if (dset_contig->sieve_size > len) - HDmemset(dset_contig->sieve_buf + len, 0, (dset_contig->sieve_size - len)); + memset(dset_contig->sieve_buf + len, 0, (dset_contig->sieve_size - len)); /* Determine the new sieve buffer size & location */ dset_contig->sieve_loc = addr; @@ -1352,8 +1352,8 @@ H5D__contig_writevv_sieve_cb(hsize_t dst_off, hsize_t src_off, size_t len, void /* Prepend to existing sieve buffer */ if ((addr + len) == sieve_start) { /* Move existing sieve information to correct location */ - HDmemmove(dset_contig->sieve_buf + len, dset_contig->sieve_buf, - dset_contig->sieve_size); + memmove(dset_contig->sieve_buf + len, dset_contig->sieve_buf, + dset_contig->sieve_size); /* Copy in new information (must be first in sieve buffer) */ H5MM_memcpy(dset_contig->sieve_buf, buf, len); @@ -1798,7 +1798,7 @@ H5D__contig_copy(H5F_t *f_src, const H5O_storage_contig_t *storage_src, H5F_t *f H5MM_memcpy(reclaim_buf, buf, mem_nbytes); /* Set background buffer to all zeros */ - HDmemset(bkg, 0, buf_size); + memset(bkg, 0, buf_size); /* Convert from memory to destination file */ if (H5T_convert(tpath_mem_dst, tid_mem, tid_dst, nelmts, (size_t)0, (size_t)0, buf, bkg) < 0) @@ -1820,7 +1820,7 @@ H5D__contig_copy(H5F_t *f_src, const H5O_storage_contig_t *storage_src, H5F_t *f } /* end if */ else /* Reset value to zero */ - HDmemset(buf, 0, src_nbytes); + memset(buf, 0, src_nbytes); } /* end if */ /* Write raw data to destination file */ diff --git a/src/H5Dearray.c b/src/H5Dearray.c index 61796a7..22c1306 100644 --- a/src/H5Dearray.c +++ b/src/H5Dearray.c @@ -1242,10 +1242,10 @@ H5D__earray_idx_iterate(const H5D_chk_idx_info_t *idx_info, H5D_chunk_cb_func_t H5D_earray_it_ud_t udata; /* User data for iteration callback */ /* Initialize userdata */ - HDmemset(&udata, 0, sizeof udata); + memset(&udata, 0, sizeof udata); udata.common.layout = idx_info->layout; udata.common.storage = idx_info->storage; - HDmemset(&udata.chunk_rec, 0, sizeof(udata.chunk_rec)); + memset(&udata.chunk_rec, 0, sizeof(udata.chunk_rec)); udata.filtered = (idx_info->pline->nused > 0); if (!udata.filtered) { udata.chunk_rec.nbytes = idx_info->layout->size; diff --git a/src/H5Defl.c b/src/H5Defl.c index 2d19d91..aea37a4 100644 --- a/src/H5Defl.c +++ b/src/H5Defl.c @@ -272,7 +272,7 @@ H5D__efl_read(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t size if ((n = HDread(fd, buf, to_read)) < 0) HGOTO_ERROR(H5E_EFL, H5E_READERROR, FAIL, "read error in external raw data file") else if ((size_t)n < to_read) - HDmemset(buf + n, 0, to_read - (size_t)n); + memset(buf + n, 0, to_read - (size_t)n); full_name = (char *)H5MM_xfree(full_name); HDclose(fd); fd = -1; diff --git a/src/H5Dfarray.c b/src/H5Dfarray.c index 811ba24..7e44dbd 100644 --- a/src/H5Dfarray.c +++ b/src/H5Dfarray.c @@ -1122,10 +1122,10 @@ H5D__farray_idx_iterate(const H5D_chk_idx_info_t *idx_info, H5D_chunk_cb_func_t H5D_farray_it_ud_t udata; /* User data for iteration callback */ /* Initialize userdata */ - HDmemset(&udata, 0, sizeof udata); + memset(&udata, 0, sizeof udata); udata.common.layout = idx_info->layout; udata.common.storage = idx_info->storage; - HDmemset(&udata.chunk_rec, 0, sizeof(udata.chunk_rec)); + memset(&udata.chunk_rec, 0, sizeof(udata.chunk_rec)); udata.filtered = (idx_info->pline->nused > 0); if (!udata.filtered) { udata.chunk_rec.nbytes = idx_info->layout->size; diff --git a/src/H5Dfill.c b/src/H5Dfill.c index 0a82412..84095c9 100644 --- a/src/H5Dfill.c +++ b/src/H5Dfill.c @@ -313,7 +313,7 @@ H5D__fill_init(H5D_fill_buf_info_t *fb_info, void *caller_fill_buf, H5MM_allocat assert(dset_type_id > 0); /* Reset fill buffer information */ - HDmemset(fb_info, 0, sizeof(*fb_info)); + memset(fb_info, 0, sizeof(*fb_info)); /* Cache constant information from the dataset */ fb_info->fill = fill; @@ -451,13 +451,13 @@ H5D__fill_init(H5D_fill_buf_info_t *fb_info, void *caller_fill_buf, H5MM_allocat fb_info->fill_buf = caller_fill_buf; fb_info->use_caller_fill_buf = TRUE; - HDmemset(fb_info->fill_buf, 0, fb_info->fill_buf_size); + memset(fb_info->fill_buf, 0, fb_info->fill_buf_size); } /* end if */ else { if (alloc_func) { fb_info->fill_buf = alloc_func(fb_info->fill_buf_size, alloc_info); - HDmemset(fb_info->fill_buf, 0, fb_info->fill_buf_size); + memset(fb_info->fill_buf, 0, fb_info->fill_buf_size); } /* end if */ else { htri_t buf_avail = H5FL_BLK_AVAIL( @@ -512,7 +512,7 @@ H5D__fill_refill_vl(H5D_fill_buf_info_t *fb_info, size_t nelmts) /* Reset first element of background buffer, if necessary */ if (H5T_path_bkg(fb_info->fill_to_mem_tpath)) - HDmemset(fb_info->bkg_buf, 0, fb_info->max_elmt_size); + memset(fb_info->bkg_buf, 0, fb_info->max_elmt_size); /* Type convert the dataset buffer, to copy any VL components */ if (H5T_convert(fb_info->fill_to_mem_tpath, fb_info->file_tid, fb_info->mem_tid, (size_t)1, (size_t)0, @@ -526,7 +526,7 @@ H5D__fill_refill_vl(H5D_fill_buf_info_t *fb_info, size_t nelmts) /* Reset the entire background buffer, if necessary */ if (H5T_path_bkg(fb_info->mem_to_dset_tpath)) - HDmemset(fb_info->bkg_buf, 0, fb_info->bkg_buf_size); + memset(fb_info->bkg_buf, 0, fb_info->bkg_buf_size); /* Make a copy of the fill buffer so we can free dynamic elements after conversion */ if (fb_info->fill_alloc_func) diff --git a/src/H5Dint.c b/src/H5Dint.c index 92f0237..b839abf 100644 --- a/src/H5Dint.c +++ b/src/H5Dint.c @@ -167,7 +167,7 @@ H5D_init(void) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize interface") /* Reset the "default dataset" information */ - HDmemset(&H5D_def_dset, 0, sizeof(H5D_shared_t)); + memset(&H5D_def_dset, 0, sizeof(H5D_shared_t)); H5D_def_dset.type_id = H5I_INVALID_HID; H5D_def_dset.dapl_id = H5I_INVALID_HID; H5D_def_dset.dcpl_id = H5I_INVALID_HID; @@ -1599,7 +1599,7 @@ H5D__append_flush_setup(H5D_t *dset, hid_t dapl_id) assert(dset->shared); /* Set default append flush values */ - HDmemset(&dset->shared->append_flush, 0, sizeof(dset->shared->append_flush)); + memset(&dset->shared->append_flush, 0, sizeof(dset->shared->append_flush)); /* If the dataset is chunked and there is a non-default DAPL */ if (dapl_id != H5P_DATASET_ACCESS_DEFAULT && dset->shared->layout.type == H5D_CHUNKED) { @@ -2303,7 +2303,7 @@ H5D__alloc_storage(H5D_t *dset, H5D_time_alloc_t time_alloc, hbool_t full_overwr HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate memory for compact dataset") if (!full_overwrite) - HDmemset(layout->storage.u.compact.buf, 0, layout->storage.u.compact.size); + memset(layout->storage.u.compact.buf, 0, layout->storage.u.compact.size); layout->storage.u.compact.dirty = TRUE; /* Indicate that we should initialize storage space */ @@ -3573,7 +3573,7 @@ H5D_get_create_plist(const H5D_t *dset) switch (copied_layout.type) { case H5D_COMPACT: copied_layout.storage.u.compact.buf = H5MM_xfree(copied_layout.storage.u.compact.buf); - HDmemset(&copied_layout.storage.u.compact, 0, sizeof(copied_layout.storage.u.compact)); + memset(&copied_layout.storage.u.compact, 0, sizeof(copied_layout.storage.u.compact)); break; case H5D_CONTIGUOUS: diff --git a/src/H5Dio.c b/src/H5Dio.c index c79332b..e7bfee1 100644 --- a/src/H5Dio.c +++ b/src/H5Dio.c @@ -896,7 +896,7 @@ H5D__ioinfo_init(size_t count, H5D_io_op_type_t op_type, H5D_dset_io_info_t *dse assert(io_info); /* Zero out struct */ - HDmemset(io_info, 0, sizeof(*io_info)); + memset(io_info, 0, sizeof(*io_info)); /* Set up simple fields */ io_info->op_type = op_type; @@ -1024,7 +1024,7 @@ H5D__typeinfo_init(H5D_io_info_t *io_info, H5D_dset_io_info_t *dset_info, hid_t HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "can't patch VL datatype file pointer") /* Initialize type info safely */ - HDmemset(type_info, 0, sizeof(*type_info)); + memset(type_info, 0, sizeof(*type_info)); /* Get the memory & dataset datatypes */ if (NULL == (type_info->mem_type = (const H5T_t *)H5I_object_verify(mem_type_id, H5I_DATATYPE))) diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c index 4baa904..c52299f 100644 --- a/src/H5Dmpio.c +++ b/src/H5Dmpio.c @@ -117,7 +117,7 @@ */ #define H5D_MPIO_INIT_CHUNK_UD_INFO(chunk_ud, index_info_ptr) \ do { \ - HDmemset(&chunk_ud, 0, sizeof(H5D_chunk_ud_t)); \ + memset(&chunk_ud, 0, sizeof(H5D_chunk_ud_t)); \ chunk_ud.common.layout = (index_info_ptr)->layout; \ chunk_ud.common.storage = (index_info_ptr)->storage; \ } while (0) @@ -541,7 +541,7 @@ H5D__mpio_debug_init(void) assert(!H5D_mpio_debug_inited); /* Clear the debug flag buffer */ - HDmemset(H5D_mpio_debug_flags_s, 0, sizeof(H5D_mpio_debug_flags_s)); + memset(H5D_mpio_debug_flags_s, 0, sizeof(H5D_mpio_debug_flags_s)); /* Retrieve and parse the H5Dmpio debug string */ debug_str = HDgetenv("H5D_mpio_Debug"); @@ -3487,7 +3487,7 @@ H5D__mpio_redistribute_shared_chunks_int(H5D_filtered_collective_io_info_t *chun int new_chunk_owner; /* Clear the mapping from rank value -> number of assigned chunks */ - HDmemset(num_chunks_assigned_map, 0, (size_t)mpi_size * sizeof(*num_chunks_assigned_map)); + memset(num_chunks_assigned_map, 0, (size_t)mpi_size * sizeof(*num_chunks_assigned_map)); /* Sort collective chunk list according to chunk index */ qsort(coll_chunk_list, coll_chunk_list_num_entries, sizeof(H5D_chunk_redistribute_info_t), @@ -3838,7 +3838,7 @@ H5D__mpio_share_chunk_modification_data(H5D_filtered_collective_io_info_t *chunk mod_data_p = msg_send_bufs[num_send_requests]; /* Store the chunk's index into the buffer */ - HDmemcpy(mod_data_p, &chunk_entry->index_info.chunk_idx, sizeof(hsize_t)); + memcpy(mod_data_p, &chunk_entry->index_info.chunk_idx, sizeof(hsize_t)); mod_data_p += sizeof(hsize_t); /* Serialize the chunk's file dataspace into the buffer */ @@ -4691,7 +4691,7 @@ H5D__mpio_collective_filtered_chunk_update(H5D_filtered_collective_io_info_t *ch if (msg_ptr) { /* Retrieve the chunk's index value */ - HDmemcpy(&chunk_idx, msg_ptr, sizeof(hsize_t)); + memcpy(&chunk_idx, msg_ptr, sizeof(hsize_t)); msg_ptr += sizeof(hsize_t); /* Find the chunk entry according to its chunk index */ @@ -5153,8 +5153,8 @@ H5D__mpio_collective_filtered_chunk_reinsert(H5D_filtered_collective_io_info_t * */ for (size_t dbg_idx = 0; dbg_idx < chunk_list_num_entries; dbg_idx++) { if (coll_entry->index_info.chunk_idx == chunk_list[dbg_idx].index_info.chunk_idx) { - hbool_t coords_match = !HDmemcmp(scaled_coords, chunk_list[dbg_idx].chunk_info->scaled, - di->dset->shared->ndims * sizeof(hsize_t)); + hbool_t coords_match = !memcmp(scaled_coords, chunk_list[dbg_idx].chunk_info->scaled, + di->dset->shared->ndims * sizeof(hsize_t)); assert(coords_match && "Calculated scaled coordinates for chunk didn't match " "chunk's actual scaled coordinates!"); diff --git a/src/H5Dnone.c b/src/H5Dnone.c index f0cb3fd..3ade6ee 100644 --- a/src/H5Dnone.c +++ b/src/H5Dnone.c @@ -233,7 +233,7 @@ H5D__none_idx_iterate(const H5D_chk_idx_info_t *idx_info, H5D_chunk_cb_func_t ch assert(H5_addr_defined(idx_info->storage->idx_addr)); /* Initialize generic chunk record */ - HDmemset(&chunk_rec, 0, sizeof(chunk_rec)); + memset(&chunk_rec, 0, sizeof(chunk_rec)); chunk_rec.nbytes = idx_info->layout->size; chunk_rec.filter_mask = 0; diff --git a/src/H5Doh.c b/src/H5Doh.c index d26c365..0d6f08c 100644 --- a/src/H5Doh.c +++ b/src/H5Doh.c @@ -378,7 +378,7 @@ H5O__dset_bh_info(const H5O_loc_t *loc, H5O_t *oh, H5_ih_info_t *bh_info) if (exists && H5D__efl_is_space_alloc(&layout.storage)) { /* Start with clean EFL info */ - HDmemset(&efl, 0, sizeof(efl)); + memset(&efl, 0, sizeof(efl)); /* Get External File List message from the object header */ if (NULL == H5O_msg_read_oh(loc->file, oh, H5O_EFL_ID, &efl)) diff --git a/src/H5Dscatgath.c b/src/H5Dscatgath.c index 4742053..ffea8da 100644 --- a/src/H5Dscatgath.c +++ b/src/H5Dscatgath.c @@ -112,7 +112,7 @@ H5D__scatter_file(const H5D_io_info_t *_io_info, const H5D_dset_io_info_t *_dset /* Set up temporary I/O info object */ H5MM_memcpy(&tmp_io_info, _io_info, sizeof(*_io_info)); - HDmemcpy(&tmp_dset_info, _dset_info, sizeof(*_dset_info)); + memcpy(&tmp_dset_info, _dset_info, sizeof(*_dset_info)); tmp_io_info.op_type = H5D_IO_OP_WRITE; tmp_dset_info.buf.cvp = _buf; tmp_io_info.dsets_info = &tmp_dset_info; @@ -213,7 +213,7 @@ H5D__gather_file(const H5D_io_info_t *_io_info, const H5D_dset_io_info_t *_dset_ /* Set up temporary I/O info object */ H5MM_memcpy(&tmp_io_info, _io_info, sizeof(*_io_info)); - HDmemcpy(&tmp_dset_info, _dset_info, sizeof(*_dset_info)); + memcpy(&tmp_dset_info, _dset_info, sizeof(*_dset_info)); tmp_io_info.op_type = H5D_IO_OP_READ; tmp_dset_info.buf.vp = _buf; tmp_io_info.dsets_info = &tmp_dset_info; @@ -776,7 +776,7 @@ H5D__scatgath_read_select(H5D_io_info_t *io_info) /* Create block memory space */ if (NULL == (tmp_mem_spaces[i] = H5S_create_simple(1, &io_info->sel_pieces[i]->piece_points, NULL))) { - HDmemset(&tmp_mem_spaces[i], 0, (io_info->pieces_added - i) * sizeof(tmp_mem_spaces[0])); + memset(&tmp_mem_spaces[i], 0, (io_info->pieces_added - i) * sizeof(tmp_mem_spaces[0])); HGOTO_ERROR(H5E_DATASET, H5E_CANTCREATE, FAIL, "unable to create simple memory dataspace") } @@ -1369,7 +1369,7 @@ H5D__compound_opt_read(size_t nelmts, H5S_sel_iter_t *iter, const H5D_type_info_ /* Copy the data into the right place. */ for (i = 0; i < curr_nelmts; i++) { - HDmemmove(xubuf, xdbuf, copy_size); + memmove(xubuf, xdbuf, copy_size); /* Update pointers */ xdbuf += src_stride; @@ -1442,7 +1442,7 @@ H5D__compound_opt_write(size_t nelmts, const H5D_type_info_t *type_info, uint8_t xsbuf = tconv_buf; xdbuf = tconv_buf; for (i = 0; i < nelmts; i++) { - HDmemmove(xdbuf, xsbuf, dst_stride); + memmove(xdbuf, xsbuf, dst_stride); /* Update pointers */ xsbuf += src_stride; diff --git a/src/H5Dsingle.c b/src/H5Dsingle.c index a4caebc..12c776d 100644 --- a/src/H5Dsingle.c +++ b/src/H5Dsingle.c @@ -298,7 +298,7 @@ H5D__single_idx_iterate(const H5D_chk_idx_info_t *idx_info, H5D_chunk_cb_func_t assert(H5_addr_defined(idx_info->storage->idx_addr)); /* Initialize generic chunk record */ - HDmemset(&chunk_rec, 0, sizeof(chunk_rec)); + memset(&chunk_rec, 0, sizeof(chunk_rec)); chunk_rec.chunk_addr = idx_info->storage->idx_addr; if (idx_info->layout->flags & H5O_LAYOUT_CHUNK_SINGLE_INDEX_WITH_FILTER) { diff --git a/src/H5Dvirtual.c b/src/H5Dvirtual.c index 3711bcd..ad7e7e2 100644 --- a/src/H5Dvirtual.c +++ b/src/H5Dvirtual.c @@ -735,7 +735,7 @@ H5D__virtual_reset_layout(H5O_layout_t *layout) virt->list = H5MM_xfree(virt->list); virt->list_nalloc = (size_t)0; virt->list_nused = (size_t)0; - (void)HDmemset(virt->min_dims, 0, sizeof(virt->min_dims)); + (void)memset(virt->min_dims, 0, sizeof(virt->min_dims)); /* Close access property lists */ if (virt->source_fapl >= 0) { @@ -1548,9 +1548,9 @@ H5D__virtual_set_extent_unlim(const H5D_t *dset) storage->list[i].sub_dset = tmp_sub_dset; /* Clear new space in sub_dset */ - (void)HDmemset(&storage->list[i].sub_dset[storage->list[i].sub_dset_nalloc], 0, - storage->list[i].sub_dset_nalloc * - sizeof(H5O_storage_virtual_srcdset_t)); + (void)memset(&storage->list[i].sub_dset[storage->list[i].sub_dset_nalloc], 0, + storage->list[i].sub_dset_nalloc * + sizeof(H5O_storage_virtual_srcdset_t)); /* Update sub_dset_nalloc */ storage->list[i].sub_dset_nalloc *= 2; @@ -2016,9 +2016,9 @@ H5D__virtual_init_all(const H5D_t *dset) storage->list[i].sub_dset = tmp_sub_dset; /* Clear new space in sub_dset */ - (void)HDmemset(&storage->list[i].sub_dset[storage->list[i].sub_dset_nalloc], 0, - (sub_dset_max - storage->list[i].sub_dset_nalloc) * - sizeof(H5O_storage_virtual_srcdset_t)); + (void)memset(&storage->list[i].sub_dset[storage->list[i].sub_dset_nalloc], 0, + (sub_dset_max - storage->list[i].sub_dset_nalloc) * + sizeof(H5O_storage_virtual_srcdset_t)); /* Update sub_dset_nalloc */ storage->list[i].sub_dset_nalloc = sub_dset_max; @@ -2457,7 +2457,7 @@ H5D__virtual_pre_io(H5D_dset_io_info_t *dset_info, H5O_storage_virtual_t *storag HGOTO_ERROR(H5E_DATASET, H5E_CANTCOPY, FAIL, "unable to copy virtual selection") /* Clip virtual selection to real virtual extent */ - (void)HDmemset(start, 0, sizeof(start)); + (void)memset(start, 0, sizeof(start)); if (H5S_select_hyperslab(storage->list[i].sub_dset[j].clipped_virtual_select, H5S_SELECT_AND, start, NULL, tmp_dims, NULL) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTSELECT, FAIL, "unable to clip hyperslab") diff --git a/src/H5EAcache.c b/src/H5EAcache.c index 485f3c7..bcbfd37 100644 --- a/src/H5EAcache.c +++ b/src/H5EAcache.c @@ -303,7 +303,7 @@ H5EA__cache_hdr_deserialize(const void *_image, size_t len, void *_udata, hbool_ hdr->addr = udata->addr; /* Magic number */ - if (HDmemcmp(image, H5EA_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) + if (memcmp(image, H5EA_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) HGOTO_ERROR(H5E_EARRAY, H5E_BADVALUE, NULL, "wrong extensible array header signature") image += H5_SIZEOF_MAGIC; @@ -611,7 +611,7 @@ H5EA__cache_iblock_get_initial_load_size(void *_udata, size_t *image_len) assert(image_len); /* Set up fake index block for computing size on disk */ - HDmemset(&iblock, 0, sizeof(iblock)); + memset(&iblock, 0, sizeof(iblock)); iblock.hdr = (H5EA_hdr_t *)hdr; iblock.nsblks = H5EA_SBLK_FIRST_IDX(hdr->cparam.sup_blk_min_data_ptrs); iblock.ndblk_addrs = 2 * ((size_t)hdr->cparam.sup_blk_min_data_ptrs - 1); @@ -692,7 +692,7 @@ H5EA__cache_iblock_deserialize(const void *_image, size_t len, void *_udata, hbo iblock->addr = hdr->idx_blk_addr; /* Magic number */ - if (HDmemcmp(image, H5EA_IBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) + if (memcmp(image, H5EA_IBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) HGOTO_ERROR(H5E_EARRAY, H5E_BADVALUE, NULL, "wrong extensible array index block signature") image += H5_SIZEOF_MAGIC; @@ -996,7 +996,7 @@ H5EA__cache_sblock_get_initial_load_size(void *_udata, size_t *image_len) /* Set up fake super block for computing size on disk */ /* (Note: extracted from H5EA__sblock_alloc) */ - HDmemset(&sblock, 0, sizeof(sblock)); + memset(&sblock, 0, sizeof(sblock)); sblock.hdr = udata->hdr; sblock.ndblks = udata->hdr->sblk_info[udata->sblk_idx].ndblks; sblock.dblk_nelmts = udata->hdr->sblk_info[udata->sblk_idx].dblk_nelmts; @@ -1095,7 +1095,7 @@ H5EA__cache_sblock_deserialize(const void *_image, size_t len, void *_udata, hbo sblock->addr = udata->sblk_addr; /* Magic number */ - if (HDmemcmp(image, H5EA_SBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) + if (memcmp(image, H5EA_SBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) HGOTO_ERROR(H5E_EARRAY, H5E_BADVALUE, NULL, "wrong extensible array super block signature") image += H5_SIZEOF_MAGIC; @@ -1400,7 +1400,7 @@ H5EA__cache_dblock_get_initial_load_size(void *_udata, size_t *image_len) /* Set up fake data block for computing size on disk */ /* (Note: extracted from H5EA__dblock_alloc) */ - HDmemset(&dblock, 0, sizeof(dblock)); + memset(&dblock, 0, sizeof(dblock)); /* need to set: * @@ -1504,7 +1504,7 @@ H5EA__cache_dblock_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED dblock->addr = udata->dblk_addr; /* Magic number */ - if (HDmemcmp(image, H5EA_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) + if (memcmp(image, H5EA_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) HGOTO_ERROR(H5E_EARRAY, H5E_BADVALUE, NULL, "wrong extensible array data block signature") image += H5_SIZEOF_MAGIC; diff --git a/src/H5EAhdr.c b/src/H5EAhdr.c index b591ad5..41ff397 100644 --- a/src/H5EAhdr.c +++ b/src/H5EAhdr.c @@ -255,8 +255,8 @@ H5EA__hdr_alloc_elmts(H5EA_hdr_t *hdr, size_t nelmts) "memory allocation failed for data block data element buffer factory array") /* Zero out new elements allocated */ - HDmemset(new_fac + hdr->elmt_fac.nalloc, 0, - (new_nalloc - hdr->elmt_fac.nalloc) * sizeof(H5FL_fac_head_ptr_t)); + memset(new_fac + hdr->elmt_fac.nalloc, 0, + (new_nalloc - hdr->elmt_fac.nalloc) * sizeof(H5FL_fac_head_ptr_t)); /* Update information about element factories in header */ hdr->elmt_fac.nalloc = new_nalloc; diff --git a/src/H5Eint.c b/src/H5Eint.c index a739e98..b2d731e 100644 --- a/src/H5Eint.c +++ b/src/H5Eint.c @@ -414,7 +414,7 @@ H5E__print(const H5E_t *estack, FILE *stream, hbool_t bk_compatible) eprint.stream = stream; /* Reset the original error class information */ - HDmemset(&eprint.cls, 0, sizeof(H5E_cls_t)); + memset(&eprint.cls, 0, sizeof(H5E_cls_t)); /* Walk the error stack */ if (bk_compatible) { diff --git a/src/H5FAcache.c b/src/H5FAcache.c index 0b1aeba..490a296 100644 --- a/src/H5FAcache.c +++ b/src/H5FAcache.c @@ -248,7 +248,7 @@ H5FA__cache_hdr_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED len hdr->addr = udata->addr; /* Magic number */ - if (HDmemcmp(image, H5FA_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) + if (memcmp(image, H5FA_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) HGOTO_ERROR(H5E_FARRAY, H5E_BADVALUE, NULL, "wrong fixed array header signature") image += H5_SIZEOF_MAGIC; @@ -537,7 +537,7 @@ H5FA__cache_dblock_get_initial_load_size(void *_udata, size_t *image_len) /* Set up fake data block for computing size on disk */ /* (Note: extracted from H5FA__dblock_alloc) */ - HDmemset(&dblock, 0, sizeof(dblock)); + memset(&dblock, 0, sizeof(dblock)); /* Set up fake data block for computing size on disk * @@ -632,7 +632,7 @@ H5FA__cache_dblock_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED dblock->addr = udata->dblk_addr; /* Magic number */ - if (HDmemcmp(image, H5FA_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) + if (memcmp(image, H5FA_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) HGOTO_ERROR(H5E_FARRAY, H5E_BADVALUE, NULL, "wrong fixed array data block signature") image += H5_SIZEOF_MAGIC; diff --git a/src/H5FDcore.c b/src/H5FDcore.c index be4de62..0e07350 100644 --- a/src/H5FDcore.c +++ b/src/H5FDcore.c @@ -533,7 +533,7 @@ H5Pset_core_write_tracking(hid_t plist_id, hbool_t is_enabled, size_t page_size) old_fa = H5FD__core_get_default_config(); /* Set VFD info values */ - HDmemset(&fa, 0, sizeof(H5FD_core_fapl_t)); + memset(&fa, 0, sizeof(H5FD_core_fapl_t)); fa.increment = old_fa->increment; fa.backing_store = old_fa->backing_store; fa.write_tracking = is_enabled; @@ -611,7 +611,7 @@ H5Pset_fapl_core(hid_t fapl_id, size_t increment, hbool_t backing_store) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list") /* Set VFD info values */ - HDmemset(&fa, 0, sizeof(H5FD_core_fapl_t)); + memset(&fa, 0, sizeof(H5FD_core_fapl_t)); fa.increment = increment; fa.backing_store = backing_store; fa.write_tracking = H5FD_CORE_WRITE_TRACKING_FLAG; @@ -752,7 +752,7 @@ H5FD__core_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr /* If the file image exists and this is an open, make sure the file doesn't exist */ assert(((file_image_info.buffer != NULL) && (file_image_info.size > 0)) || ((file_image_info.buffer == NULL) && (file_image_info.size == 0))); - HDmemset(&sb, 0, sizeof(sb)); + memset(&sb, 0, sizeof(sb)); if ((file_image_info.buffer != NULL) && !(H5F_ACC_CREAT & flags)) { if (HDopen(name, o_flags, H5_POSIX_CREATE_MODE_RW) >= 0) HGOTO_ERROR(H5E_FILE, H5E_FILEEXISTS, NULL, "file already exists") @@ -1000,7 +1000,7 @@ H5FD__core_close(H5FD_t *_file) else H5MM_xfree(file->mem); } /* end if */ - HDmemset(file, 0, sizeof(H5FD_core_t)); + memset(file, 0, sizeof(H5FD_core_t)); H5MM_xfree(file); done: @@ -1059,9 +1059,9 @@ H5FD__core_cmp(const H5FD_t *_f1, const H5FD_t *_f2) * determine if the values are the same or not. The actual return value * shouldn't really matter... */ - if (HDmemcmp(&(f1->device), &(f2->device), sizeof(dev_t)) < 0) + if (memcmp(&(f1->device), &(f2->device), sizeof(dev_t)) < 0) HGOTO_DONE(-1) - if (HDmemcmp(&(f1->device), &(f2->device), sizeof(dev_t)) > 0) + if (memcmp(&(f1->device), &(f2->device), sizeof(dev_t)) > 0) HGOTO_DONE(1) #endif /* H5_DEV_T_IS_SCALAR */ @@ -1312,7 +1312,7 @@ H5FD__core_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNU /* Read zeros for the part which is after the EOF markers */ if (size > 0) - HDmemset(buf, 0, size); + memset(buf, 0, size); done: FUNC_LEAVE_NOAPI(ret_value) @@ -1374,7 +1374,7 @@ H5FD__core_write(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UN "unable to allocate memory block of %llu bytes", (unsigned long long)new_eof) } /* end else */ - HDmemset(x + file->eof, 0, (size_t)(new_eof - file->eof)); + memset(x + file->eof, 0, (size_t)(new_eof - file->eof)); file->mem = x; file->eof = new_eof; @@ -1532,7 +1532,7 @@ H5FD__core_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t closing } /* end else */ if (file->eof < new_eof) - HDmemset(x + file->eof, 0, (size_t)(new_eof - file->eof)); + memset(x + file->eof, 0, (size_t)(new_eof - file->eof)); file->mem = x; /* Update backing store, if using it and if closing */ diff --git a/src/H5FDdirect.c b/src/H5FDdirect.c index 771d31a..cdb0c5d 100644 --- a/src/H5FDdirect.c +++ b/src/H5FDdirect.c @@ -336,7 +336,7 @@ H5FD__direct_populate_config(size_t boundary, size_t block_size, size_t cbuf_siz assert(fa_out); - HDmemset(fa_out, 0, sizeof(H5FD_direct_fapl_t)); + memset(fa_out, 0, sizeof(H5FD_direct_fapl_t)); if (boundary != 0) fa_out->mboundary = boundary; @@ -655,9 +655,9 @@ H5FD__direct_cmp(const H5FD_t *_f1, const H5FD_t *_f2) * determine if the values are the same or not. The actual return value * shouldn't really matter... */ - if (HDmemcmp(&(f1->device), &(f2->device), sizeof(dev_t)) < 0) + if (memcmp(&(f1->device), &(f2->device), sizeof(dev_t)) < 0) HGOTO_DONE(-1) - if (HDmemcmp(&(f1->device), &(f2->device), sizeof(dev_t)) > 0) + if (memcmp(&(f1->device), &(f2->device), sizeof(dev_t)) > 0) HGOTO_DONE(1) #endif /* H5_DEV_T_IS_SCALAR */ @@ -873,7 +873,7 @@ H5FD__direct_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_U HSYS_GOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file read failed") if (0 == nbytes) { /* end of file but not end of format address space */ - HDmemset(buf, 0, size); + memset(buf, 0, size); break; } assert(nbytes >= 0); @@ -915,7 +915,7 @@ H5FD__direct_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_U * system calls and partial results like sec2 driver does because the * data may no longer be aligned. It's especially true when the data in * file is smaller than ALLOC_SIZE. */ - HDmemset(copy_buf, 0, alloc_size); + memset(copy_buf, 0, alloc_size); /* Calculate how much data we have to read in this iteration * (including unused parts of blocks) */ @@ -1099,7 +1099,7 @@ H5FD__direct_write(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_ * both ends are misaligned, otherwise only read the block on the * misaligned end. */ - HDmemset(copy_buf, 0, _fbsize); + memset(copy_buf, 0, _fbsize); if (copy_offset > 0) { if ((write_addr + write_size) > (addr + size)) { diff --git a/src/H5FDint.c b/src/H5FDint.c index c419cc0..892feac 100644 --- a/src/H5FDint.c +++ b/src/H5FDint.c @@ -178,7 +178,7 @@ H5FD_locate_signature(H5FD_t *file, haddr_t *sig_addr) HGOTO_ERROR(H5E_IO, H5E_CANTINIT, FAIL, "unable to set EOA value for file signature") if (H5FD_read(file, H5FD_MEM_SUPER, addr, (size_t)H5F_SIGNATURE_LEN, buf) < 0) HGOTO_ERROR(H5E_IO, H5E_CANTINIT, FAIL, "unable to read file signature") - if (!HDmemcmp(buf, H5F_SIGNATURE, (size_t)H5F_SIGNATURE_LEN)) + if (!memcmp(buf, H5F_SIGNATURE, (size_t)H5F_SIGNATURE_LEN)) break; } diff --git a/src/H5FDlog.c b/src/H5FDlog.c index 5523592..7ef21e1 100644 --- a/src/H5FDlog.c +++ b/src/H5FDlog.c @@ -304,7 +304,7 @@ H5Pset_fapl_log(hid_t fapl_id, const char *logfile, unsigned long long flags, si /* Do this first, so that we don't try to free a wild pointer if * H5P_object_verify() fails. */ - HDmemset(&fa, 0, sizeof(H5FD_log_fapl_t)); + memset(&fa, 0, sizeof(H5FD_log_fapl_t)); /* Check arguments */ if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS))) @@ -830,9 +830,9 @@ H5FD__log_cmp(const H5FD_t *_f1, const H5FD_t *_f2) * determine if the values are the same or not. The actual return value * shouldn't really matter... */ - if (HDmemcmp(&(f1->device), &(f2->device), sizeof(dev_t)) < 0) + if (memcmp(&(f1->device), &(f2->device), sizeof(dev_t)) < 0) HGOTO_DONE(-1) - if (HDmemcmp(&(f1->device), &(f2->device), sizeof(dev_t)) > 0) + if (memcmp(&(f1->device), &(f2->device), sizeof(dev_t)) > 0) HGOTO_DONE(1) #endif /* H5_DEV_T_IS_SCALAR */ @@ -916,7 +916,7 @@ H5FD__log_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, hs if (file->fa.flags & H5FD_LOG_FLAVOR) { assert(addr < file->iosize); H5_CHECK_OVERFLOW(size, hsize_t, size_t); - HDmemset(&file->flavor[addr], (int)type, (size_t)size); + memset(&file->flavor[addr], (int)type, (size_t)size); } if (file->fa.flags & H5FD_LOG_ALLOC) @@ -952,7 +952,7 @@ H5FD__log_free(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, had if (file->fa.flags & H5FD_LOG_FLAVOR) { assert(addr < file->iosize); H5_CHECK_OVERFLOW(size, hsize_t, size_t); - HDmemset(&file->flavor[addr], H5FD_MEM_DEFAULT, (size_t)size); + memset(&file->flavor[addr], H5FD_MEM_DEFAULT, (size_t)size); } /* Log the file memory freed */ @@ -1013,7 +1013,7 @@ H5FD__log_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr) if (file->fa.flags & H5FD_LOG_FLAVOR) { assert(addr < file->iosize); H5_CHECK_OVERFLOW(size, hsize_t, size_t); - HDmemset(&file->flavor[file->eoa], (int)type, (size_t)size); + memset(&file->flavor[file->eoa], (int)type, (size_t)size); } /* Log the extension like an allocation */ @@ -1031,7 +1031,7 @@ H5FD__log_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr) if (file->fa.flags & H5FD_LOG_FLAVOR) { assert((addr + size) < file->iosize); H5_CHECK_OVERFLOW(size, hsize_t, size_t); - HDmemset(&file->flavor[addr], H5FD_MEM_DEFAULT, (size_t)size); + memset(&file->flavor[addr], H5FD_MEM_DEFAULT, (size_t)size); } /* Log the shrink like a free */ @@ -1246,7 +1246,7 @@ H5FD__log_read(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, had if (0 == bytes_read) { /* End of file but not end of format address space */ - HDmemset(buf, 0, size); + memset(buf, 0, size); break; } @@ -1494,7 +1494,7 @@ H5FD__log_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, ha * algorithm */ if (file->fa.flags & H5FD_LOG_FLAVOR) { if ((H5FD_mem_t)file->flavor[orig_addr] == H5FD_MEM_DEFAULT) { - HDmemset(&file->flavor[orig_addr], (int)type, orig_size); + memset(&file->flavor[orig_addr], (int)type, orig_size); fprintf(file->logfp, " (fresh)"); } } diff --git a/src/H5FDmirror.c b/src/H5FDmirror.c index 1be6442..68f663e 100644 --- a/src/H5FDmirror.c +++ b/src/H5FDmirror.c @@ -818,7 +818,7 @@ H5FD_mirror_xmit_encode_open(unsigned char *dest, const H5FD_mirror_xmit_open_t assert(dest && x); /* clear entire structure, but especially its filepath string area */ - HDmemset(dest, 0, H5FD_MIRROR_XMIT_OPEN_SIZE); + memset(dest, 0, H5FD_MIRROR_XMIT_OPEN_SIZE); n_writ += H5FD_mirror_xmit_encode_header(dest, (const H5FD_mirror_xmit_t *)&(x->pub)); n_writ += H5FD__mirror_xmit_encode_uint32(&dest[n_writ], x->flags); @@ -855,7 +855,7 @@ H5FD_mirror_xmit_encode_reply(unsigned char *dest, const H5FD_mirror_xmit_reply_ assert(dest && x); /* clear entire structure, but especially its message string area */ - HDmemset(dest, 0, H5FD_MIRROR_XMIT_REPLY_SIZE); + memset(dest, 0, H5FD_MIRROR_XMIT_REPLY_SIZE); n_writ += H5FD_mirror_xmit_encode_header(dest, (const H5FD_mirror_xmit_t *)&(x->pub)); n_writ += H5FD__mirror_xmit_encode_uint32(&dest[n_writ], x->status); @@ -1385,7 +1385,7 @@ H5FD__mirror_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxad target_addr.sin_family = AF_INET; target_addr.sin_port = htons((uint16_t)fa.handshake_port); target_addr.sin_addr.s_addr = inet_addr(fa.remote_ip); - HDmemset(target_addr.sin_zero, '\0', sizeof target_addr.sin_zero); + memset(target_addr.sin_zero, '\0', sizeof target_addr.sin_zero); addr_size = sizeof(target_addr); if (connect(live_socket, (struct sockaddr *)&target_addr, addr_size) < 0) diff --git a/src/H5FDmpi.c b/src/H5FDmpi.c index 9f24c95..d2c0416 100644 --- a/src/H5FDmpi.c +++ b/src/H5FDmpi.c @@ -273,7 +273,7 @@ H5FD_mpio_wait_for_left_neighbor(H5FD_t *_file) assert(H5FD_MPIO == file->pub.driver_id); /* Portably initialize MPI status variable */ - HDmemset(&rcvstat, 0, sizeof(MPI_Status)); + memset(&rcvstat, 0, sizeof(MPI_Status)); /* p0 has no left neighbor; all other procs wait for msg */ if (file->mpi_rank != 0) { diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c index be74a17..47f6ae5 100644 --- a/src/H5FDmpio.c +++ b/src/H5FDmpio.c @@ -285,7 +285,7 @@ H5FD_mpio_init(void) #ifdef H5FDmpio_DEBUG /* Clear the flag buffer */ - HDmemset(H5FD_mpio_debug_flags_s, 0, sizeof(H5FD_mpio_debug_flags_s)); + memset(H5FD_mpio_debug_flags_s, 0, sizeof(H5FD_mpio_debug_flags_s)); /* Retrieve MPI-IO debugging environment variable */ s = HDgetenv("H5FD_mpio_Debug"); @@ -1236,7 +1236,7 @@ H5FD__mpio_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNU assert(buf); /* Portably initialize MPI status variable */ - HDmemset(&mpi_stat, 0, sizeof(MPI_Status)); + memset(&mpi_stat, 0, sizeof(MPI_Status)); /* some numeric conversions */ if (H5FD_mpi_haddr_to_MPIOff(addr, &mpi_off /*out*/) < 0) @@ -1430,7 +1430,7 @@ H5FD__mpio_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNU * This gives us zeroes beyond end of physical MPI file. */ if ((n = (io_size - bytes_read)) > 0) - HDmemset((char *)buf + bytes_read, 0, (size_t)n); + memset((char *)buf + bytes_read, 0, (size_t)n); done: if (derived_type) @@ -1506,7 +1506,7 @@ H5FD__mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, h assert(!H5CX_get_mpi_file_flushing()); /* Portably initialize MPI status variable */ - HDmemset(&mpi_stat, 0, sizeof(MPI_Status)); + memset(&mpi_stat, 0, sizeof(MPI_Status)); /* some numeric conversions */ if (H5FD_mpi_haddr_to_MPIOff(addr, &mpi_off) < 0) @@ -2132,7 +2132,7 @@ H5FD__mpio_read_vector(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, uint32_t cou } /* Portably initialize MPI status variable */ - HDmemset(&mpi_stat, 0, sizeof(mpi_stat)); + memset(&mpi_stat, 0, sizeof(mpi_stat)); #ifdef H5FDmpio_DEBUG if (H5FD_mpio_debug_r_flag) @@ -2264,7 +2264,7 @@ H5FD__mpio_read_vector(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, uint32_t cou #endif assert(bytes_read >= 0); - HDmemset((char *)s_bufs[i] + bytes_read, 0, (size_t)io_size); + memset((char *)s_bufs[i] + bytes_read, 0, (size_t)io_size); n -= io_size; i--; @@ -2331,7 +2331,7 @@ H5FD__mpio_read_vector(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, uint32_t cou /* Check if we actually need to do I/O */ if (addrs[i] < max_addr) { /* Portably initialize MPI status variable */ - HDmemset(&mpi_stat, 0, sizeof(mpi_stat)); + memset(&mpi_stat, 0, sizeof(mpi_stat)); /* Issue read */ if (MPI_SUCCESS != @@ -2364,13 +2364,13 @@ H5FD__mpio_read_vector(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, uint32_t cou * addresses. */ if ((n = (io_size - bytes_read)) > 0) { - HDmemset((char *)bufs[i] + bytes_read, 0, (size_t)n); + memset((char *)bufs[i] + bytes_read, 0, (size_t)n); max_addr = addrs[i] + (haddr_t)bytes_read; } } else { /* Read is past the max address, fill in zeroes */ - HDmemset((char *)bufs[i], 0, size); + memset((char *)bufs[i], 0, size); } } } @@ -2538,7 +2538,7 @@ H5FD__mpio_write_vector(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, uint32_t co } /* Portably initialize MPI status variable */ - HDmemset(&mpi_stat, 0, sizeof(MPI_Status)); + memset(&mpi_stat, 0, sizeof(MPI_Status)); #ifdef H5FDmpio_DEBUG if (H5FD_mpio_debug_w_flag) diff --git a/src/H5FDonion.c b/src/H5FDonion.c index ac46707..aec018d 100644 --- a/src/H5FDonion.c +++ b/src/H5FDonion.c @@ -295,7 +295,7 @@ H5Pget_fapl_onion(hid_t fapl_id, H5FD_onion_fapl_info_t *fa_out) if (NULL == (info_ptr = (const H5FD_onion_fapl_info_t *)H5P_peek_driver_info(plist))) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "bad VFL driver info") - HDmemcpy(fa_out, info_ptr, sizeof(H5FD_onion_fapl_info_t)); + memcpy(fa_out, info_ptr, sizeof(H5FD_onion_fapl_info_t)); done: FUNC_LEAVE_API(ret_value) @@ -514,7 +514,7 @@ H5FD__onion_commit_new_revision_record(H5FD_onion_t *file) if (NULL == (new_list = H5MM_calloc((history->n_revisions + 1) * sizeof(H5FD_onion_record_loc_t)))) HGOTO_ERROR(H5E_VFL, H5E_CANTALLOC, FAIL, "unable to resize record pointer list") - HDmemcpy(new_list, history->record_locs, sizeof(H5FD_onion_record_loc_t) * history->n_revisions); + memcpy(new_list, history->record_locs, sizeof(H5FD_onion_record_loc_t) * history->n_revisions); H5MM_xfree(history->record_locs); history->record_locs = new_list; new_list = NULL; @@ -979,7 +979,7 @@ H5FD__onion_open(const char *filename, unsigned flags, hid_t fapl_id, haddr_t ma /* Initialize file structure fields */ - HDmemcpy(&(file->fa), fa, sizeof(H5FD_onion_fapl_info_t)); + memcpy(&(file->fa), fa, sizeof(H5FD_onion_fapl_info_t)); file->header.version = H5FD_ONION_HEADER_VERSION_CURR; file->header.page_size = file->fa.page_size; /* guarded on FAPL-set */ @@ -1522,7 +1522,7 @@ H5FD__onion_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, if (H5FD_read(file->onion_file, H5FD_MEM_DRAW, entry_out->phys_addr, page_size, page_buf) < 0) HGOTO_ERROR(H5E_VFL, H5E_READERROR, FAIL, "can't get working file data") /* Overlay delta from input buffer onto page buffer. */ - HDmemcpy(page_buf + page_gap_head, buf, page_n_used); + memcpy(page_buf + page_gap_head, buf, page_n_used); write_buf = page_buf; } /* end if partial page */ @@ -1570,7 +1570,7 @@ H5FD__onion_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, /* Copy input buffer to temporary page buffer */ assert((page_size - page_gap_head) >= page_n_used); - HDmemcpy(page_buf + page_gap_head, buf, page_n_used); + memcpy(page_buf + page_gap_head, buf, page_n_used); write_buf = page_buf; } /* end if data range does not span entire page */ diff --git a/src/H5FDonion_header.c b/src/H5FDonion_header.c index 6feded4..b9ab88a 100644 --- a/src/H5FDonion_header.c +++ b/src/H5FDonion_header.c @@ -142,34 +142,34 @@ H5FD__onion_header_decode(unsigned char *buf, H5FD_onion_header_t *header) ptr = buf + 5; ui32 = 0; - HDmemcpy(&ui32, ptr, 3); + memcpy(&ui32, ptr, 3); ui8p = (uint8_t *)&ui32; UINT32DECODE(ui8p, header->flags); ptr += 3; - HDmemcpy(&ui32, ptr, 4); + memcpy(&ui32, ptr, 4); ui8p = (uint8_t *)&ui32; UINT32DECODE(ui8p, header->page_size); ptr += 4; - HDmemcpy(&ui64, ptr, 8); + memcpy(&ui64, ptr, 8); ui8p = (uint8_t *)&ui64; UINT32DECODE(ui8p, header->origin_eof); ptr += 8; - HDmemcpy(&ui64, ptr, 8); + memcpy(&ui64, ptr, 8); ui8p = (uint8_t *)&ui64; UINT32DECODE(ui8p, header->history_addr); ptr += 8; - HDmemcpy(&ui64, ptr, 8); + memcpy(&ui64, ptr, 8); ui8p = (uint8_t *)&ui64; UINT32DECODE(ui8p, header->history_size); ptr += 8; sum = H5_checksum_fletcher32(buf, (size_t)(ptr - buf)); - HDmemcpy(&ui32, ptr, 4); + memcpy(&ui32, ptr, 4); ui8p = (uint8_t *)&ui32; UINT32DECODE(ui8p, header->checksum); ptr += 4; @@ -214,9 +214,9 @@ H5FD__onion_header_encode(H5FD_onion_header_t *header, unsigned char *buf, uint3 assert(H5FD_ONION_HEADER_VERSION_CURR == header->version); assert(0 == (header->flags & 0xFF000000)); /* max three bits long */ - HDmemcpy(ptr, H5FD_ONION_HEADER_SIGNATURE, 4); + memcpy(ptr, H5FD_ONION_HEADER_SIGNATURE, 4); ptr += 4; - HDmemcpy(ptr, (unsigned char *)&header->version, 1); + memcpy(ptr, (unsigned char *)&header->version, 1); ptr += 1; UINT32ENCODE(ptr, header->flags); ptr -= 1; /* truncate to three bytes */ diff --git a/src/H5FDonion_history.c b/src/H5FDonion_history.c index 33a16ab..06a3e3b 100644 --- a/src/H5FDonion_history.c +++ b/src/H5FDonion_history.c @@ -180,7 +180,7 @@ H5FD__onion_history_decode(unsigned char *buf, H5FD_onion_history_t *history) ptr = buf + 8; - HDmemcpy(&ui64, ptr, 8); + memcpy(&ui64, ptr, 8); ui8p = (uint8_t *)&ui64; UINT64DECODE(ui8p, n_revisions); ptr += 8; @@ -207,19 +207,19 @@ H5FD__onion_history_decode(unsigned char *buf, H5FD_onion_history_t *history) uint64_t record_size; uint64_t phys_addr; - HDmemcpy(&ui64, ptr, 8); + memcpy(&ui64, ptr, 8); ui8p = (uint8_t *)&ui64; UINT64DECODE(ui8p, phys_addr); H5_CHECKED_ASSIGN(rloc->phys_addr, haddr_t, phys_addr, uint64_t); ptr += 8; - HDmemcpy(&ui64, ptr, 8); + memcpy(&ui64, ptr, 8); ui8p = (uint8_t *)&ui64; UINT64DECODE(ui8p, record_size); H5_CHECKED_ASSIGN(rloc->record_size, hsize_t, record_size, uint64_t); ptr += 8; - HDmemcpy(&ui32, ptr, 4); + memcpy(&ui32, ptr, 4); ui8p = (uint8_t *)&ui32; UINT32DECODE(ui8p, rloc->checksum); ptr += 4; @@ -228,7 +228,7 @@ H5FD__onion_history_decode(unsigned char *buf, H5FD_onion_history_t *history) sum = H5_checksum_fletcher32(buf, (size_t)(ptr - buf)); - HDmemcpy(&ui32, ptr, 4); + memcpy(&ui32, ptr, 4); ui8p = (uint8_t *)&ui32; UINT32DECODE(ui8p, history->checksum); ptr += 4; @@ -275,7 +275,7 @@ H5FD__onion_history_encode(H5FD_onion_history_t *history, unsigned char *buf, ui assert(buf != NULL); assert(checksum != NULL); - HDmemcpy(ptr, H5FD_ONION_HISTORY_SIGNATURE, 4); + memcpy(ptr, H5FD_ONION_HISTORY_SIGNATURE, 4); ptr += 4; UINT32ENCODE(ptr, vers_u32); UINT64ENCODE(ptr, history->n_revisions); diff --git a/src/H5FDonion_index.c b/src/H5FDonion_index.c index 6adf38c..69d1929 100644 --- a/src/H5FDonion_index.c +++ b/src/H5FDonion_index.c @@ -483,7 +483,7 @@ H5FD__onion_revision_index_insert(H5FD_onion_revision_index_t *rix, const H5FD_o if (entry->phys_addr != node->entry_data.phys_addr) { HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "physical address mismatch"); } - HDmemcpy(&node->entry_data, entry, sizeof(H5FD_onion_index_entry_t)); + memcpy(&node->entry_data, entry, sizeof(H5FD_onion_index_entry_t)); append_dest = NULL; /* Node updated, do not append */ break; } @@ -496,7 +496,7 @@ H5FD__onion_revision_index_insert(H5FD_onion_revision_index_t *rix, const H5FD_o HGOTO_ERROR(H5E_VFL, H5E_CANTALLOC, FAIL, "cannot allocate new ash chain node") node->version = H5FD_ONION_REVISION_INDEX_HASH_CHAIN_NODE_VERSION_CURR; node->next = NULL; - HDmemcpy(&node->entry_data, entry, sizeof(H5FD_onion_index_entry_t)); + memcpy(&node->entry_data, entry, sizeof(H5FD_onion_index_entry_t)); *append_dest = node; rix->n_entries++; } @@ -612,25 +612,25 @@ H5FD__onion_revision_record_decode(unsigned char *buf, H5FD_onion_revision_recor ptr = buf + 8; - HDmemcpy(&ui64, ptr, 8); + memcpy(&ui64, ptr, 8); ui8p = (uint8_t *)&ui64; UINT64DECODE(ui8p, record->revision_num); ptr += 8; - HDmemcpy(&ui64, ptr, 8); + memcpy(&ui64, ptr, 8); ui8p = (uint8_t *)&ui64; UINT64DECODE(ui8p, record->parent_revision_num); ptr += 8; - HDmemcpy(record->time_of_creation, ptr, 16); + memcpy(record->time_of_creation, ptr, 16); ptr += 16; - HDmemcpy(&ui64, ptr, 8); + memcpy(&ui64, ptr, 8); ui8p = (uint8_t *)&ui64; UINT64DECODE(ui8p, record->logical_eof); ptr += 8; - HDmemcpy(&ui32, ptr, 4); + memcpy(&ui32, ptr, 4); ui8p = (uint8_t *)&ui32; UINT32DECODE(ui8p, page_size); ptr += 4; @@ -645,12 +645,12 @@ H5FD__onion_revision_record_decode(unsigned char *buf, H5FD_onion_revision_recor record->archival_index.page_size_log2++) ; - HDmemcpy(&ui64, ptr, 8); + memcpy(&ui64, ptr, 8); ui8p = (uint8_t *)&ui64; UINT64DECODE(ui8p, n_entries); ptr += 8; - HDmemcpy(&ui32, ptr, 4); + memcpy(&ui32, ptr, 4); ui8p = (uint8_t *)&ui32; UINT32DECODE(ui8p, comment_size); ptr += 4; @@ -671,7 +671,7 @@ H5FD__onion_revision_record_decode(unsigned char *buf, H5FD_onion_revision_recor for (size_t i = 0; i < n_entries; i++) { entry = &record->archival_index.list[i]; - HDmemcpy(&ui64, ptr, 8); + memcpy(&ui64, ptr, 8); ui8p = (uint8_t *)&ui64; UINT64DECODE(ui8p, entry->logical_page); ptr += 8; @@ -682,12 +682,12 @@ H5FD__onion_revision_record_decode(unsigned char *buf, H5FD_onion_revision_recor entry->logical_page = entry->logical_page >> record->archival_index.page_size_log2; - HDmemcpy(&ui64, ptr, 8); + memcpy(&ui64, ptr, 8); ui8p = (uint8_t *)&ui64; UINT64DECODE(ui8p, entry->phys_addr); ptr += 8; - HDmemcpy(&ui32, ptr, 4); + memcpy(&ui32, ptr, 4); ui8p = (uint8_t *)&ui32; UINT32DECODE(ui8p, sum); ptr += 4; @@ -706,13 +706,13 @@ H5FD__onion_revision_record_decode(unsigned char *buf, H5FD_onion_revision_recor else { if (record->comment == NULL) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, 0, "no comment pointer") - HDmemcpy(record->comment, ptr, comment_size); + memcpy(record->comment, ptr, comment_size); } ptr += comment_size; sum = H5_checksum_fletcher32(buf, (size_t)(ptr - buf)); - HDmemcpy(&ui32, ptr, 4); + memcpy(&ui32, ptr, 4); ui8p = (uint8_t *)&ui32; UINT32DECODE(ui8p, record->checksum); ptr += 4; @@ -765,12 +765,12 @@ H5FD__onion_revision_record_encode(H5FD_onion_revision_record_t *record, unsigne page_size = (uint32_t)(1 << record->archival_index.page_size_log2); - HDmemcpy(ptr, H5FD_ONION_REVISION_RECORD_SIGNATURE, 4); + memcpy(ptr, H5FD_ONION_REVISION_RECORD_SIGNATURE, 4); ptr += 4; UINT32ENCODE(ptr, vers_u32); UINT64ENCODE(ptr, record->revision_num); UINT64ENCODE(ptr, record->parent_revision_num); - HDmemcpy(ptr, record->time_of_creation, 16); + memcpy(ptr, record->time_of_creation, 16); ptr += 16; UINT64ENCODE(ptr, record->logical_eof); UINT32ENCODE(ptr, page_size); @@ -798,7 +798,7 @@ H5FD__onion_revision_record_encode(H5FD_onion_revision_record_t *record, unsigne if (record->comment_size > 0) { assert(record->comment != NULL && *record->comment != '\0'); - HDmemcpy(ptr, record->comment, record->comment_size); + memcpy(ptr, record->comment, record->comment_size); ptr += record->comment_size; } @@ -876,7 +876,7 @@ H5FD__onion_merge_revision_index_into_archival_index(const H5FD_onion_revision_i const H5FD_onion_revision_index_hash_chain_node_t *node = NULL; for (node = rix->_hash_table[i]; node != NULL; node = node->next) { - HDmemcpy(&new_aix.list[new_aix.n_entries], &node->entry_data, sizeof(H5FD_onion_index_entry_t)); + memcpy(&new_aix.list[new_aix.n_entries], &node->entry_data, sizeof(H5FD_onion_index_entry_t)); new_aix.n_entries++; } } @@ -901,7 +901,7 @@ H5FD__onion_merge_revision_index_into_archival_index(const H5FD_onion_revision_i /* Add only if page not already added from revision index */ if (H5FD__onion_archival_index_find(&new_aix, aix->list[i].logical_page, &entry) == 0) { - HDmemcpy(&kept_list[n_kept], &aix->list[i], sizeof(H5FD_onion_index_entry_t)); + memcpy(&kept_list[n_kept], &aix->list[i], sizeof(H5FD_onion_index_entry_t)); n_kept++; } } @@ -914,12 +914,12 @@ H5FD__onion_merge_revision_index_into_archival_index(const H5FD_onion_revision_i HGOTO_ERROR(H5E_VFL, H5E_CANTALLOC, FAIL, "unable to allocate exact-size archival index list") /* Copy (new) revision list entries to replacement list */ - HDmemcpy(aix->list, new_aix.list, sizeof(H5FD_onion_index_entry_t) * new_aix.n_entries); + memcpy(aix->list, new_aix.list, sizeof(H5FD_onion_index_entry_t) * new_aix.n_entries); aix->n_entries = new_aix.n_entries; /* Copy (old) kept archival list entries to replacement list */ if (n_kept > 0) { - HDmemcpy(&aix->list[aix->n_entries], kept_list, sizeof(H5FD_onion_index_entry_t) * n_kept); + memcpy(&aix->list[aix->n_entries], kept_list, sizeof(H5FD_onion_index_entry_t) * n_kept); aix->n_entries += n_kept; } diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c index 7d49adb..cfc4f7e 100644 --- a/src/H5FDsec2.c +++ b/src/H5FDsec2.c @@ -477,9 +477,9 @@ H5FD__sec2_cmp(const H5FD_t *_f1, const H5FD_t *_f2) * determine if the values are the same or not. The actual return value * shouldn't really matter... */ - if (HDmemcmp(&(f1->device), &(f2->device), sizeof(dev_t)) < 0) + if (memcmp(&(f1->device), &(f2->device), sizeof(dev_t)) < 0) HGOTO_DONE(-1) - if (HDmemcmp(&(f1->device), &(f2->device), sizeof(dev_t)) > 0) + if (memcmp(&(f1->device), &(f2->device), sizeof(dev_t)) > 0) HGOTO_DONE(1) #endif /* H5_DEV_T_IS_SCALAR */ if (f1->inode < f2->inode) @@ -710,7 +710,7 @@ H5FD__sec2_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNU if (0 == bytes_read) { /* end of file but not end of format address space */ - HDmemset(buf, 0, size); + memset(buf, 0, size); break; } /* end if */ diff --git a/src/H5FDsplitter.c b/src/H5FDsplitter.c index c33f083..159a161 100644 --- a/src/H5FDsplitter.c +++ b/src/H5FDsplitter.c @@ -406,7 +406,7 @@ H5FD__splitter_populate_config(H5FD_splitter_vfd_config_t *vfd_config, H5FD_spli assert(fapl_out); - HDmemset(fapl_out, 0, sizeof(H5FD_splitter_fapl_t)); + memset(fapl_out, 0, sizeof(H5FD_splitter_fapl_t)); if (!vfd_config) { vfd_config = H5MM_calloc(sizeof(H5FD_splitter_vfd_config_t)); diff --git a/src/H5FDsubfiling/H5FDioc.c b/src/H5FDsubfiling/H5FDioc.c index 7baa334..81ad0e7 100644 --- a/src/H5FDsubfiling/H5FDioc.c +++ b/src/H5FDsubfiling/H5FDioc.c @@ -399,7 +399,7 @@ H5Pget_fapl_ioc(hid_t fapl_id, H5FD_ioc_config_t *config_out) } else { /* Copy the IOC fapl data out */ - HDmemcpy(config_out, config_ptr, sizeof(H5FD_ioc_config_t)); + memcpy(config_out, config_ptr, sizeof(H5FD_ioc_config_t)); } done: @@ -424,7 +424,7 @@ H5FD__ioc_get_default_config(H5FD_ioc_config_t *config_out) assert(config_out); - HDmemset(config_out, 0, sizeof(*config_out)); + memset(config_out, 0, sizeof(*config_out)); config_out->magic = H5FD_IOC_FAPL_MAGIC; config_out->version = H5FD_IOC_CURR_FAPL_VERSION; @@ -666,7 +666,7 @@ H5FD__ioc_fapl_copy(const void *_old_fa) if (NULL == new_fa_ptr) H5_SUBFILING_GOTO_ERROR(H5E_VFL, H5E_CANTALLOC, NULL, "unable to allocate log file FAPL"); - HDmemcpy(new_fa_ptr, old_fa_ptr, sizeof(H5FD_ioc_config_t)); + memcpy(new_fa_ptr, old_fa_ptr, sizeof(H5FD_ioc_config_t)); ret_value = (void *)new_fa_ptr; @@ -790,7 +790,7 @@ H5FD__ioc_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr) } /* Fill in the file config values */ - HDmemcpy(&file_ptr->fa, config_ptr, sizeof(H5FD_ioc_config_t)); + memcpy(&file_ptr->fa, config_ptr, sizeof(H5FD_ioc_config_t)); /* Fully resolve the given filepath and get its dirname */ if (H5_resolve_pathname(name, file_ptr->comm, &file_ptr->file_path) < 0) diff --git a/src/H5FDsubfiling/H5FDioc_threads.c b/src/H5FDsubfiling/H5FDioc_threads.c index 3ac7a07..f4da503 100644 --- a/src/H5FDsubfiling/H5FDioc_threads.c +++ b/src/H5FDsubfiling/H5FDioc_threads.c @@ -389,7 +389,7 @@ ioc_main(ioc_data_t *ioc_data) * Zero out work request, since the received message should * be smaller than sizeof(sf_work_request_t) */ - HDmemset(&wk_req, 0, sizeof(sf_work_request_t)); + memset(&wk_req, 0, sizeof(sf_work_request_t)); if (MPI_SUCCESS != (mpi_code = MPI_Recv(&wk_req, count, MPI_BYTE, source, tag, context->sf_msg_comm, MPI_STATUS_IGNORE))) @@ -1086,7 +1086,7 @@ ioc_file_read_data(int fd, int64_t file_offset, void *data_buffer, int64_t data_ assert(bytes_remaining > 0); /* end of file but not end of format address space */ - HDmemset(this_buffer, 0, (size_t)bytes_remaining); + memset(this_buffer, 0, (size_t)bytes_remaining); break; } else { @@ -1304,7 +1304,7 @@ ioc_io_queue_add_entry(ioc_data_t *ioc_data, sf_work_request_t *wk_req_ptr) assert(entry_ptr); assert(entry_ptr->magic == H5FD_IOC__IO_Q_ENTRY_MAGIC); - HDmemcpy((void *)(&(entry_ptr->wk_req)), (const void *)wk_req_ptr, sizeof(sf_work_request_t)); + memcpy((void *)(&(entry_ptr->wk_req)), (const void *)wk_req_ptr, sizeof(sf_work_request_t)); /* must obtain io_queue mutex before appending */ hg_thread_mutex_lock(&ioc_data->io_queue.q_mutex); diff --git a/src/H5FDsubfiling/H5FDsubfiling.c b/src/H5FDsubfiling/H5FDsubfiling.c index 9f2f4c8..6a04f68 100644 --- a/src/H5FDsubfiling/H5FDsubfiling.c +++ b/src/H5FDsubfiling/H5FDsubfiling.c @@ -553,7 +553,7 @@ H5Pget_fapl_subfiling(hid_t fapl_id, H5FD_subfiling_config_t *config_out) } else { /* Copy the subfiling fapl data out */ - HDmemcpy(config_out, config_ptr, sizeof(H5FD_subfiling_config_t)); + memcpy(config_out, config_ptr, sizeof(H5FD_subfiling_config_t)); /* Copy the driver info value */ if (H5FD__copy_plist(config_ptr->ioc_fapl_id, &(config_out->ioc_fapl_id)) < 0) @@ -574,7 +574,7 @@ H5FD__subfiling_get_default_config(hid_t fapl_id, H5FD_subfiling_config_t *confi assert(config_out); - HDmemset(config_out, 0, sizeof(*config_out)); + memset(config_out, 0, sizeof(*config_out)); config_out->magic = H5FD_SUBFILING_FAPL_MAGIC; config_out->version = H5FD_SUBFILING_CURR_FAPL_VERSION; @@ -811,7 +811,7 @@ H5FD__subfiling_sb_encode(H5FD_t *_file, char *name, unsigned char *buf) /* Encode config file prefix string */ if (sf_context->config_file_prefix) { - HDmemcpy(p, sf_context->config_file_prefix, prefix_len); + memcpy(p, sf_context->config_file_prefix, prefix_len); p += prefix_len; } @@ -819,14 +819,14 @@ H5FD__subfiling_sb_encode(H5FD_t *_file, char *name, unsigned char *buf) if (file->sf_file) { char ioc_name[9]; - HDmemset(ioc_name, 0, sizeof(ioc_name)); + memset(ioc_name, 0, sizeof(ioc_name)); if (H5FD_sb_encode(file->sf_file, ioc_name, p + 9) < 0) H5_SUBFILING_GOTO_ERROR(H5E_VFL, H5E_CANTENCODE, FAIL, "unable to encode IOC VFD's superblock information"); /* Copy the IOC VFD's name into our buffer */ - HDmemcpy(p, ioc_name, 9); + memcpy(p, ioc_name, 9); } done: @@ -893,7 +893,7 @@ H5FD__subfiling_sb_decode(H5FD_t *_file, const char *name, const unsigned char * H5_SUBFILING_GOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "can't allocate space for config file prefix string"); - HDmemcpy(sf_context->config_file_prefix, p, tmpu64); + memcpy(sf_context->config_file_prefix, p, tmpu64); /* Just in case.. */ sf_context->config_file_prefix[tmpu64 - 1] = '\0'; @@ -905,7 +905,7 @@ H5FD__subfiling_sb_decode(H5FD_t *_file, const char *name, const unsigned char * if (file->sf_file) { char ioc_name[9]; - HDmemcpy(ioc_name, p, 9); + memcpy(ioc_name, p, 9); p += 9; if (H5FD_sb_load(file->sf_file, ioc_name, p) < 0) @@ -960,7 +960,7 @@ H5FD__subfiling_fapl_get(H5FD_t *_file) } /* Copy the fields of the structure */ - HDmemcpy(fa, &(file->fa), sizeof(H5FD_subfiling_config_t)); + memcpy(fa, &(file->fa), sizeof(H5FD_subfiling_config_t)); /* Copy the driver info value */ if (H5FD__copy_plist(file->fa.ioc_fapl_id, &(fa->ioc_fapl_id)) < 0) @@ -1036,7 +1036,7 @@ H5FD__subfiling_fapl_copy(const void *_old_fa) H5_SUBFILING_GOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed"); } - HDmemcpy(new_fa, old_fa, sizeof(H5FD_subfiling_config_t)); + memcpy(new_fa, old_fa, sizeof(H5FD_subfiling_config_t)); if (H5FD__copy_plist(old_fa->ioc_fapl_id, &(new_fa->ioc_fapl_id)) < 0) H5_SUBFILING_GOTO_ERROR(H5E_VFL, H5E_BADVALUE, NULL, "can't copy the IOC FAPL"); @@ -1169,7 +1169,7 @@ H5FD__subfiling_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t ma config_ptr = &default_config; } - HDmemcpy(&file_ptr->fa, config_ptr, sizeof(H5FD_subfiling_config_t)); + memcpy(&file_ptr->fa, config_ptr, sizeof(H5FD_subfiling_config_t)); if (H5FD__copy_plist(config_ptr->ioc_fapl_id, &(file_ptr->fa.ioc_fapl_id)) < 0) { file_ptr->fa.ioc_fapl_id = H5I_INVALID_HID; H5_SUBFILING_GOTO_ERROR(H5E_VFL, H5E_BADVALUE, NULL, "can't copy FAPL"); @@ -2844,9 +2844,9 @@ init_indep_io(subfiling_context_t *sf_context, int64_t file_offset, size_t io_ne _target_file_offset = target_file_offset + output_offset; _io_block_len = io_block_len + output_offset; - HDmemset(_mem_buf_offset, 0, (max_iovec_len * sizeof(*_mem_buf_offset))); - HDmemset(_target_file_offset, 0, (max_iovec_len * sizeof(*_target_file_offset))); - HDmemset(_io_block_len, 0, (max_iovec_len * sizeof(*_io_block_len))); + memset(_mem_buf_offset, 0, (max_iovec_len * sizeof(*_mem_buf_offset))); + memset(_target_file_offset, 0, (max_iovec_len * sizeof(*_target_file_offset))); + memset(_io_block_len, 0, (max_iovec_len * sizeof(*_io_block_len))); if (total_bytes == data_size) { *n_subfiles_used = i; diff --git a/src/H5FDsubfiling/H5subfiling_common.c b/src/H5FDsubfiling/H5subfiling_common.c index 8ddb3a3..379a49d 100644 --- a/src/H5FDsubfiling/H5subfiling_common.c +++ b/src/H5FDsubfiling/H5subfiling_common.c @@ -179,8 +179,8 @@ H5_get_subfiling_object(int64_t object_id) sf_context_cache_size = new_size; /* Clear newly-allocated entries */ - HDmemset(&sf_context_cache[old_num_entries], 0, - (sf_context_cache_size - old_num_entries) * sizeof(*sf_context_cache)); + memset(&sf_context_cache[old_num_entries], 0, + (sf_context_cache_size - old_num_entries) * sizeof(*sf_context_cache)); /* * If we had to make more space, the given object index @@ -236,8 +236,8 @@ H5_get_subfiling_object(int64_t object_id) sf_topology_cache_size = new_size; /* Clear newly-allocated entries */ - HDmemset(&sf_topology_cache[old_num_entries], 0, - (sf_topology_cache_size - old_num_entries) * sizeof(*sf_topology_cache)); + memset(&sf_topology_cache[old_num_entries], 0, + (sf_topology_cache_size - old_num_entries) * sizeof(*sf_topology_cache)); /* * If we had to make more space, the given object index @@ -337,7 +337,7 @@ H5FL_reg_free(H5FL_reg_head_t *head, void *obj) #endif /* H5FL_TRACK */ #ifdef H5FL_DEBUG - HDmemset(obj, 255, head->size); + memset(obj, 255, head->size); #endif /* H5FL_DEBUG */ /* Make certain that the free list is initialized */ @@ -470,7 +470,7 @@ H5FL_reg_calloc(H5FL_reg_head_t *head H5FL_TRACK_PARAMS) /* Clear to zeros */ /* (Accommodate tracking information, if present) */ - HDmemset(ret_value, 0, head->size - H5FL_TRACK_SIZE); + memset(ret_value, 0, head->size - H5FL_TRACK_SIZE); done: FUNC_LEAVE_NOAPI(ret_value) @@ -917,7 +917,7 @@ H5FL_blk_calloc(H5FL_blk_head_t *head, size_t size H5FL_TRACK_PARAMS) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") /* Clear the block to zeros */ - HDmemset(ret_value, 0, size); + memset(ret_value, 0, size); done: FUNC_LEAVE_NOAPI(ret_value) @@ -957,7 +957,7 @@ H5FL_blk_free(H5FL_blk_head_t *head, void *block) unsigned char *block_ptr = ((unsigned char *)block) - sizeof(H5FL_track_t); H5FL_track_t trk; - HDmemcpy(&trk, block_ptr, sizeof(H5FL_track_t)); + memcpy(&trk, block_ptr, sizeof(H5FL_track_t)); /* Free tracking information about the allocation location */ H5CS_close_stack(trk.stack); @@ -979,7 +979,7 @@ H5FL_blk_free(H5FL_blk_head_t *head, void *block) trk.next->prev = trk.prev; } /* end else */ - HDmemcpy(block_ptr, &trk, sizeof(H5FL_track_t)); + memcpy(block_ptr, &trk, sizeof(H5FL_track_t)); } #endif /* H5FL_TRACK */ @@ -993,7 +993,7 @@ H5FL_blk_free(H5FL_blk_head_t *head, void *block) free_size = temp->size; #ifdef H5FL_DEBUG - HDmemset(temp, 255, free_size + sizeof(H5FL_blk_list_t) + H5FL_TRACK_SIZE); + memset(temp, 255, free_size + sizeof(H5FL_blk_list_t) + H5FL_TRACK_SIZE); #endif /* H5FL_DEBUG */ /* Check if there is a free list for native blocks of this size */ @@ -1079,7 +1079,7 @@ H5FL_blk_realloc(H5FL_blk_head_t *head, void *block, size_t new_size H5FL_TRACK_ unsigned char *block_ptr = ((unsigned char *)block) - sizeof(H5FL_track_t); H5FL_track_t trk; - HDmemcpy(&trk, block_ptr, sizeof(H5FL_track_t)); + memcpy(&trk, block_ptr, sizeof(H5FL_track_t)); /* Release previous tracking information */ H5CS_close_stack(trk.stack); @@ -1099,7 +1099,7 @@ H5FL_blk_realloc(H5FL_blk_head_t *head, void *block, size_t new_size H5FL_TRACK_ trk.func = call_func; trk.line = call_line; - HDmemcpy(block_ptr, &trk, sizeof(H5FL_track_t)); + memcpy(block_ptr, &trk, sizeof(H5FL_track_t)); } #endif /* H5FL_TRACK */ ret_value = block; @@ -1380,7 +1380,7 @@ H5FL_arr_free(H5FL_arr_head_t *head, void *obj) unsigned char *block_ptr = ((unsigned char *)obj) - sizeof(H5FL_track_t); H5FL_track_t trk; - HDmemcpy(&trk, block_ptr, sizeof(H5FL_track_t)); + memcpy(&trk, block_ptr, sizeof(H5FL_track_t)); /* Free tracking information about the allocation location */ H5CS_close_stack(trk.stack); @@ -1402,7 +1402,7 @@ H5FL_arr_free(H5FL_arr_head_t *head, void *obj) trk.next->prev = trk.prev; } /* end else */ - HDmemcpy(block_ptr, &trk, sizeof(H5FL_track_t)); + memcpy(block_ptr, &trk, sizeof(H5FL_track_t)); } #endif @@ -1570,7 +1570,7 @@ H5FL_arr_calloc(H5FL_arr_head_t *head, size_t elem H5FL_TRACK_PARAMS) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") /* Clear to zeros */ - HDmemset(ret_value, 0, head->list_arr[elem].size); + memset(ret_value, 0, head->list_arr[elem].size); done: FUNC_LEAVE_NOAPI(ret_value) @@ -1631,7 +1631,7 @@ H5FL_arr_realloc(H5FL_arr_head_t *head, void *obj, size_t new_elem H5FL_TRACK_PA unsigned char *block_ptr = ((unsigned char *)obj) - sizeof(H5FL_track_t); H5FL_track_t trk; - HDmemcpy(&trk, block_ptr, sizeof(H5FL_track_t)); + memcpy(&trk, block_ptr, sizeof(H5FL_track_t)); /* Release previous tracking information */ H5CS_close_stack(trk.stack); @@ -1651,7 +1651,7 @@ H5FL_arr_realloc(H5FL_arr_head_t *head, void *obj, size_t new_elem H5FL_TRACK_PA trk.func = call_func; trk.line = call_line; - HDmemcpy(block_ptr, &trk, sizeof(H5FL_track_t)); + memcpy(block_ptr, &trk, sizeof(H5FL_track_t)); #endif ret_value = obj; } @@ -2047,7 +2047,7 @@ H5FL_fac_free(H5FL_fac_head_t *head, void *obj) #endif /* H5FL_TRACK */ #ifdef H5FL_DEBUG - HDmemset(obj, 255, head->size); + memset(obj, 255, head->size); #endif /* H5FL_DEBUG */ /* Make certain that the free list is initialized */ @@ -2178,7 +2178,7 @@ H5FL_fac_calloc(H5FL_fac_head_t *head H5FL_TRACK_PARAMS) /* Clear to zeros */ /* (Accommodate tracking information, if present) */ - HDmemset(ret_value, 0, head->size - H5FL_TRACK_SIZE); + memset(ret_value, 0, head->size - H5FL_TRACK_SIZE); done: FUNC_LEAVE_NOAPI(ret_value) diff --git a/src/H5FScache.c b/src/H5FScache.c index 09dc528..25443d5 100644 --- a/src/H5FScache.c +++ b/src/H5FScache.c @@ -237,7 +237,7 @@ H5FS__cache_hdr_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED len fspace->addr = udata->addr; /* Magic number */ - if (HDmemcmp(image, H5FS_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) + if (memcmp(image, H5FS_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, NULL, "wrong free space header signature") image += H5_SIZEOF_MAGIC; @@ -946,7 +946,7 @@ H5FS__cache_sinfo_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED l H5_CHECKED_ASSIGN(old_sect_size, size_t, fspace->sect_size, hsize_t); /* Magic number */ - if (HDmemcmp(image, H5FS_SINFO_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) + if (memcmp(image, H5FS_SINFO_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, NULL, "wrong free space sections signature") image += H5_SIZEOF_MAGIC; diff --git a/src/H5Faccum.c b/src/H5Faccum.c index 1599269..4d4b1f9 100644 --- a/src/H5Faccum.c +++ b/src/H5Faccum.c @@ -147,7 +147,7 @@ H5F__accum_read(H5F_shared_t *f_sh, H5FD_mem_t map_type, haddr_t addr, size_t si accum->alloc_size = new_alloc_size; /* Clear the memory */ - HDmemset(accum->buf + accum->size, 0, (accum->alloc_size - accum->size)); + memset(accum->buf + accum->size, 0, (accum->alloc_size - accum->size)); } /* end if */ /* Read the part before the metadata accumulator */ @@ -156,7 +156,7 @@ H5F__accum_read(H5F_shared_t *f_sh, H5FD_mem_t map_type, haddr_t addr, size_t si H5_CHECKED_ASSIGN(amount_before, size_t, (accum->loc - addr), hsize_t); /* Make room for the metadata to read in */ - HDmemmove(accum->buf + amount_before, accum->buf, accum->size); + memmove(accum->buf + amount_before, accum->buf, accum->size); /* Adjust dirty region tracking info, if present */ if (accum->dirty) @@ -360,7 +360,7 @@ H5F__accum_adjust(H5F_meta_accum_t *accum, H5FD_t *file, H5F_accum_adjust_t adju /* When appending, need to adjust location of accumulator */ if (H5F_ACCUM_APPEND == adjust) { /* Move remnant of accumulator down */ - HDmemmove(accum->buf, (accum->buf + shrink_size), remnant_size); + memmove(accum->buf, (accum->buf + shrink_size), remnant_size); /* Adjust accumulator's location */ accum->loc += shrink_size; @@ -380,7 +380,7 @@ H5F__accum_adjust(H5F_meta_accum_t *accum, H5FD_t *file, H5F_accum_adjust_t adju accum->alloc_size = new_size; /* Clear the memory */ - HDmemset(accum->buf + accum->size, 0, (accum->alloc_size - (accum->size + size))); + memset(accum->buf + accum->size, 0, (accum->alloc_size - (accum->size + size))); } /* end if */ } /* end if */ @@ -434,7 +434,7 @@ H5F__accum_write(H5F_shared_t *f_sh, H5FD_mem_t map_type, haddr_t addr, size_t s HGOTO_ERROR(H5E_IO, H5E_CANTRESIZE, FAIL, "can't adjust metadata accumulator") /* Move the existing metadata to the proper location */ - HDmemmove(accum->buf + size, accum->buf, accum->size); + memmove(accum->buf + size, accum->buf, accum->size); /* Copy the new metadata at the front */ H5MM_memcpy(accum->buf, buf, size); @@ -524,7 +524,7 @@ H5F__accum_write(H5F_shared_t *f_sh, H5FD_mem_t map_type, haddr_t addr, size_t s H5_CHECKED_ASSIGN(old_offset, size_t, (addr + size) - accum->loc, hsize_t); /* Move the existing metadata to the proper location */ - HDmemmove(accum->buf + size, accum->buf + old_offset, (accum->size - old_offset)); + memmove(accum->buf + size, accum->buf + old_offset, (accum->size - old_offset)); /* Copy the new metadata at the front */ H5MM_memcpy(accum->buf, buf, size); @@ -607,7 +607,7 @@ H5F__accum_write(H5F_shared_t *f_sh, H5FD_mem_t map_type, haddr_t addr, size_t s accum->alloc_size = new_alloc_size; /* Clear the memory */ - HDmemset(accum->buf + size, 0, (accum->alloc_size - size)); + memset(accum->buf + size, 0, (accum->alloc_size - size)); } /* end if */ /* Copy the new metadata to the buffer */ @@ -654,7 +654,7 @@ H5F__accum_write(H5F_shared_t *f_sh, H5FD_mem_t map_type, haddr_t addr, size_t s /* Clear the memory */ clear_size = MAX(accum->size, size); - HDmemset(accum->buf + clear_size, 0, (accum->alloc_size - clear_size)); + memset(accum->buf + clear_size, 0, (accum->alloc_size - clear_size)); } /* end if */ else { /* Check if we should shrink the accumulator buffer */ @@ -704,7 +704,7 @@ H5F__accum_write(H5F_shared_t *f_sh, H5FD_mem_t map_type, haddr_t addr, size_t s accum->alloc_size = new_size; /* Clear the memory */ - HDmemset(accum->buf + size, 0, (accum->alloc_size - size)); + memset(accum->buf + size, 0, (accum->alloc_size - size)); } /* end if */ /* Update the metadata accumulator information */ @@ -771,7 +771,7 @@ H5F__accum_write(H5F_shared_t *f_sh, H5FD_mem_t map_type, haddr_t addr, size_t s /* Trim bottom of accumulator off */ accum->loc += overlap_size; accum->size -= overlap_size; - HDmemmove(accum->buf, accum->buf + overlap_size, accum->size); + memmove(accum->buf, accum->buf + overlap_size, accum->size); } /* end if */ else { /* Access covers whole accumulator */ /* Reset accumulator, but don't flush */ @@ -881,7 +881,7 @@ H5F__accum_free(H5F_shared_t *f_sh, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr new_accum_size = accum->size - overlap_size; /* Move the accumulator buffer information to eliminate the freed block */ - HDmemmove(accum->buf, accum->buf + overlap_size, new_accum_size); + memmove(accum->buf, accum->buf + overlap_size, new_accum_size); /* Adjust the accumulator information */ accum->loc += overlap_size; diff --git a/src/H5Fcwfs.c b/src/H5Fcwfs.c index 03cbdc6..f5892a3 100644 --- a/src/H5Fcwfs.c +++ b/src/H5Fcwfs.c @@ -113,13 +113,13 @@ H5F_cwfs_add(H5F_t *f, H5HG_heap_t *heap) for (i = H5F_NCWFS - 1; i >= 0; --i) if (H5HG_FREE_SIZE(f->shared->cwfs[i]) < H5HG_FREE_SIZE(heap)) { - HDmemmove(f->shared->cwfs + 1, f->shared->cwfs, (size_t)i * sizeof(H5HG_heap_t *)); + memmove(f->shared->cwfs + 1, f->shared->cwfs, (size_t)i * sizeof(H5HG_heap_t *)); f->shared->cwfs[0] = heap; break; } /* end if */ } else { - HDmemmove(f->shared->cwfs + 1, f->shared->cwfs, f->shared->ncwfs * sizeof(H5HG_heap_t *)); + memmove(f->shared->cwfs + 1, f->shared->cwfs, f->shared->ncwfs * sizeof(H5HG_heap_t *)); f->shared->cwfs[0] = heap; f->shared->ncwfs += 1; } /* end else */ @@ -288,7 +288,7 @@ H5F_cwfs_remove_heap(H5F_shared_t *shared, H5HG_heap_t *heap) for (u = 0; u < shared->ncwfs; u++) { if (shared->cwfs[u] == heap) { shared->ncwfs -= 1; - HDmemmove(shared->cwfs + u, shared->cwfs + u + 1, (shared->ncwfs - u) * sizeof(H5HG_heap_t *)); + memmove(shared->cwfs + u, shared->cwfs + u + 1, (shared->ncwfs - u) * sizeof(H5HG_heap_t *)); break; } /* end if */ } /* end for */ diff --git a/src/H5Fint.c b/src/H5Fint.c index 49f4323..f3d7e2e 100644 --- a/src/H5Fint.c +++ b/src/H5Fint.c @@ -3211,7 +3211,7 @@ H5F__get_file_image(H5F_t *file, void *buf_ptr, size_t buf_len, size_t *image_le tmp_size = H5F_SUPER_STATUS_FLAGS_SIZE(file->shared->sblock->super_vers); /* Clear "status_flags" */ - HDmemset((uint8_t *)buf_ptr + tmp, 0, tmp_size); + memset((uint8_t *)buf_ptr + tmp, 0, tmp_size); } /* end if */ /* Set *image_len = to EOA */ @@ -3243,7 +3243,7 @@ H5F__get_info(H5F_t *f, H5F_info2_t *finfo) assert(finfo); /* Reset file info struct */ - HDmemset(finfo, 0, sizeof(*finfo)); + memset(finfo, 0, sizeof(*finfo)); /* Get the size of the superblock and any superblock extensions */ if (H5F__super_size(f, &finfo->super.super_size, &finfo->super.super_ext_size) < 0) @@ -3336,7 +3336,7 @@ H5F_set_retries(H5F_t *f) assert(f); /* Initialize the tracking for metadata read retries */ - HDmemset(f->shared->retries, 0, sizeof(f->shared->retries)); + memset(f->shared->retries, 0, sizeof(f->shared->retries)); /* Initialize the # of bins for retries */ f->shared->retries_nbins = 0; @@ -3524,7 +3524,7 @@ H5F_get_metadata_read_retry_info(H5F_t *file, H5F_retry_info_t *info) info->nbins = file->shared->retries_nbins; /* Initialize the array of "retries" */ - HDmemset(info->retries, 0, sizeof(info->retries)); + memset(info->retries, 0, sizeof(info->retries)); /* Return if there are no bins -- no retries */ if (!info->nbins) diff --git a/src/H5Fmount.c b/src/H5Fmount.c index b17baea..ef2249f 100644 --- a/src/H5Fmount.c +++ b/src/H5Fmount.c @@ -65,8 +65,8 @@ H5F__close_mounts(H5F_t *f) HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "can't close child file") /* Eliminate the mount point from the table */ - HDmemmove(f->shared->mtab.child + u, f->shared->mtab.child + u + 1, - (f->shared->mtab.nmounts - u - 1) * sizeof(f->shared->mtab.child[0])); + memmove(f->shared->mtab.child + u, f->shared->mtab.child + u + 1, + (f->shared->mtab.nmounts - u - 1) * sizeof(f->shared->mtab.child[0])); f->shared->mtab.nmounts--; f->nmounts--; } @@ -195,8 +195,8 @@ H5F_mount(const H5G_loc_t *loc, const char *name, H5F_t *child, hid_t H5_ATTR_UN } /* Insert into table */ - HDmemmove(parent->shared->mtab.child + md + 1, parent->shared->mtab.child + md, - (parent->shared->mtab.nmounts - md) * sizeof(parent->shared->mtab.child[0])); + memmove(parent->shared->mtab.child + md + 1, parent->shared->mtab.child + md, + (parent->shared->mtab.nmounts - md) * sizeof(parent->shared->mtab.child[0])); parent->shared->mtab.nmounts++; parent->nmounts++; parent->shared->mtab.child[md].group = mount_point; @@ -356,10 +356,10 @@ H5F_unmount(const H5G_loc_t *loc, const char *name) HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "unable to replace name") /* Eliminate the mount point from the table */ - HDmemmove(parent->shared->mtab.child + (unsigned)child_idx, - (parent->shared->mtab.child + (unsigned)child_idx) + 1, - ((parent->shared->mtab.nmounts - (unsigned)child_idx) - 1) * - sizeof(parent->shared->mtab.child[0])); + memmove(parent->shared->mtab.child + (unsigned)child_idx, + (parent->shared->mtab.child + (unsigned)child_idx) + 1, + ((parent->shared->mtab.nmounts - (unsigned)child_idx) - 1) * + sizeof(parent->shared->mtab.child[0])); parent->shared->mtab.nmounts -= 1; parent->nmounts -= 1; diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c index 502f554..92157ae 100644 --- a/src/H5Fsuper.c +++ b/src/H5Fsuper.c @@ -1367,7 +1367,7 @@ H5F__super_init(H5F_t *f) assert(driver_size <= H5F_MAX_DRVINFOBLOCK_SIZE); /* Encode driver-specific data */ - HDmemset(dbuf, 0, sizeof(dbuf)); + memset(dbuf, 0, sizeof(dbuf)); if (H5FD_sb_encode(f->shared->lf, info.name, dbuf) < 0) HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "unable to encode driver information") diff --git a/src/H5Gcache.c b/src/H5Gcache.c index a4a127d..705832a 100644 --- a/src/H5Gcache.c +++ b/src/H5Gcache.c @@ -164,7 +164,7 @@ H5G__cache_node_deserialize(const void *_image, size_t len, void *_udata, hbool_ /* Magic */ if (H5_IS_BUFFER_OVERFLOW(image, H5_SIZEOF_MAGIC, image_end)) HGOTO_ERROR(H5E_SYM, H5E_OVERFLOW, NULL, "ran off end of input buffer while decoding"); - if (HDmemcmp(image, H5G_NODE_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) + if (memcmp(image, H5G_NODE_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, NULL, "bad symbol table node signature") image += H5_SIZEOF_MAGIC; @@ -268,7 +268,7 @@ H5G__cache_node_serialize(const H5F_t *f, void *_image, size_t len, void *_thing HGOTO_ERROR(H5E_SYM, H5E_CANTENCODE, FAIL, "can't serialize") /* Clear rest of symbol table node */ - HDmemset(image, 0, len - (size_t)(image - (uint8_t *)_image)); + memset(image, 0, len - (size_t)(image - (uint8_t *)_image)); done: FUNC_LEAVE_NOAPI(ret_value) diff --git a/src/H5Gdense.c b/src/H5Gdense.c index beef534..7e96d16 100644 --- a/src/H5Gdense.c +++ b/src/H5Gdense.c @@ -260,7 +260,7 @@ H5G__dense_create(H5F_t *f, H5O_linfo_t *linfo, const H5O_pline_t *pline) /* Set fractal heap creation parameters */ /* XXX: Give some control of these to applications? */ - HDmemset(&fheap_cparam, 0, sizeof(fheap_cparam)); + memset(&fheap_cparam, 0, sizeof(fheap_cparam)); fheap_cparam.managed.width = H5G_FHEAP_MAN_WIDTH; fheap_cparam.managed.start_block_size = H5G_FHEAP_MAN_START_BLOCK_SIZE; fheap_cparam.managed.max_direct_size = H5G_FHEAP_MAN_MAX_DIRECT_SIZE; @@ -285,7 +285,7 @@ H5G__dense_create(H5F_t *f, H5O_linfo_t *linfo, const H5O_pline_t *pline) assert(fheap_id_len == H5G_DENSE_FHEAP_ID_LEN); /* Create the name index v2 B-tree */ - HDmemset(&bt2_cparam, 0, sizeof(bt2_cparam)); + memset(&bt2_cparam, 0, sizeof(bt2_cparam)); bt2_cparam.cls = H5G_BT2_NAME; bt2_cparam.node_size = (size_t)H5G_NAME_BT2_NODE_SIZE; H5_CHECK_OVERFLOW(fheap_id_len, /* From: */ hsize_t, /* To: */ uint32_t); @@ -303,7 +303,7 @@ H5G__dense_create(H5F_t *f, H5O_linfo_t *linfo, const H5O_pline_t *pline) /* Check if we should create a creation order index v2 B-tree */ if (linfo->index_corder) { /* Create the creation order index v2 B-tree */ - HDmemset(&bt2_cparam, 0, sizeof(bt2_cparam)); + memset(&bt2_cparam, 0, sizeof(bt2_cparam)); bt2_cparam.cls = H5G_BT2_CORDER; bt2_cparam.node_size = (size_t)H5G_CORDER_BT2_NODE_SIZE; H5_CHECK_OVERFLOW(fheap_id_len, /* From: */ hsize_t, /* To: */ uint32_t); diff --git a/src/H5Gdeprec.c b/src/H5Gdeprec.c index 274c460..a77525a 100644 --- a/src/H5Gdeprec.c +++ b/src/H5Gdeprec.c @@ -1075,7 +1075,7 @@ H5G__get_objinfo(const H5G_loc_t *loc, const char *name, hbool_t follow_link, H5 /* Reset stat buffer */ if (statbuf) - HDmemset(statbuf, 0, sizeof(H5G_stat_t)); + memset(statbuf, 0, sizeof(H5G_stat_t)); /* Set up user data for retrieving information */ udata.statbuf = statbuf; diff --git a/src/H5Gent.c b/src/H5Gent.c index 1f76069..4710ff1 100644 --- a/src/H5Gent.c +++ b/src/H5Gent.c @@ -266,7 +266,7 @@ H5G_ent_encode(const H5F_t *f, uint8_t **pp, const H5G_entry_t *ent) /* fill with zero */ if (*pp < p_ret) - HDmemset(*pp, 0, (size_t)(p_ret - *pp)); + memset(*pp, 0, (size_t)(p_ret - *pp)); *pp = p_ret; done: @@ -336,7 +336,7 @@ H5G__ent_reset(H5G_entry_t *ent) assert(ent); /* Clear the symbol table entry to an empty state */ - HDmemset(ent, 0, sizeof(H5G_entry_t)); + memset(ent, 0, sizeof(H5G_entry_t)); ent->header = HADDR_UNDEF; FUNC_LEAVE_NOAPI_VOID diff --git a/src/H5Gint.c b/src/H5Gint.c index 14a11ab..c5cb82b 100644 --- a/src/H5Gint.c +++ b/src/H5Gint.c @@ -251,7 +251,7 @@ H5G__create_named(const H5G_loc_t *loc, const char *name, hid_t lcpl_id, hid_t g /* Set up group creation info */ gcrt_info.gcpl_id = gcpl_id; gcrt_info.cache_type = H5G_NOTHING_CACHED; - HDmemset(&gcrt_info.cache, 0, sizeof(gcrt_info.cache)); + memset(&gcrt_info.cache, 0, sizeof(gcrt_info.cache)); /* Set up object creation information */ ocrt_info.obj_type = H5O_TYPE_GROUP; @@ -1098,7 +1098,7 @@ H5G_visit(H5G_loc_t *loc, const char *group_name, H5_index_t idx_type, H5_iter_o herr_t ret_value = FAIL; /* Return value */ /* Portably clear udata struct (before FUNC_ENTER) */ - HDmemset(&udata, 0, sizeof(udata)); + memset(&udata, 0, sizeof(udata)); FUNC_ENTER_NOAPI(FAIL) diff --git a/src/H5Gname.c b/src/H5Gname.c index dbca91f..fcb896f 100644 --- a/src/H5Gname.c +++ b/src/H5Gname.c @@ -503,7 +503,7 @@ H5G_name_reset(H5G_name_t *name) assert(name); /* Clear the group hier. name to an empty state */ - HDmemset(name, 0, sizeof(H5G_name_t)); + memset(name, 0, sizeof(H5G_name_t)); FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5G_name_reset() */ @@ -1111,7 +1111,7 @@ H5G_get_name_by_addr(H5F_t *f, const H5O_loc_t *loc, char *name, size_t size, si herr_t ret_value = SUCCEED; /* Return value */ /* Portably clear udata struct (before FUNC_ENTER) */ - HDmemset(&udata, 0, sizeof(udata)); + memset(&udata, 0, sizeof(udata)); FUNC_ENTER_NOAPI(FAIL) diff --git a/src/H5Gnode.c b/src/H5Gnode.c index a705365..8df3a75 100644 --- a/src/H5Gnode.c +++ b/src/H5Gnode.c @@ -610,7 +610,7 @@ H5G__node_insert(H5F_t *f, haddr_t addr, void H5_ATTR_UNUSED *_lt_key, hbool_t H snrt_flags |= H5AC__DIRTIED_FLAG; /* The left node */ - HDmemset(sn->entry + H5F_SYM_LEAF_K(f), 0, H5F_SYM_LEAF_K(f) * sizeof(H5G_entry_t)); + memset(sn->entry + H5F_SYM_LEAF_K(f), 0, H5F_SYM_LEAF_K(f) * sizeof(H5G_entry_t)); sn->nsyms = H5F_SYM_LEAF_K(f); sn_flags |= H5AC__DIRTIED_FLAG; @@ -645,8 +645,8 @@ H5G__node_insert(H5F_t *f, haddr_t addr, void H5_ATTR_UNUSED *_lt_key, hbool_t H /* Move entries down to make room for new entry */ assert(idx >= 0); - HDmemmove(insert_into->entry + idx + 1, insert_into->entry + idx, - (insert_into->nsyms - (unsigned)idx) * sizeof(H5G_entry_t)); + memmove(insert_into->entry + idx + 1, insert_into->entry + idx, + (insert_into->nsyms - (unsigned)idx) * sizeof(H5G_entry_t)); /* Copy new entry into table */ H5G__ent_copy(&(insert_into->entry[idx]), &ent, H5_COPY_SHALLOW); @@ -810,7 +810,7 @@ H5G__node_remove(H5F_t *f, haddr_t addr, void H5_ATTR_NDEBUG_UNUSED *_lt_key /*i */ sn->nsyms -= 1; sn_flags |= H5AC__DIRTIED_FLAG; - HDmemmove(sn->entry + idx, sn->entry + idx + 1, (sn->nsyms - idx) * sizeof(H5G_entry_t)); + memmove(sn->entry + idx, sn->entry + idx + 1, (sn->nsyms - idx) * sizeof(H5G_entry_t)); ret_value = H5B_INS_NOOP; } else if (idx + 1 == sn->nsyms) { @@ -832,7 +832,7 @@ H5G__node_remove(H5F_t *f, haddr_t addr, void H5_ATTR_NDEBUG_UNUSED *_lt_key /*i */ sn->nsyms -= 1; sn_flags |= H5AC__DIRTIED_FLAG; - HDmemmove(sn->entry + idx, sn->entry + idx + 1, (sn->nsyms - idx) * sizeof(H5G_entry_t)); + memmove(sn->entry + idx, sn->entry + idx + 1, (sn->nsyms - idx) * sizeof(H5G_entry_t)); ret_value = H5B_INS_NOOP; } /* end else */ } /* end if */ diff --git a/src/H5Gstab.c b/src/H5Gstab.c index c61416f..45b1be9 100644 --- a/src/H5Gstab.c +++ b/src/H5Gstab.c @@ -681,7 +681,7 @@ H5G__stab_get_name_by_idx(const H5O_loc_t *oloc, H5_iter_order_t order, hsize_t herr_t ret_value = SUCCEED; /* Return value */ /* Portably clear udata struct (before FUNC_ENTER) */ - HDmemset(&udata, 0, sizeof(udata)); + memset(&udata, 0, sizeof(udata)); FUNC_ENTER_NOAPI(FAIL) diff --git a/src/H5Gtraverse.c b/src/H5Gtraverse.c index d2020f3..1e71396 100644 --- a/src/H5Gtraverse.c +++ b/src/H5Gtraverse.c @@ -669,7 +669,7 @@ H5G__traverse_real(const H5G_loc_t *_loc, const char *name, unsigned target, H5G /* XXX: Should we allow user to control the group creation params here? -QAK */ gcrt_info.gcpl_id = H5P_GROUP_CREATE_DEFAULT; gcrt_info.cache_type = H5G_NOTHING_CACHED; - HDmemset(&gcrt_info.cache, 0, sizeof(gcrt_info.cache)); + memset(&gcrt_info.cache, 0, sizeof(gcrt_info.cache)); if (H5G__obj_create_real(grp_oloc.file, ginfo, linfo, pline, &gcrt_info, obj_loc.oloc /*out*/) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create group entry") diff --git a/src/H5HFcache.c b/src/H5HFcache.c index 139b2f5..4acec44 100644 --- a/src/H5HFcache.c +++ b/src/H5HFcache.c @@ -203,7 +203,7 @@ H5HF__hdr_prefix_decode(H5HF_hdr_t *hdr, const uint8_t **image_ref) assert(image); /* Magic number */ - if (HDmemcmp(image, H5HF_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) + if (memcmp(image, H5HF_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, FAIL, "wrong fractal heap header signature") image += H5_SIZEOF_MAGIC; @@ -945,7 +945,7 @@ H5HF__cache_iblock_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED assert(iblock->size == len); /* Magic number */ - if (HDmemcmp(image, H5HF_IBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) + if (memcmp(image, H5HF_IBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, NULL, "wrong fractal heap indirect block signature") image += H5_SIZEOF_MAGIC; @@ -1602,7 +1602,7 @@ H5HF__cache_dblock_verify_chksum(const void *_image, size_t len, void *_udata) chk_p -= H5HF_SIZEOF_CHKSUM; /* Reset checksum field, for computing the checksum */ - HDmemset(chk_p, 0, (size_t)H5HF_SIZEOF_CHKSUM); + memset(chk_p, 0, (size_t)H5HF_SIZEOF_CHKSUM); /* Compute checksum on entire direct block */ computed_chksum = H5_checksum_metadata(read_buf, len, 0); @@ -1680,7 +1680,7 @@ H5HF__cache_dblock_deserialize(const void *_image, size_t len, void *_udata, hbo /* Allocate space for the fractal heap direct block */ if (NULL == (dblock = H5FL_CALLOC(H5HF_direct_t))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") - HDmemset(&dblock->cache_info, 0, sizeof(H5AC_info_t)); + memset(&dblock->cache_info, 0, sizeof(H5AC_info_t)); /* Set the shared heap header's file context for this operation */ hdr->f = udata->f; @@ -1759,7 +1759,7 @@ H5HF__cache_dblock_deserialize(const void *_image, size_t len, void *_udata, hbo image = dblock->blk; /* Magic number */ - if (HDmemcmp(image, H5HF_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) + if (memcmp(image, H5HF_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, NULL, "wrong fractal heap direct block signature") image += H5_SIZEOF_MAGIC; @@ -2048,7 +2048,7 @@ H5HF__cache_dblock_pre_serialize(H5F_t *f, void *_thing, haddr_t addr, size_t le uint32_t metadata_chksum; /* Computed metadata checksum value */ /* Clear the checksum field, to compute the checksum */ - HDmemset(image, 0, (size_t)H5HF_SIZEOF_CHKSUM); + memset(image, 0, (size_t)H5HF_SIZEOF_CHKSUM); /* Compute checksum on entire direct block */ metadata_chksum = H5_checksum_metadata(dblock->blk, dblock->size, 0); diff --git a/src/H5HFdblock.c b/src/H5HFdblock.c index fe9819d..d91f963 100644 --- a/src/H5HFdblock.c +++ b/src/H5HFdblock.c @@ -99,7 +99,7 @@ H5HF__man_dblock_create(H5HF_hdr_t *hdr, H5HF_indirect_t *par_iblock, unsigned p HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for fractal heap direct block") /* Reset the metadata cache info for the heap header */ - HDmemset(&dblock->cache_info, 0, sizeof(H5AC_info_t)); + memset(&dblock->cache_info, 0, sizeof(H5AC_info_t)); /* Share common heap information */ dblock->hdr = hdr; @@ -129,7 +129,7 @@ H5HF__man_dblock_create(H5HF_hdr_t *hdr, H5HF_indirect_t *par_iblock, unsigned p /* XXX: Change to using free-list factories */ if ((dblock->blk = H5FL_BLK_MALLOC(direct_block, dblock->size)) == NULL) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed") - HDmemset(dblock->blk, 0, dblock->size); + memset(dblock->blk, 0, dblock->size); dblock->write_buf = NULL; dblock->write_size = 0; diff --git a/src/H5HFiblock.c b/src/H5HFiblock.c index b78a1e2..fd23698 100644 --- a/src/H5HFiblock.c +++ b/src/H5HFiblock.c @@ -945,7 +945,7 @@ H5HF__man_iblock_create(H5HF_hdr_t *hdr, H5HF_indirect_t *par_iblock, unsigned p "memory allocation failed for fractal heap indirect block") /* Reset the metadata cache info for the heap header */ - HDmemset(&iblock->cache_info, 0, sizeof(H5AC_info_t)); + memset(&iblock->cache_info, 0, sizeof(H5AC_info_t)); /* Share common heap information */ iblock->hdr = hdr; diff --git a/src/H5HFiter.c b/src/H5HFiter.c index 9fa9d97..caa5d99 100644 --- a/src/H5HFiter.c +++ b/src/H5HFiter.c @@ -86,7 +86,7 @@ H5HF__man_iter_init(H5HF_block_iter_t *biter) assert(biter); /* Reset block iterator information */ - HDmemset(biter, 0, sizeof(H5HF_block_iter_t)); + memset(biter, 0, sizeof(H5HF_block_iter_t)); FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5HF__man_iter_init() */ diff --git a/src/H5HFsection.c b/src/H5HFsection.c index f3524e1..b7e5910 100644 --- a/src/H5HFsection.c +++ b/src/H5HFsection.c @@ -2747,8 +2747,8 @@ H5HF__sect_indirect_reduce_row(H5HF_hdr_t *hdr, H5HF_free_section_t *row_sect, h /* Adjust direct row sections for indirect section */ if (sect->u.indirect.dir_nrows > 0) { assert(sect->u.indirect.dir_rows); - HDmemmove(§->u.indirect.dir_rows[0], §->u.indirect.dir_rows[1], - sect->u.indirect.dir_nrows * sizeof(H5HF_free_section_t *)); + memmove(§->u.indirect.dir_rows[0], §->u.indirect.dir_rows[1], + sect->u.indirect.dir_nrows * sizeof(H5HF_free_section_t *)); assert(sect->u.indirect.dir_rows[0]); /* Make new "first row" in indirect section */ @@ -2841,8 +2841,8 @@ H5HF__sect_indirect_reduce_row(H5HF_hdr_t *hdr, H5HF_free_section_t *row_sect, h /* Transfer row sections between current & peer sections */ H5MM_memcpy(&peer_sect->u.indirect.dir_rows[0], §->u.indirect.dir_rows[0], (sizeof(H5HF_free_section_t *) * peer_dir_nrows)); - HDmemmove(§->u.indirect.dir_rows[0], §->u.indirect.dir_rows[peer_dir_nrows], - (sizeof(H5HF_free_section_t *) * (sect->u.indirect.dir_nrows - peer_dir_nrows))); + memmove(§->u.indirect.dir_rows[0], §->u.indirect.dir_rows[peer_dir_nrows], + (sizeof(H5HF_free_section_t *) * (sect->u.indirect.dir_nrows - peer_dir_nrows))); sect->u.indirect.dir_nrows -= peer_dir_nrows; assert(row_sect == sect->u.indirect.dir_rows[0]); @@ -2991,8 +2991,8 @@ H5HF__sect_indirect_reduce(H5HF_hdr_t *hdr, H5HF_free_section_t *sect, unsigned /* Adjust indirect entry information */ sect->u.indirect.indir_nents--; - HDmemmove(§->u.indirect.indir_ents[0], §->u.indirect.indir_ents[1], - sect->u.indirect.indir_nents * sizeof(H5HF_free_section_t *)); + memmove(§->u.indirect.indir_ents[0], §->u.indirect.indir_ents[1], + sect->u.indirect.indir_nents * sizeof(H5HF_free_section_t *)); assert(sect->u.indirect.indir_ents[0]); /* Make new "first row" in new first indirect child section */ diff --git a/src/H5HFtiny.c b/src/H5HFtiny.c index fb656c0..7453489 100644 --- a/src/H5HFtiny.c +++ b/src/H5HFtiny.c @@ -152,7 +152,7 @@ H5HF__tiny_insert(H5HF_hdr_t *hdr, size_t obj_size, const void *obj, void *_id) } /* end else */ H5MM_memcpy(id, obj, obj_size); - HDmemset(id + obj_size, 0, (hdr->id_len - ((size_t)1 + (size_t)hdr->tiny_len_extended + obj_size))); + memset(id + obj_size, 0, (hdr->id_len - ((size_t)1 + (size_t)hdr->tiny_len_extended + obj_size))); /* Update statistics about heap */ hdr->tiny_size += obj_size; @@ -142,7 +142,7 @@ H5HG__create(H5F_t *f, size_t size) if (NULL == (heap->chunk = H5FL_BLK_MALLOC(gheap_chunk, size))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, HADDR_UNDEF, "memory allocation failed") - HDmemset(heap->chunk, 0, size); + memset(heap->chunk, 0, size); heap->nalloc = H5HG_NOBJS(f, size); heap->nused = 1; /* account for index 0, which is used for the free object */ if (NULL == (heap->obj = H5FL_SEQ_MALLOC(H5HG_obj_t, heap->nalloc))) @@ -303,7 +303,7 @@ H5HG__alloc(H5F_t *f, H5HG_heap_t *heap, size_t size, unsigned *heap_flags_ptr) HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, 0, "memory allocation failed") /* Clear newly allocated space */ - HDmemset(&new_obj[heap->nalloc], 0, (new_alloc - heap->nalloc) * sizeof(heap->obj[0])); + memset(&new_obj[heap->nalloc], 0, (new_alloc - heap->nalloc) * sizeof(heap->obj[0])); /* Update heap information */ heap->nalloc = new_alloc; @@ -401,7 +401,7 @@ H5HG_extend(H5F_t *f, haddr_t addr, size_t need) /* Re-allocate the heap information in memory */ if (NULL == (new_chunk = H5FL_BLK_REALLOC(gheap_chunk, heap->chunk, (heap->size + need)))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "new heap allocation failed") - HDmemset(new_chunk + heap->size, 0, need); + memset(new_chunk + heap->size, 0, need); /* Adjust the size of the heap */ old_size = heap->size; @@ -745,7 +745,7 @@ H5HG_remove(H5F_t *f, H5HG_t *hobj) } /* end if */ else heap->obj[0].size += need; - HDmemmove(obj_start, obj_start + need, heap->size - (size_t)((obj_start + need) - heap->chunk)); + memmove(obj_start, obj_start + need, heap->size - (size_t)((obj_start + need) - heap->chunk)); if (heap->obj[0].size >= H5HG_SIZEOF_OBJHDR(f)) { p = heap->obj[0].begin; UINT16ENCODE(p, 0); /*id*/ @@ -753,7 +753,7 @@ H5HG_remove(H5F_t *f, H5HG_t *hobj) UINT32ENCODE(p, 0); /*reserved*/ H5F_ENCODE_LENGTH(f, p, heap->obj[0].size); } /* end if */ - HDmemset(heap->obj + hobj->idx, 0, sizeof(H5HG_obj_t)); + memset(heap->obj + hobj->idx, 0, sizeof(H5HG_obj_t)); flags |= H5AC__DIRTIED_FLAG; if ((heap->obj[0].size + H5HG_SIZEOF_HDR(f)) == heap->size) { diff --git a/src/H5HGcache.c b/src/H5HGcache.c index 8465537..0872412 100644 --- a/src/H5HGcache.c +++ b/src/H5HGcache.c @@ -116,7 +116,7 @@ H5HG__hdr_deserialize(H5HG_heap_t *heap, const uint8_t *image, size_t len, const /* Magic number */ if (H5_IS_BUFFER_OVERFLOW(image, H5_SIZEOF_MAGIC, p_end)) HGOTO_ERROR(H5E_HEAP, H5E_OVERFLOW, FAIL, "ran off end of input buffer while decoding"); - if (HDmemcmp(image, H5HG_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) + if (memcmp(image, H5HG_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, FAIL, "bad global heap collection signature") image += H5_SIZEOF_MAGIC; @@ -312,7 +312,7 @@ H5HG__cache_heap_deserialize(const void *_image, size_t len, void *_udata, hbool HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") /* Clear newly allocated space */ - HDmemset(&new_obj[heap->nalloc], 0, (new_alloc - heap->nalloc) * sizeof(heap->obj[0])); + memset(&new_obj[heap->nalloc], 0, (new_alloc - heap->nalloc) * sizeof(heap->obj[0])); /* Update heap information */ heap->nalloc = new_alloc; @@ -695,7 +695,7 @@ H5HL_insert(H5F_t *f, H5HL_t *heap, size_t buf_size, const void *buf, size_t *of /* Clear new section so junk doesn't appear in the file */ /* (Avoid clearing section which will be overwritten with newly inserted data) */ - HDmemset(heap->dblk_image + offset + buf_size, 0, (new_dblk_size - (offset + buf_size))); + memset(heap->dblk_image + offset + buf_size, 0, (new_dblk_size - (offset + buf_size))); } /* Copy the data into the heap */ diff --git a/src/H5HLcache.c b/src/H5HLcache.c index 87a9d8e..115062f 100644 --- a/src/H5HLcache.c +++ b/src/H5HLcache.c @@ -158,7 +158,7 @@ H5HL__hdr_deserialize(H5HL_t *heap, const uint8_t *image, size_t len, H5HL_cache /* Magic number */ if (H5_IS_BUFFER_OVERFLOW(image, H5_SIZEOF_MAGIC, p_end)) HGOTO_ERROR(H5E_HEAP, H5E_OVERFLOW, FAIL, "ran off end of input buffer while decoding"); - if (HDmemcmp(image, H5HL_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) + if (memcmp(image, H5HL_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) HGOTO_ERROR(H5E_HEAP, H5E_BADVALUE, FAIL, "bad local heap signature") image += H5_SIZEOF_MAGIC; @@ -355,7 +355,7 @@ H5HL__cache_prefix_get_final_load_size(const void *_image, size_t image_len, voi assert(actual_len); assert(*actual_len == image_len); - HDmemset(&heap, 0, sizeof(H5HL_t)); + memset(&heap, 0, sizeof(H5HL_t)); /* Deserialize the heap's header */ if (H5HL__hdr_deserialize(&heap, (const uint8_t *)image, image_len, udata) < 0) @@ -574,7 +574,7 @@ H5HL__cache_prefix_serialize(const H5_ATTR_NDEBUG_UNUSED H5F_t *f, void *_image, * the prefix and the data block due to alignment constraints. */ gap = heap->prfx_size - (size_t)(image - (uint8_t *)_image); - HDmemset(image, 0, gap); + memset(image, 0, gap); image += gap; } @@ -592,7 +592,7 @@ H5HL__cache_prefix_serialize(const H5_ATTR_NDEBUG_UNUSED H5F_t *f, void *_image, assert((size_t)(image - (uint8_t *)_image) <= len); /* Clear rest of local heap */ - HDmemset(image, 0, len - (size_t)(image - (uint8_t *)_image)); + memset(image, 0, len - (size_t)(image - (uint8_t *)_image)); } FUNC_LEAVE_NOAPI(SUCCEED) diff --git a/src/H5Lint.c b/src/H5Lint.c index 628464c..d6da518 100644 --- a/src/H5Lint.c +++ b/src/H5Lint.c @@ -379,7 +379,7 @@ H5L_unregister(H5L_type_t id) /* Remove filter from table */ /* Don't worry about shrinking table size (for now) */ - HDmemmove(&H5L_table_g[i], &H5L_table_g[i + 1], sizeof(H5L_class_t) * ((H5L_table_used_g - 1) - i)); + memmove(&H5L_table_g[i], &H5L_table_g[i + 1], sizeof(H5L_class_t) * ((H5L_table_used_g - 1) - i)); H5L_table_used_g--; done: @@ -624,7 +624,7 @@ done: H5O_loc_t oloc; /* Object location for created object */ /* Set up object location */ - HDmemset(&oloc, 0, sizeof(oloc)); + memset(&oloc, 0, sizeof(oloc)); oloc.file = grp_loc->oloc->file; oloc.addr = udata->lnk->u.hard.addr; @@ -195,7 +195,7 @@ H5MF_init_merge_flags(H5F_shared_t *f_sh) switch (mapping_type) { case H5MF_AGGR_MERGE_SEPARATE: /* Don't merge any metadata together */ - HDmemset(f_sh->fs_aggr_merge, 0, sizeof(f_sh->fs_aggr_merge)); + memset(f_sh->fs_aggr_merge, 0, sizeof(f_sh->fs_aggr_merge)); /* Check if merging raw data should be allowed */ /* (treat global heaps as raw data) */ @@ -208,7 +208,7 @@ H5MF_init_merge_flags(H5F_shared_t *f_sh) case H5MF_AGGR_MERGE_DICHOTOMY: /* Merge all metadata together (but not raw data) */ - HDmemset(f_sh->fs_aggr_merge, H5F_FS_MERGE_METADATA, sizeof(f_sh->fs_aggr_merge)); + memset(f_sh->fs_aggr_merge, H5F_FS_MERGE_METADATA, sizeof(f_sh->fs_aggr_merge)); /* Allow merging raw data allocations together */ /* (treat global heaps as raw data) */ @@ -218,8 +218,8 @@ H5MF_init_merge_flags(H5F_shared_t *f_sh) case H5MF_AGGR_MERGE_TOGETHER: /* Merge all allocation types together */ - HDmemset(f_sh->fs_aggr_merge, (H5F_FS_MERGE_METADATA | H5F_FS_MERGE_RAWDATA), - sizeof(f_sh->fs_aggr_merge)); + memset(f_sh->fs_aggr_merge, (H5F_FS_MERGE_METADATA | H5F_FS_MERGE_RAWDATA), + sizeof(f_sh->fs_aggr_merge)); break; default: @@ -2568,8 +2568,8 @@ H5MF_settle_raw_data_fsm(H5F_t *f, hbool_t *fsm_settled) assert(fsm_settled); /* Initialize structs */ - HDmemset(&fsinfo, 0, sizeof(fsinfo)); - HDmemset(&fs_stat, 0, sizeof(fs_stat)); + memset(&fsinfo, 0, sizeof(fsinfo)); + memset(&fs_stat, 0, sizeof(fs_stat)); /* * Only need to settle things if we are persisting free space and @@ -2591,8 +2591,8 @@ H5MF_settle_raw_data_fsm(H5F_t *f, hbool_t *fsm_settled) assert(f->shared->sblock->super_vers >= HDF5_SUPERBLOCK_VERSION_2); /* Initialize fsm_opened and fsm_visited */ - HDmemset(fsm_opened, 0, sizeof(fsm_opened)); - HDmemset(fsm_visited, 0, sizeof(fsm_visited)); + memset(fsm_opened, 0, sizeof(fsm_opened)); + memset(fsm_visited, 0, sizeof(fsm_visited)); /* 1) Reduce the EOA to the extent possible. */ @@ -308,7 +308,7 @@ H5MM_memcpy(void *dest, const void *src, size_t n) assert((char *)dest >= (const char *)src + n || (const char *)src >= (char *)dest + n); /* Copy */ - ret = HDmemcpy(dest, src, n); + ret = memcpy(dest, src, n); FUNC_LEAVE_NOAPI(ret) diff --git a/src/H5Oalloc.c b/src/H5Oalloc.c index f6c1b21..79c8b10 100644 --- a/src/H5Oalloc.c +++ b/src/H5Oalloc.c @@ -149,9 +149,9 @@ H5O__add_gap(H5F_t H5_ATTR_NDEBUG_UNUSED *f, H5O_t *oh, unsigned chunkno, hbool_ oh->mesg[u].raw -= new_gap_size; /* Slide raw message info forward in chunk image */ - HDmemmove(new_gap_loc, new_gap_loc + new_gap_size, - (size_t)((oh->chunk[chunkno].image + (oh->chunk[chunkno].size - H5O_SIZEOF_CHKSUM_OH(oh))) - - (new_gap_loc + new_gap_size))); + memmove(new_gap_loc, new_gap_loc + new_gap_size, + (size_t)((oh->chunk[chunkno].image + (oh->chunk[chunkno].size - H5O_SIZEOF_CHKSUM_OH(oh))) - + (new_gap_loc + new_gap_size))); /* Add existing gap size to new gap size */ new_gap_size += oh->chunk[chunkno].gap; @@ -179,7 +179,7 @@ H5O__add_gap(H5F_t H5_ATTR_NDEBUG_UNUSED *f, H5O_t *oh, unsigned chunkno, hbool_ /* Zero out new null message's raw data */ if (null_msg->raw_size) - HDmemset(null_msg->raw, 0, null_msg->raw_size); + memset(null_msg->raw, 0, null_msg->raw_size); /* Mark message as dirty */ null_msg->dirty = TRUE; @@ -265,10 +265,10 @@ H5O__eliminate_gap(H5O_t *oh, hbool_t *chk_dirtied, H5O_mesg_t *mesg, uint8_t *g /* Slide raw message info in chunk image */ if (null_before_gap) /* Slide messages down */ - HDmemmove(move_start + gap_size, move_start, (size_t)(move_end - move_start)); + memmove(move_start + gap_size, move_start, (size_t)(move_end - move_start)); else { /* Slide messages up */ - HDmemmove(move_start - gap_size, move_start, (size_t)(move_end - move_start)); + memmove(move_start - gap_size, move_start, (size_t)(move_end - move_start)); /* Adjust start of null message */ mesg->raw -= gap_size; @@ -276,14 +276,14 @@ H5O__eliminate_gap(H5O_t *oh, hbool_t *chk_dirtied, H5O_mesg_t *mesg, uint8_t *g } else if (move_end == move_start && !null_before_gap) { /* Slide null message up */ - HDmemmove(move_start - gap_size, move_start, mesg->raw_size + (size_t)H5O_SIZEOF_MSGHDR_OH(oh)); + memmove(move_start - gap_size, move_start, mesg->raw_size + (size_t)H5O_SIZEOF_MSGHDR_OH(oh)); /* Adjust start of null message */ mesg->raw -= gap_size; } /* end if */ /* Zero out addition to null message */ - HDmemset(mesg->raw + mesg->raw_size, 0, gap_size); + memset(mesg->raw + mesg->raw_size, 0, gap_size); /* Adjust size of null message */ mesg->raw_size += gap_size; @@ -440,7 +440,7 @@ H5O__alloc_msgs(H5O_t *oh, size_t min_alloc) oh->mesg = new_mesg; /* Set new object header info to zeros */ - HDmemset(&oh->mesg[old_alloc], 0, (oh->alloc_nmesgs - old_alloc) * sizeof(H5O_mesg_t)); + memset(&oh->mesg[old_alloc], 0, (oh->alloc_nmesgs - old_alloc) * sizeof(H5O_mesg_t)); done: FUNC_LEAVE_NOAPI(ret_value) @@ -615,13 +615,13 @@ H5O__alloc_extend_chunk(H5F_t *f, H5O_t *oh, unsigned chunkno, size_t size, size oh->chunk[chunkno].gap = 0; /* Wipe new space for chunk */ - HDmemset(oh->chunk[chunkno].image + old_size, 0, oh->chunk[chunkno].size - old_size); + memset(oh->chunk[chunkno].image + old_size, 0, oh->chunk[chunkno].size - old_size); /* Move chunk 0 data up if the size flags changed */ if (adjust_size_flags) - HDmemmove(oh->chunk[0].image + H5O_SIZEOF_HDR(oh) - H5O_SIZEOF_CHKSUM_OH(oh), - oh->chunk[0].image + H5O_SIZEOF_HDR(oh) - H5O_SIZEOF_CHKSUM_OH(oh) - extra_prfx_size, - old_size - (size_t)H5O_SIZEOF_HDR(oh) + extra_prfx_size); + memmove(oh->chunk[0].image + H5O_SIZEOF_HDR(oh) - H5O_SIZEOF_CHKSUM_OH(oh), + oh->chunk[0].image + H5O_SIZEOF_HDR(oh) - H5O_SIZEOF_CHKSUM_OH(oh) - extra_prfx_size, + old_size - (size_t)H5O_SIZEOF_HDR(oh) + extra_prfx_size); /* Spin through existing messages, adjusting them */ for (u = 0; u < oh->nmesgs; u++) { @@ -940,7 +940,7 @@ H5O__alloc_chunk(H5F_t *f, H5O_t *oh, size_t size, size_t found_null, const H5O_ if (curr_msg->type->id == H5O_NULL_ID) { /* Delete the null message */ if (u < oh->nmesgs - 1) - HDmemmove(curr_msg, curr_msg + 1, ((oh->nmesgs - 1) - u) * sizeof(H5O_mesg_t)); + memmove(curr_msg, curr_msg + 1, ((oh->nmesgs - 1) - u) * sizeof(H5O_mesg_t)); oh->nmesgs--; } /* end if */ else { @@ -1036,8 +1036,8 @@ H5O__alloc_chunk(H5F_t *f, H5O_t *oh, size_t size, size_t found_null, const H5O_ /* Remove null message from list of messages */ if (found_msg->null_msgno < (oh->nmesgs - 1)) - HDmemmove(old_null_msg, old_null_msg + 1, - ((oh->nmesgs - 1) - found_msg->null_msgno) * sizeof(H5O_mesg_t)); + memmove(old_null_msg, old_null_msg + 1, + ((oh->nmesgs - 1) - found_msg->null_msgno) * sizeof(H5O_mesg_t)); /* Decrement # of messages */ /* (Don't bother reducing size of message array for now -QAK) */ @@ -1347,7 +1347,7 @@ H5O__release_mesg(H5F_t *f, H5O_t *oh, H5O_mesg_t *mesg, hbool_t adj_link) mesg->type = H5O_MSG_NULL; assert(mesg->raw + mesg->raw_size <= (oh->chunk[mesg->chunkno].image + oh->chunk[mesg->chunkno].size) - (H5O_SIZEOF_CHKSUM_OH(oh) + oh->chunk[mesg->chunkno].gap)); - HDmemset(mesg->raw, 0, mesg->raw_size); + memset(mesg->raw, 0, mesg->raw_size); /* Clear message flags */ mesg->flags = 0; @@ -1498,8 +1498,8 @@ H5O__move_cont(H5F_t *f, H5O_t *oh, unsigned cont_u) /* Release any information/memory for continuation message */ H5O__msg_free_mesg(cont_msg); if (cont_u < (oh->nmesgs - 1)) - HDmemmove(&oh->mesg[cont_u], &oh->mesg[cont_u + 1], - ((oh->nmesgs - 1) - cont_u) * sizeof(H5O_mesg_t)); + memmove(&oh->mesg[cont_u], &oh->mesg[cont_u + 1], + ((oh->nmesgs - 1) - cont_u) * sizeof(H5O_mesg_t)); oh->nmesgs--; } /* end else */ @@ -1516,8 +1516,8 @@ H5O__move_cont(H5F_t *f, H5O_t *oh, unsigned cont_u) /* Remove from message list */ if (v < (oh->nmesgs - 1)) - HDmemmove(&oh->mesg[v], &oh->mesg[v + 1], - ((oh->nmesgs - 1) - v) * sizeof(H5O_mesg_t)); + memmove(&oh->mesg[v], &oh->mesg[v + 1], + ((oh->nmesgs - 1) - v) * sizeof(H5O_mesg_t)); oh->nmesgs--; } /* end if */ } /* end if */ @@ -1606,9 +1606,9 @@ H5O__move_msgs_forward(H5F_t *f, H5O_t *oh) "unable to load object header chunk") /* Copy raw data for non-null message to new location */ - HDmemmove(curr_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh), - nonnull_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh), - nonnull_msg->raw_size + (size_t)H5O_SIZEOF_MSGHDR_OH(oh)); + memmove(curr_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh), + nonnull_msg->raw - H5O_SIZEOF_MSGHDR_OH(oh), + nonnull_msg->raw_size + (size_t)H5O_SIZEOF_MSGHDR_OH(oh)); /* Adjust non-null message's offset in chunk */ nonnull_msg->raw = curr_msg->raw; @@ -2009,8 +2009,8 @@ H5O__merge_null(H5F_t *f, H5O_t *oh) /* Remove second message from list of messages */ if (v < (oh->nmesgs - 1)) - HDmemmove(&oh->mesg[v], &oh->mesg[v + 1], - ((oh->nmesgs - 1) - v) * sizeof(H5O_mesg_t)); + memmove(&oh->mesg[v], &oh->mesg[v + 1], + ((oh->nmesgs - 1) - v) * sizeof(H5O_mesg_t)); /* Decrement # of messages */ /* (Don't bother reducing size of message array for now -QAK) */ @@ -2148,8 +2148,8 @@ H5O__remove_empty_chunks(H5F_t *f, H5O_t *oh) /* Remove chunk from list of chunks */ if (null_msg->chunkno < (oh->nchunks - 1)) { - HDmemmove(&oh->chunk[null_msg->chunkno], &oh->chunk[null_msg->chunkno + 1], - ((oh->nchunks - 1) - null_msg->chunkno) * sizeof(H5O_chunk_t)); + memmove(&oh->chunk[null_msg->chunkno], &oh->chunk[null_msg->chunkno + 1], + ((oh->nchunks - 1) - null_msg->chunkno) * sizeof(H5O_chunk_t)); /* Adjust chunk number for any chunk proxies that are in the cache */ for (u = null_msg->chunkno; u < (oh->nchunks - 1); u++) { @@ -2182,8 +2182,8 @@ H5O__remove_empty_chunks(H5F_t *f, H5O_t *oh) /* Remove null message from list of messages */ if (null_msg_no < (oh->nmesgs - 1)) - HDmemmove(&oh->mesg[null_msg_no], &oh->mesg[null_msg_no + 1], - ((oh->nmesgs - 1) - null_msg_no) * sizeof(H5O_mesg_t)); + memmove(&oh->mesg[null_msg_no], &oh->mesg[null_msg_no + 1], + ((oh->nmesgs - 1) - null_msg_no) * sizeof(H5O_mesg_t)); /* Decrement # of messages */ /* (Don't bother reducing size of message array for now -QAK) */ @@ -2354,8 +2354,8 @@ H5O__alloc_shrink_chunk(H5F_t *f, H5O_t *oh, unsigned chunkno) uint8_t *src = curr_msg->raw + curr_msg->raw_size; /* Source location */ /* Slide down the raw data */ - HDmemmove(curr_msg->raw - sizeof_msghdr, src, - (size_t)(old_image + new_size - sizeof_chksum - src)); + memmove(curr_msg->raw - sizeof_msghdr, src, + (size_t)(old_image + new_size - sizeof_chksum - src)); /* Update the raw data pointers for messages after this one */ for (v = 0, curr_msg2 = &oh->mesg[0]; v < oh->nmesgs; v++, curr_msg2++) @@ -2371,7 +2371,7 @@ H5O__alloc_shrink_chunk(H5F_t *f, H5O_t *oh, unsigned chunkno) /* Remove the deleted null message from list of messages */ if (u < (oh->nmesgs - 1)) - HDmemmove(&oh->mesg[u], &oh->mesg[u + 1], ((oh->nmesgs - 1) - u) * sizeof(H5O_mesg_t)); + memmove(&oh->mesg[u], &oh->mesg[u + 1], ((oh->nmesgs - 1) - u) * sizeof(H5O_mesg_t)); /* Decrement # of messages */ /* (Don't bother reducing size of message array for now) */ @@ -2430,9 +2430,9 @@ H5O__alloc_shrink_chunk(H5F_t *f, H5O_t *oh, unsigned chunkno) oh->flags |= new_size_flags; /* Slide chunk 0 data down */ - HDmemmove(chunk->image + H5O_SIZEOF_HDR(oh) - sizeof_chksum, - chunk->image + H5O_SIZEOF_HDR(oh) - sizeof_chksum + less_prfx_size, - new_size - (size_t)H5O_SIZEOF_HDR(oh)); + memmove(chunk->image + H5O_SIZEOF_HDR(oh) - sizeof_chksum, + chunk->image + H5O_SIZEOF_HDR(oh) - sizeof_chksum + less_prfx_size, + new_size - (size_t)H5O_SIZEOF_HDR(oh)); /* Adjust chunk size */ new_size -= less_prfx_size; diff --git a/src/H5Oattr.c b/src/H5Oattr.c index 1a0255b..5dcf690 100644 --- a/src/H5Oattr.c +++ b/src/H5Oattr.c @@ -373,7 +373,7 @@ H5O__attr_encode(H5F_t *f, uint8_t *p, const void *mesg) H5MM_memcpy(p, attr->shared->name, name_len); if (attr->shared->version < H5O_ATTR_VERSION_2) { /* Pad to the correct number of bytes */ - HDmemset(p + name_len, 0, H5O_ALIGN_OLD(name_len) - name_len); + memset(p + name_len, 0, H5O_ALIGN_OLD(name_len) - name_len); p += H5O_ALIGN_OLD(name_len); } /* end if */ else @@ -384,7 +384,7 @@ H5O__attr_encode(H5F_t *f, uint8_t *p, const void *mesg) HGOTO_ERROR(H5E_ATTR, H5E_CANTENCODE, FAIL, "can't encode attribute datatype") if (attr->shared->version < H5O_ATTR_VERSION_2) { - HDmemset(p + attr->shared->dt_size, 0, H5O_ALIGN_OLD(attr->shared->dt_size) - attr->shared->dt_size); + memset(p + attr->shared->dt_size, 0, H5O_ALIGN_OLD(attr->shared->dt_size) - attr->shared->dt_size); p += H5O_ALIGN_OLD(attr->shared->dt_size); } /* end if */ else @@ -395,7 +395,7 @@ H5O__attr_encode(H5F_t *f, uint8_t *p, const void *mesg) HGOTO_ERROR(H5E_ATTR, H5E_CANTENCODE, FAIL, "can't encode attribute dataspace") if (attr->shared->version < H5O_ATTR_VERSION_2) { - HDmemset(p + attr->shared->ds_size, 0, H5O_ALIGN_OLD(attr->shared->ds_size) - attr->shared->ds_size); + memset(p + attr->shared->ds_size, 0, H5O_ALIGN_OLD(attr->shared->ds_size) - attr->shared->ds_size); p += H5O_ALIGN_OLD(attr->shared->ds_size); } /* end if */ else @@ -405,7 +405,7 @@ H5O__attr_encode(H5F_t *f, uint8_t *p, const void *mesg) if (attr->shared->data) H5MM_memcpy(p, attr->shared->data, attr->shared->data_size); else - HDmemset(p, 0, attr->shared->data_size); + memset(p, 0, attr->shared->data_size); done: FUNC_LEAVE_NOAPI(ret_value) diff --git a/src/H5Ocache.c b/src/H5Ocache.c index dd1a640..649b8d1 100644 --- a/src/H5Ocache.c +++ b/src/H5Ocache.c @@ -397,7 +397,7 @@ H5O__cache_serialize(const H5F_t *f, void *image, size_t len, void *_thing) chunk0_size = oh->chunk[0].size - (size_t)H5O_SIZEOF_HDR(oh); /* Verify magic number */ - assert(!HDmemcmp(chunk_image, H5O_HDR_MAGIC, H5_SIZEOF_MAGIC)); + assert(!memcmp(chunk_image, H5O_HDR_MAGIC, H5_SIZEOF_MAGIC)); chunk_image += H5_SIZEOF_MAGIC; /* Version */ @@ -468,7 +468,7 @@ H5O__cache_serialize(const H5F_t *f, void *image, size_t len, void *_thing) UINT32ENCODE(chunk_image, (oh->chunk[0].size - (size_t)H5O_SIZEOF_HDR(oh))); /* Zero to alignment */ - HDmemset(chunk_image, 0, (size_t)(H5O_SIZEOF_HDR(oh) - 12)); + memset(chunk_image, 0, (size_t)(H5O_SIZEOF_HDR(oh) - 12)); chunk_image += (size_t)(H5O_SIZEOF_HDR(oh) - 12); } @@ -705,8 +705,8 @@ H5O__cache_chk_deserialize(const void *image, size_t len, void *_udata, hbool_t /* Sanity check that the chunk representation we have in memory is * the same as the one being brought in from disk. */ - assert(0 == HDmemcmp(image, udata->oh->chunk[chk_proxy->chunkno].image, - udata->oh->chunk[chk_proxy->chunkno].size)); + assert(0 == memcmp(image, udata->oh->chunk[chk_proxy->chunkno].image, + udata->oh->chunk[chk_proxy->chunkno].size)); } /* Increment reference count of object header */ @@ -1002,7 +1002,7 @@ H5O__prefix_deserialize(const uint8_t *_image, size_t len, H5O_cache_ud_t *udata /* (indicates version 2 or later) */ if (H5_IS_BUFFER_OVERFLOW(image, H5_SIZEOF_MAGIC, p_end)) HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, FAIL, "ran off end of input buffer while decoding"); - if (!HDmemcmp(image, H5O_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { + if (!memcmp(image, H5O_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { /* Magic number (bounds checked above) */ image += H5_SIZEOF_MAGIC; @@ -1248,7 +1248,7 @@ H5O__chunk_deserialize(H5O_t *oh, haddr_t addr, size_t chunk_size, const uint8_t /* Magic number */ if (H5_IS_BUFFER_OVERFLOW(chunk_image, H5_SIZEOF_MAGIC, p_end)) HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, FAIL, "ran off end of input buffer while decoding"); - if (HDmemcmp(chunk_image, H5O_CHK_MAGIC, H5_SIZEOF_MAGIC) != 0) + if (memcmp(chunk_image, H5O_CHK_MAGIC, H5_SIZEOF_MAGIC) != 0) HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "wrong object header chunk signature") chunk_image += H5_SIZEOF_MAGIC; } @@ -1573,8 +1573,8 @@ H5O__chunk_serialize(const H5F_t *f, H5O_t *oh, unsigned chunkno) /* Sanity checks */ if (oh->version > H5O_VERSION_1) /* Make certain the magic # is present */ - assert(!HDmemcmp(oh->chunk[chunkno].image, (chunkno == 0 ? H5O_HDR_MAGIC : H5O_CHK_MAGIC), - H5_SIZEOF_MAGIC)); + assert(!memcmp(oh->chunk[chunkno].image, (chunkno == 0 ? H5O_HDR_MAGIC : H5O_CHK_MAGIC), + H5_SIZEOF_MAGIC)); else /* Gaps should never occur in version 1 of the format */ assert(oh->chunk[chunkno].gap == 0); @@ -1586,9 +1586,9 @@ H5O__chunk_serialize(const H5F_t *f, H5O_t *oh, unsigned chunkno) /* Check for gap in chunk & zero it out */ if (oh->chunk[chunkno].gap) - HDmemset((oh->chunk[chunkno].image + oh->chunk[chunkno].size) - - (H5O_SIZEOF_CHKSUM + oh->chunk[chunkno].gap), - 0, oh->chunk[chunkno].gap); + memset((oh->chunk[chunkno].image + oh->chunk[chunkno].size) - + (H5O_SIZEOF_CHKSUM + oh->chunk[chunkno].gap), + 0, oh->chunk[chunkno].gap); /* Compute metadata checksum */ metadata_chksum = diff --git a/src/H5Ochunk.c b/src/H5Ochunk.c index a05326f..d96940a 100644 --- a/src/H5Ochunk.c +++ b/src/H5Ochunk.c @@ -171,7 +171,7 @@ H5O__chunk_protect(H5F_t *f, H5O_t *oh, unsigned idx) /* Construct the user data for protecting chunk proxy */ /* (and _not_ decoding it) */ - HDmemset(&chk_udata, 0, sizeof(chk_udata)); + memset(&chk_udata, 0, sizeof(chk_udata)); chk_udata.oh = oh; chk_udata.chunkno = idx; chk_udata.size = oh->chunk[idx].size; @@ -307,7 +307,7 @@ H5O__chunk_update_idx(H5F_t *f, H5O_t *oh, unsigned idx) /* Construct the user data for protecting chunk proxy */ /* (and _not_ decoding it) */ - HDmemset(&chk_udata, 0, sizeof(chk_udata)); + memset(&chk_udata, 0, sizeof(chk_udata)); chk_udata.oh = oh; chk_udata.chunkno = idx; chk_udata.size = oh->chunk[idx].size; diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c index 3e72e83..f999642 100644 --- a/src/H5Ocopy.c +++ b/src/H5Ocopy.c @@ -344,7 +344,7 @@ H5O__copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out*/, H5 */ if (NULL == (deleted = (hbool_t *)H5MM_malloc(sizeof(hbool_t) * oh_src->nmesgs))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed") - HDmemset(deleted, FALSE, sizeof(hbool_t) * oh_src->nmesgs); + memset(deleted, FALSE, sizeof(hbool_t) * oh_src->nmesgs); /* "pre copy" pass over messages, to gather information for actual message copy operation * (for messages which depend on information from other messages) @@ -944,7 +944,7 @@ H5O__copy_header(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out */, hid_t assert(oloc_dst->file); /* Initialize copy info before errors can be thrown */ - HDmemset(&cpy_info, 0, sizeof(H5O_copy_t)); + memset(&cpy_info, 0, sizeof(H5O_copy_t)); /* Get the copy property list */ if (NULL == (ocpy_plist = (H5P_genplist_t *)H5I_object(ocpypl_id))) diff --git a/src/H5Ocopy_ref.c b/src/H5Ocopy_ref.c index a55caa0..6e21990 100644 --- a/src/H5Ocopy_ref.c +++ b/src/H5Ocopy_ref.c @@ -171,8 +171,8 @@ H5O__copy_expand_ref_object1(H5O_loc_t *src_oloc, const void *buf_src, H5O_loc_t H5O_token_t tmp_token = {0}; /* If data is not initialized, copy zeros and skip */ - if (0 == HDmemcmp(src_buf, zeros, buf_size)) - HDmemset(dst_buf, 0, buf_size); + if (0 == memcmp(src_buf, zeros, buf_size)) + memset(dst_buf, 0, buf_size); else { /* Set up for the object copy for the reference */ if (H5R__decode_token_obj_compat(src_buf, &buf_size, &tmp_token, token_size) < 0) @@ -234,8 +234,8 @@ H5O__copy_expand_ref_region1(H5O_loc_t *src_oloc, const void *buf_src, H5O_loc_t uint8_t *q; /* If data is not initialized, copy zeros and skip */ - if (0 == HDmemcmp(src_buf, zeros, buf_size)) - HDmemset(dst_buf, 0, buf_size); + if (0 == memcmp(src_buf, zeros, buf_size)) + memset(dst_buf, 0, buf_size); else { /* Read from heap */ if (H5R__decode_heap(src_oloc->file, src_buf, &buf_size, &data, &data_size) < 0) @@ -359,7 +359,7 @@ H5O__copy_expand_ref_object2(H5O_loc_t *src_oloc, hid_t tid_src, const H5T_t *dt H5R_ref_priv_t *ref = (H5R_ref_priv_t *)&ref_ptr[i]; /* Check for null reference - only expand reference if it is not null */ - if (HDmemcmp(ref, zeros, H5R_REF_BUF_SIZE)) { + if (memcmp(ref, zeros, H5R_REF_BUF_SIZE)) { H5O_token_t tmp_token = {0}; /* Get src object address */ diff --git a/src/H5Odbg.c b/src/H5Odbg.c index ce2667f..6fd7b32 100644 --- a/src/H5Odbg.c +++ b/src/H5Odbg.c @@ -112,7 +112,7 @@ H5O__assert(const H5O_t *oh) /* Version specific checks */ if (oh->version > H5O_VERSION_1) { /* Make certain that the magic number is correct for each chunk */ - assert(!HDmemcmp(oh->chunk[u].image, (u == 0 ? H5O_HDR_MAGIC : H5O_CHK_MAGIC), H5_SIZEOF_MAGIC)); + assert(!memcmp(oh->chunk[u].image, (u == 0 ? H5O_HDR_MAGIC : H5O_CHK_MAGIC), H5_SIZEOF_MAGIC)); /* Check for valid gap size */ assert(oh->chunk[u].gap < (size_t)H5O_SIZEOF_MSGHDR_OH(oh)); diff --git a/src/H5Odeprec.c b/src/H5Odeprec.c index 7088eca..ae45d16 100644 --- a/src/H5Odeprec.c +++ b/src/H5Odeprec.c @@ -94,7 +94,7 @@ H5O__reset_info1(H5O_info1_t *oinfo) FUNC_ENTER_PACKAGE_NOERR /* Reset the passed-in info struct */ - HDmemset(oinfo, 0, sizeof(H5O_info1_t)); + memset(oinfo, 0, sizeof(H5O_info1_t)); oinfo->type = H5O_TYPE_UNKNOWN; oinfo->addr = HADDR_UNDEF; diff --git a/src/H5Oint.c b/src/H5Oint.c index 839f4ae..78d72b5 100644 --- a/src/H5Oint.c +++ b/src/H5Oint.c @@ -994,7 +994,7 @@ H5O_protect(const H5O_loc_t *loc, unsigned prot_flags, hbool_t pin_all_chunks) udata.common.f = loc->file; udata.common.file_intent = file_intent; udata.common.merged_null_msgs = 0; - HDmemset(&cont_msg_info, 0, sizeof(cont_msg_info)); + memset(&cont_msg_info, 0, sizeof(cont_msg_info)); udata.common.cont_msg_info = &cont_msg_info; udata.common.addr = loc->addr; @@ -1777,7 +1777,7 @@ H5O_loc_reset(H5O_loc_t *loc) assert(loc); /* Clear the object location to an empty state */ - HDmemset(loc, 0, sizeof(H5O_loc_t)); + memset(loc, 0, sizeof(H5O_loc_t)); loc->addr = HADDR_UNDEF; FUNC_LEAVE_NOAPI(SUCCEED) @@ -1964,7 +1964,7 @@ H5O_get_hdr_info(const H5O_loc_t *loc, H5O_hdr_info_t *hdr) assert(hdr); /* Reset the object header info structure */ - HDmemset(hdr, 0, sizeof(*hdr)); + memset(hdr, 0, sizeof(*hdr)); /* Get the object header */ if (NULL == (oh = H5O_protect(loc, H5AC__READ_ONLY_FLAG, FALSE))) @@ -2196,7 +2196,7 @@ H5O_get_native_info(const H5O_loc_t *loc, H5O_native_info_t *oinfo, unsigned fie HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to determine object class") /* Reset the object info structure */ - HDmemset(oinfo, 0, sizeof(*oinfo)); + memset(oinfo, 0, sizeof(*oinfo)); /* Get the information for the object header, if requested */ if (fields & H5O_NATIVE_INFO_HDR) @@ -2625,7 +2625,7 @@ H5O__visit(H5G_loc_t *loc, const char *obj_name, H5_index_t idx_type, H5_iter_or FUNC_ENTER_PACKAGE /* Portably initialize user data struct to zeros */ - HDmemset(&udata, 0, sizeof(udata)); + memset(&udata, 0, sizeof(udata)); /* Check args */ assert(loc); @@ -2927,7 +2927,7 @@ H5O__reset_info2(H5O_info2_t *oinfo) FUNC_ENTER_PACKAGE_NOERR /* Reset the passed-in info struct */ - HDmemset(oinfo, 0, sizeof(H5O_info2_t)); + memset(oinfo, 0, sizeof(H5O_info2_t)); oinfo->type = H5O_TYPE_UNKNOWN; oinfo->token = H5O_TOKEN_UNDEF; diff --git a/src/H5Olayout.c b/src/H5Olayout.c index 93a5826..a49fa4d 100644 --- a/src/H5Olayout.c +++ b/src/H5Olayout.c @@ -815,7 +815,7 @@ H5O__layout_encode(H5F_t *f, hbool_t H5_ATTR_UNUSED disable_shared, uint8_t *p, if (mesg->storage.u.compact.buf) H5MM_memcpy(p, mesg->storage.u.compact.buf, mesg->storage.u.compact.size); else - HDmemset(p, 0, mesg->storage.u.compact.size); + memset(p, 0, mesg->storage.u.compact.size); p += mesg->storage.u.compact.size; } /* end if */ break; diff --git a/src/H5Omessage.c b/src/H5Omessage.c index 855c25d..ce53f32 100644 --- a/src/H5Omessage.c +++ b/src/H5Omessage.c @@ -557,7 +557,7 @@ H5O__msg_reset_real(const H5O_msg_class_t *type, void *native) HGOTO_ERROR(H5E_OHDR, H5E_CANTRELEASE, FAIL, "reset method failed") } /* end if */ else - HDmemset(native, 0, type->native_size); + memset(native, 0, type->native_size); } /* end if */ done: @@ -1529,7 +1529,7 @@ H5O_msg_reset_share(unsigned H5_ATTR_NDEBUG_UNUSED type_id, void *mesg) assert(mesg); /* Reset the shared component in the message to zero. */ - HDmemset((H5O_shared_t *)mesg, 0, sizeof(H5O_shared_t)); + memset((H5O_shared_t *)mesg, 0, sizeof(H5O_shared_t)); FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5O_msg_reset_share() */ diff --git a/src/H5Omtime.c b/src/H5Omtime.c index 5fba225..71a0974 100644 --- a/src/H5Omtime.c +++ b/src/H5Omtime.c @@ -188,7 +188,7 @@ H5O__mtime_decode(H5F_t H5_ATTR_NDEBUG_UNUSED *f, H5O_t H5_ATTR_UNUSED *open_oh, HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "badly formatted modification time message") /* Convert YYYYMMDDhhmmss UTC to a time_t. */ - HDmemset(&tm, 0, sizeof tm); + memset(&tm, 0, sizeof tm); tm.tm_year = (p[0] - '0') * 1000 + (p[1] - '0') * 100 + (p[2] - '0') * 10 + (p[3] - '0') - 1900; tm.tm_mon = (p[4] - '0') * 10 + (p[5] - '0') - 1; tm.tm_mday = (p[6] - '0') * 10 + (p[7] - '0'); diff --git a/src/H5Opline.c b/src/H5Opline.c index 9cd95a9..f944235 100644 --- a/src/H5Opline.c +++ b/src/H5Opline.c @@ -651,7 +651,7 @@ H5O__pline_debug(H5F_t H5_ATTR_UNUSED *f, const void *mesg, FILE *stream, int in */ char name[64]; - HDmemset(name, 0, 64); + memset(name, 0, 64); HDsnprintf(name, sizeof(name), "Filter at position %zu", i); fprintf(stream, "%*s%-*s\n", indent, "", fwidth, name); diff --git a/src/H5Opublic.h b/src/H5Opublic.h index d880a66..99e3715 100644 --- a/src/H5Opublic.h +++ b/src/H5Opublic.h @@ -94,7 +94,7 @@ //! <!-- [H5O_native_info_fields_snip] --> /* Convenience macro to check if the token is the 'undefined' token value */ -#define H5O_IS_TOKEN_UNDEF(token) (!HDmemcmp(&(token), &(H5O_TOKEN_UNDEF), sizeof(H5O_token_t))) +#define H5O_IS_TOKEN_UNDEF(token) (!memcmp(&(token), &(H5O_TOKEN_UNDEF), sizeof(H5O_token_t))) /*******************/ /* Public Typedefs */ diff --git a/src/H5Oshared.h b/src/H5Oshared.h index d10b298..aef49f0 100644 --- a/src/H5Oshared.h +++ b/src/H5Oshared.h @@ -308,7 +308,7 @@ H5O_SHARED_COPY_FILE(H5F_t *file_src, void *_native_src, H5F_t *file_dst, hbool_ #endif /* H5O_SHARED_COPY_FILE_REAL */ /* Reset shared message info for new message */ - HDmemset(dst_mesg, 0, sizeof(H5O_shared_t)); + memset(dst_mesg, 0, sizeof(H5O_shared_t)); /* Handle sharing destination message */ if (H5O__shared_copy_file(file_src, file_dst, H5O_SHARED_TYPE, _native_src, dst_mesg, recompute_size, @@ -1196,9 +1196,9 @@ H5PB_write(H5F_shared_t *f_sh, H5FD_mem_t type, haddr_t addr, size_t size, const if (NULL == (new_page_buf = H5FL_FAC_MALLOC(page_buf->page_fac))) HGOTO_ERROR(H5E_PAGEBUF, H5E_CANTALLOC, FAIL, "memory allocation failed for page buffer entry") - HDmemset(new_page_buf, 0, (size_t)offset); - HDmemset((uint8_t *)new_page_buf + offset + access_size, 0, - page_size - ((size_t)offset + access_size)); + memset(new_page_buf, 0, (size_t)offset); + memset((uint8_t *)new_page_buf + offset + access_size, 0, + page_size - ((size_t)offset + access_size)); page_entry->page_buf_ptr = new_page_buf; diff --git a/src/H5PLpath.c b/src/H5PLpath.c index 4cfa83e..72be116 100644 --- a/src/H5PLpath.c +++ b/src/H5PLpath.c @@ -359,7 +359,7 @@ H5PL__expand_path_table(void) HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "allocating additional memory for path table failed") /* Initialize the new memory */ - HDmemset(H5PL_paths_g + H5PL_num_paths_g, 0, (size_t)H5PL_PATH_CAPACITY_ADD * sizeof(char *)); + memset(H5PL_paths_g + H5PL_num_paths_g, 0, (size_t)H5PL_PATH_CAPACITY_ADD * sizeof(char *)); done: /* Set the path capacity back if there were problems */ diff --git a/src/H5PLplugin_cache.c b/src/H5PLplugin_cache.c index a120972..58b5b5b 100644 --- a/src/H5PLplugin_cache.c +++ b/src/H5PLplugin_cache.c @@ -186,7 +186,7 @@ H5PL__expand_cache(void) HGOTO_ERROR(H5E_PLUGIN, H5E_CANTALLOC, FAIL, "allocating additional memory for plugin cache failed") /* Initialize the new memory */ - HDmemset(H5PL_cache_g + H5PL_num_plugins_g, 0, (size_t)H5PL_CACHE_CAPACITY_ADD * sizeof(H5PL_plugin_t)); + memset(H5PL_cache_g + H5PL_num_plugins_g, 0, (size_t)H5PL_CACHE_CAPACITY_ADD * sizeof(H5PL_plugin_t)); done: /* Set the cache capacity back if there were problems */ diff --git a/src/H5Pdapl.c b/src/H5Pdapl.c index 52efa2e..2d3358b 100644 --- a/src/H5Pdapl.c +++ b/src/H5Pdapl.c @@ -1315,7 +1315,7 @@ H5Pset_append_flush(hid_t plist_id, unsigned ndims, const hsize_t *boundary, H5D info.func = func; info.udata = udata; - HDmemset(info.boundary, 0, sizeof(info.boundary)); + memset(info.boundary, 0, sizeof(info.boundary)); /* boundary can be 0 to indicate no boundary is set */ for (u = 0; u < ndims; u++) { if (boundary[u] != (boundary[u] & 0xffffffff)) /* negative value (including H5S_UNLIMITED) */ @@ -1365,7 +1365,7 @@ H5Pget_append_flush(hid_t plist_id, unsigned ndims, hsize_t boundary[], H5D_appe /* Assign return values */ if (boundary) { - HDmemset(boundary, 0, ndims * sizeof(hsize_t)); + memset(boundary, 0, ndims * sizeof(hsize_t)); if (info.ndims > 0) for (u = 0; u < info.ndims && u < ndims; u++) boundary[u] = info.boundary[u]; diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c index 32a04ee..1f226f9 100644 --- a/src/H5Pdcpl.c +++ b/src/H5Pdcpl.c @@ -1285,7 +1285,7 @@ H5P_fill_value_cmp(const void *_fill1, const void *_fill2, size_t H5_ATTR_UNUSED if (fill1->buf != NULL && fill2->buf == NULL) HGOTO_DONE(1); if (fill1->buf != NULL) - if ((cmp_value = HDmemcmp(fill1->buf, fill2->buf, (size_t)fill1->size)) != 0) + if ((cmp_value = memcmp(fill1->buf, fill2->buf, (size_t)fill1->size)) != 0) HGOTO_DONE(cmp_value); /* Check the allocation time for the fill values */ @@ -1932,7 +1932,7 @@ H5Pset_chunk(hid_t plist_id, int ndims, const hsize_t dim[/*ndims*/]) /* Verify & initialize property's chunk dims */ H5MM_memcpy(&chunk_layout, &H5D_def_layout_chunk_g, sizeof(H5D_def_layout_chunk_g)); - HDmemset(&chunk_layout.u.chunk.dim, 0, sizeof(chunk_layout.u.chunk.dim)); + memset(&chunk_layout.u.chunk.dim, 0, sizeof(chunk_layout.u.chunk.dim)); chunk_nelmts = 1; for (u = 0; u < (unsigned)ndims; u++) { if (dim[u] == 0) @@ -2096,7 +2096,7 @@ H5Pset_virtual(hid_t dcpl_id, hid_t vspace_id, const char *src_file_name, const /* Add virtual dataset mapping entry */ ent = &virtual_layout.storage.u.virt.list[virtual_layout.storage.u.virt.list_nused]; - HDmemset(ent, 0, sizeof(H5O_storage_virtual_ent_t)); /* Clear before starting to set up */ + memset(ent, 0, sizeof(H5O_storage_virtual_ent_t)); /* Clear before starting to set up */ if (NULL == (ent->source_dset.virtual_select = H5S_copy(vspace, FALSE, TRUE))) HGOTO_ERROR(H5E_PLIST, H5E_CANTCOPY, FAIL, "unable to copy virtual selection") if (NULL == (ent->source_file_name = H5MM_xstrdup(src_file_name))) @@ -3104,7 +3104,7 @@ H5P_get_fill_value(H5P_genplist_t *plist, const H5T_t *type, void *value /*out*/ /* Check for "default" fill value */ if (fill.size == 0) { - HDmemset(value, 0, H5T_get_size(type)); + memset(value, 0, H5T_get_size(type)); HGOTO_DONE(SUCCEED); } /* end if */ diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c index b8ea7cd..e6f2b0c 100644 --- a/src/H5Pfapl.c +++ b/src/H5Pfapl.c @@ -1932,7 +1932,7 @@ H5P__facc_file_driver_cmp(const void *_info1, const void *_info2, size_t H5_ATTR HGOTO_DONE(1); if (info1->driver_info) { assert(cls1->fapl_size > 0); - if (0 != (cmp_value = HDmemcmp(info1->driver_info, info2->driver_info, cls1->fapl_size))) + if (0 != (cmp_value = memcmp(info1->driver_info, info2->driver_info, cls1->fapl_size))) HGOTO_DONE(cmp_value); } /* end if */ @@ -3709,7 +3709,7 @@ H5P__facc_file_image_info_cmp(const void *_info1, const void *_info2, size_t H5_ if (info1->buffer == NULL && info2->buffer != NULL) HGOTO_DONE(1) if (info1->buffer != NULL && info2->buffer != NULL) - ret_value = HDmemcmp(info1->buffer, info2->buffer, size); + ret_value = memcmp(info1->buffer, info2->buffer, size); done: FUNC_LEAVE_NOAPI(ret_value) diff --git a/src/H5Pgcpl.c b/src/H5Pgcpl.c index 1f6b681..c126ee3 100644 --- a/src/H5Pgcpl.c +++ b/src/H5Pgcpl.c @@ -545,7 +545,7 @@ H5P__gcrt_group_info_dec(const void **_pp, void *_value) FUNC_ENTER_PACKAGE_NOERR /* Set property to default value */ - HDmemset(ginfo, 0, sizeof(H5O_ginfo_t)); + memset(ginfo, 0, sizeof(H5O_ginfo_t)); *ginfo = H5G_def_ginfo_g; UINT32DECODE(*pp, ginfo->lheap_size_hint); @@ -635,7 +635,7 @@ H5P__gcrt_link_info_dec(const void **_pp, void *_value) HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "unsigned value can't be decoded") /* Set property to default value */ - HDmemset(linfo, 0, sizeof(H5O_linfo_t)); + memset(linfo, 0, sizeof(H5O_linfo_t)); *linfo = H5G_def_linfo_g; H5_DECODE_UNSIGNED(*pp, crt_order_flags); diff --git a/src/H5Pocpl.c b/src/H5Pocpl.c index dae1d58..773ed64 100644 --- a/src/H5Pocpl.c +++ b/src/H5Pocpl.c @@ -1396,7 +1396,7 @@ H5P__ocrt_pipeline_dec(const void **_pp, void *_value) nused = (size_t)enc_value; /* Set property default value */ - HDmemset(pline, 0, sizeof(H5O_pline_t)); + memset(pline, 0, sizeof(H5O_pline_t)); *pline = H5O_def_pline_g; for (u = 0; u < nused; u++) { @@ -146,7 +146,7 @@ H5Rcreate_object(hid_t loc_id, const char *name, hid_t oapl_id, H5R_ref_t *ref_p HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, FAIL, "unable to retrieve object token") /* Create the reference (do not pass filename, since file_id is attached) */ - HDmemset(ref_ptr, 0, H5R_REF_BUF_SIZE); + memset(ref_ptr, 0, H5R_REF_BUF_SIZE); if (H5R__create_object(&obj_token, cont_info.token_size, (H5R_ref_priv_t *)ref_ptr) < 0) HGOTO_ERROR(H5E_REFERENCE, H5E_CANTCREATE, FAIL, "unable to create object reference") @@ -247,7 +247,7 @@ H5Rcreate_region(hid_t loc_id, const char *name, hid_t space_id, hid_t oapl_id, HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, FAIL, "unable to retrieve object token") /* Create the reference (do not pass filename, since file_id is attached) */ - HDmemset(ref_ptr, 0, H5R_REF_BUF_SIZE); + memset(ref_ptr, 0, H5R_REF_BUF_SIZE); if (H5R__create_region((const H5O_token_t *)&obj_token, cont_info.token_size, space, (H5R_ref_priv_t *)ref_ptr) < 0) HGOTO_ERROR(H5E_REFERENCE, H5E_CANTCREATE, FAIL, "unable to create region reference") @@ -345,7 +345,7 @@ H5Rcreate_attr(hid_t loc_id, const char *name, const char *attr_name, hid_t oapl HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, FAIL, "unable to retrieve object token") /* Create the reference (do not pass filename, since file_id is attached) */ - HDmemset(ref_ptr, 0, H5R_REF_BUF_SIZE); + memset(ref_ptr, 0, H5R_REF_BUF_SIZE); if (H5R__create_attr((const H5O_token_t *)&obj_token, cont_info.token_size, attr_name, (H5R_ref_priv_t *)ref_ptr) < 0) HGOTO_ERROR(H5E_REFERENCE, H5E_CANTCREATE, FAIL, "unable to create attribute reference") @@ -387,7 +387,7 @@ H5Rdestroy(H5R_ref_t *ref_ptr) HGOTO_ERROR(H5E_REFERENCE, H5E_CANTFREE, FAIL, "unable to destroy reference") /* Memset back to 0 for safety */ - HDmemset(ref_ptr, 0, H5R_REF_BUF_SIZE); + memset(ref_ptr, 0, H5R_REF_BUF_SIZE); done: FUNC_LEAVE_API(ret_value) @@ -124,7 +124,7 @@ H5RS__xstrdup(H5RS_str_t *rs, const char *s) if (NULL == (rs->s = (char *)H5FL_BLK_MALLOC(str_buf, rs->max))) HGOTO_ERROR(H5E_RS, H5E_CANTALLOC, FAIL, "memory allocation failed") if (len) - HDmemcpy(rs->s, s, len); + memcpy(rs->s, s, len); rs->end = rs->s + len; *rs->end = '\0'; rs->len = len; @@ -430,7 +430,7 @@ H5RS_acat(H5RS_str_t *rs, const char *s) HGOTO_ERROR(H5E_RS, H5E_CANTRESIZE, FAIL, "can't resize ref-counted string buffer") /* Append the string */ - HDmemcpy(rs->end, s, len); + memcpy(rs->end, s, len); rs->end += len; *rs->end = '\0'; rs->len += len; @@ -479,7 +479,7 @@ H5RS_ancat(H5RS_str_t *rs, const char *s, size_t n) HGOTO_ERROR(H5E_RS, H5E_CANTRESIZE, FAIL, "can't resize ref-counted string buffer") /* Append the string */ - HDmemcpy(rs->end, s, n); + memcpy(rs->end, s, n); rs->end += n; *rs->end = '\0'; rs->len += n; diff --git a/src/H5Rdeprec.c b/src/H5Rdeprec.c index 733fa49..c0bce6e 100644 --- a/src/H5Rdeprec.c +++ b/src/H5Rdeprec.c @@ -195,7 +195,7 @@ H5R__encode_token_region_compat(H5F_t *f, const H5O_token_t *obj_token, size_t t /* Zero the heap ID out, may leak heap space if user is re-using * reference and doesn't have garbage collection turned on */ - HDmemset(buf, 0, buf_size); + memset(buf, 0, buf_size); /* Get the amount of space required to serialize the selection */ if ((data_size = H5S_SELECT_SERIAL_SIZE(space)) < 0) diff --git a/src/H5Rint.c b/src/H5Rint.c index 2d7f893..53375a7 100644 --- a/src/H5Rint.c +++ b/src/H5Rint.c @@ -575,7 +575,7 @@ H5R__equal(const H5R_ref_priv_t *ref1, const H5R_ref_priv_t *ref2) /* Compare object addresses */ if (ref1->token_size != ref2->token_size) HGOTO_DONE(FALSE); - if (0 != HDmemcmp(&ref1->info.obj.token, &ref2->info.obj.token, ref1->token_size)) + if (0 != memcmp(&ref1->info.obj.token, &ref2->info.obj.token, ref1->token_size)) HGOTO_DONE(FALSE); /* Compare filenames */ @@ -1104,7 +1104,7 @@ H5R__decode_obj_token(const unsigned char *buf, size_t *nbytes, H5O_token_t *obj HGOTO_ERROR(H5E_REFERENCE, H5E_CANTDECODE, FAIL, "Invalid token size (%u)", *token_size) /* Make sure that token is initialized */ - HDmemset(obj_token, 0, sizeof(H5O_token_t)); + memset(obj_token, 0, sizeof(H5O_token_t)); /* Decode token */ H5MM_memcpy(obj_token, p, *token_size); @@ -1259,7 +1259,7 @@ H5S_set_extent_simple(H5S_t *space, unsigned rank, const hsize_t *dims, const hs /* Selection related cleanup */ /* Set offset to zeros */ - HDmemset(space->select.offset, 0, sizeof(hsize_t) * space->extent.rank); + memset(space->select.offset, 0, sizeof(hsize_t) * space->extent.rank); space->select.offset_changed = FALSE; /* If the selection is 'all', update the number of elements selected */ @@ -475,7 +475,7 @@ H5SM__create_index(H5F_t *f, H5SM_index_header_t *header) } /* end else */ /* Create a heap to hold the shared messages that the list or B-tree will index */ - HDmemset(&fheap_cparam, 0, sizeof(fheap_cparam)); + memset(&fheap_cparam, 0, sizeof(fheap_cparam)); fheap_cparam.managed.width = H5O_FHEAP_MAN_WIDTH; fheap_cparam.managed.start_block_size = H5O_FHEAP_MAN_START_BLOCK_SIZE; fheap_cparam.managed.max_direct_size = H5O_FHEAP_MAN_MAX_DIRECT_SIZE; @@ -1354,7 +1354,7 @@ H5SM__write_mesg(H5F_t *f, H5O_t *open_oh, H5SM_index_header_t *header, hbool_t * shared message is serialized. -QAK */ if (defer) - HDmemset(&shared.u, 0, sizeof(shared.u)); + memset(&shared.u, 0, sizeof(shared.u)); #endif /* H5_USING_MEMCHECKER */ } /* end if */ else { @@ -1933,8 +1933,8 @@ H5SM_get_info(const H5O_loc_t *ext_loc, H5P_genplist_t *fc_plist) HGOTO_ERROR(H5E_SOHM, H5E_CANTGET, FAIL, "shared message info message not present") /* Portably initialize the arrays */ - HDmemset(index_flags, 0, sizeof(index_flags)); - HDmemset(minsizes, 0, sizeof(minsizes)); + memset(index_flags, 0, sizeof(index_flags)); + memset(minsizes, 0, sizeof(minsizes)); /* Set SOHM info from file */ H5F_SET_SOHM_ADDR(f, sohm_table.addr); diff --git a/src/H5SMcache.c b/src/H5SMcache.c index 5a23b05..d61cf4f 100644 --- a/src/H5SMcache.c +++ b/src/H5SMcache.c @@ -227,7 +227,7 @@ H5SM__cache_table_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED l assert(table->table_size == len); /* Check magic number */ - if (HDmemcmp(image, H5SM_TABLE_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) + if (memcmp(image, H5SM_TABLE_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) HGOTO_ERROR(H5E_SOHM, H5E_CANTLOAD, NULL, "bad SOHM table signature") image += H5_SIZEOF_MAGIC; @@ -537,7 +537,7 @@ H5SM__cache_list_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED le /* Allocate space for the SOHM list data structure */ if (NULL == (list = H5FL_MALLOC(H5SM_list_t))) HGOTO_ERROR(H5E_SOHM, H5E_NOSPACE, NULL, "memory allocation failed") - HDmemset(&list->cache_info, 0, sizeof(H5AC_info_t)); + memset(&list->cache_info, 0, sizeof(H5AC_info_t)); /* Allocate list in memory as an array*/ if (NULL == (list->messages = (H5SM_sohm_t *)H5FL_ARR_MALLOC(H5SM_sohm_t, udata->header->list_max))) @@ -545,7 +545,7 @@ H5SM__cache_list_deserialize(const void *_image, size_t H5_ATTR_NDEBUG_UNUSED le list->header = udata->header; /* Check magic number */ - if (HDmemcmp(image, H5SM_LIST_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) + if (memcmp(image, H5SM_LIST_MAGIC, (size_t)H5_SIZEOF_MAGIC) != 0) HGOTO_ERROR(H5E_SOHM, H5E_CANTLOAD, NULL, "bad SOHM list signature") image += H5_SIZEOF_MAGIC; @@ -670,7 +670,7 @@ H5SM__cache_list_serialize(const H5F_t *f, void *_image, size_t H5_ATTR_NDEBUG_U assert((size_t)(image - (uint8_t *)_image) <= list->header->list_size); /* Clear memory */ - HDmemset(image, 0, (list->header->list_size - (size_t)(image - (uint8_t *)_image))); + memset(image, 0, (list->header->list_size - (size_t)(image - (uint8_t *)_image))); done: FUNC_LEAVE_NOAPI(ret_value) diff --git a/src/H5SMmessage.c b/src/H5SMmessage.c index 720f122..26c8341 100644 --- a/src/H5SMmessage.c +++ b/src/H5SMmessage.c @@ -87,7 +87,7 @@ H5SM__compare_cb(const void *obj, size_t obj_len, void *_udata) udata->ret = -1; else /* Sizes are the same. Return result of memcmp */ - udata->ret = HDmemcmp(udata->key->encoding, obj, obj_len); + udata->ret = memcmp(udata->key->encoding, obj, obj_len); FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5SM__compare_cb() */ @@ -140,7 +140,7 @@ H5SM__compare_iter_op(H5O_t *oh, H5O_mesg_t *mesg /*in,out*/, unsigned sequence, "unable to encode object header message") assert(udata->key->encoding_size <= mesg->raw_size); - udata->ret = HDmemcmp(udata->key->encoding, mesg->raw, udata->key->encoding_size); + udata->ret = memcmp(udata->key->encoding, mesg->raw, udata->key->encoding_size); } /* end else */ /* Indicate that we found the message we were looking for */ diff --git a/src/H5Shyper.c b/src/H5Shyper.c index a419669..ccda208 100644 --- a/src/H5Shyper.c +++ b/src/H5Shyper.c @@ -3585,7 +3585,7 @@ H5S__hyper_get_version_enc_size(H5S_t *space, hsize_t block_count, uint32_t *ver FUNC_ENTER_PACKAGE /* Get bounding box for the selection */ - HDmemset(bounds_end, 0, sizeof(bounds_end)); + memset(bounds_end, 0, sizeof(bounds_end)); if (space->select.sel_info.hslab->unlim_dim < 0) /* ! H5S_UNLIMITED */ /* Get bounding box for the selection */ @@ -4302,7 +4302,7 @@ H5S__hyper_deserialize(H5S_t **space, const uint8_t **p, const size_t p_size, hb if (!*space) { /* Patch the rank of the allocated dataspace */ - HDmemset(dims, 0, (size_t)rank * sizeof(dims[0])); + memset(dims, 0, (size_t)rank * sizeof(dims[0])); if (H5S_set_extent_simple(tmp_space, rank, dims, NULL) < 0) HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "can't set dimensions") } /* end if */ @@ -5555,8 +5555,8 @@ H5S__hyper_spans_shape_same(const H5S_hyper_span_info_t *span_info1, const H5S_h assert(ndims > 0); /* Initialize arrays */ - HDmemset(offset, 0, sizeof(offset)); - HDmemset(rest_zeros, 0, sizeof(rest_zeros)); + memset(offset, 0, sizeof(offset)); + memset(rest_zeros, 0, sizeof(rest_zeros)); /* Check for an offset between the two selections */ span1 = span_info1->head; @@ -6834,7 +6834,7 @@ H5S__hyper_project_simple(const H5S_t *base_space, H5S_t *new_space, hsize_t *of hsize_t block[H5S_MAX_RANK]; /* Block selected in base dataspace */ /* Compute the offset for the down-projection */ - HDmemset(block, 0, sizeof(block)); + memset(block, 0, sizeof(block)); for (u = 0; u < (base_space->extent.rank - new_space->extent.rank); u++) block[u] = opt_diminfo[u].start; *offset = H5VM_array_offset(base_space->extent.rank, base_space->extent.size, block); @@ -6917,7 +6917,7 @@ H5S__hyper_project_simple(const H5S_t *base_space, H5S_t *new_space, hsize_t *of unsigned curr_dim; /* Current dimension being operated on */ /* Clear the block buffer */ - HDmemset(block, 0, sizeof(block)); + memset(block, 0, sizeof(block)); /* Advance down selected spans */ curr = base_space->select.sel_info.hslab->span_lst->head; @@ -7152,7 +7152,7 @@ H5S_hyper_normalize_offset(H5S_t *space, hssize_t *old_offset) HGOTO_ERROR(H5E_DATASPACE, H5E_CANTSET, FAIL, "can't adjust selection") /* Zero out the selection offset */ - HDmemset(space->select.offset, 0, sizeof(hssize_t) * space->extent.rank); + memset(space->select.offset, 0, sizeof(hssize_t) * space->extent.rank); /* Indicate that the offset was normalized */ ret_value = TRUE; @@ -11727,7 +11727,7 @@ H5S__hyper_project_intersection(H5S_t *src_space, H5S_t *dst_space, H5S_t *src_i /* Initialize udata */ /* We will use op_info[0] for nelem and op_info[1] for copied spans */ - HDmemset(&udata, 0, sizeof(udata)); + memset(&udata, 0, sizeof(udata)); udata.ds_span[0] = ds_span_info->head; udata.ds_low[0] = udata.ds_span[0]->low; udata.ss_rank = H5S_GET_EXTENT_NDIMS(src_space); @@ -11955,7 +11955,7 @@ H5S_hyper_clip_unlim(H5S_t *space, hsize_t clip_size) /* Last block is partial, need to construct compound selection */ /* Fill start with zeros */ - HDmemset(start, 0, sizeof(start)); + memset(start, 0, sizeof(start)); /* Set block to clip_size in unlimited dimension, H5S_MAX_SIZE in * others so only unlimited dimension is clipped */ diff --git a/src/H5Smpio.c b/src/H5Smpio.c index 29a6502..f304743 100644 --- a/src/H5Smpio.c +++ b/src/H5Smpio.c @@ -429,7 +429,7 @@ H5S__mpio_point_type(const H5S_t *space, size_t elmt_size, MPI_Datatype *new_typ MPI_Aint temp; temp = disp[u]; - HDmemmove(disp + m + 1, disp + m, (u - m) * sizeof(MPI_Aint)); + memmove(disp + m + 1, disp + m, (u - m) * sizeof(MPI_Aint)); disp[m] = temp; } /* end if */ (*permute)[u] = m; @@ -571,8 +571,8 @@ H5S__mpio_permute_type(H5S_t *space, size_t elmt_size, hsize_t **permute, MPI_Da if ((*permute)[u] != num_points) { MPI_Aint temp = disp[u]; - HDmemmove(disp + (*permute)[u] + 1, disp + (*permute)[u], - (u - (*permute)[u]) * sizeof(MPI_Aint)); + memmove(disp + (*permute)[u] + 1, disp + (*permute)[u], + (u - (*permute)[u]) * sizeof(MPI_Aint)); disp[(*permute)[u]] = temp; } /* end if */ diff --git a/src/H5Spoint.c b/src/H5Spoint.c index aafdcf7..50346ae 100644 --- a/src/H5Spoint.c +++ b/src/H5Spoint.c @@ -749,7 +749,7 @@ H5S_select_elements(H5S_t *space, H5S_seloper_t op, size_t num_elem, const hsize /* Set the bound box to the default value */ H5VM_array_fill(space->select.sel_info.pnt_lst->low_bounds, &tmp, sizeof(hsize_t), space->extent.rank); - HDmemset(space->select.sel_info.pnt_lst->high_bounds, 0, sizeof(hsize_t) * space->extent.rank); + memset(space->select.sel_info.pnt_lst->high_bounds, 0, sizeof(hsize_t) * space->extent.rank); } /* Add points to selection */ @@ -1051,7 +1051,7 @@ H5S__point_get_version_enc_size(const H5S_t *space, uint32_t *version, uint8_t * FUNC_ENTER_PACKAGE /* Get bounding box for the selection */ - HDmemset(bounds_end, 0, sizeof(bounds_end)); + memset(bounds_end, 0, sizeof(bounds_end)); if (H5S__point_bounds(space, bounds_start, bounds_end) < 0) HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't get selection bounds") @@ -1403,7 +1403,7 @@ H5S__point_deserialize(H5S_t **space, const uint8_t **p, const size_t p_size, hb if (!*space) { /* Patch the rank of the allocated dataspace */ - (void)HDmemset(dims, 0, (size_t)rank * sizeof(dims[0])); + (void)memset(dims, 0, (size_t)rank * sizeof(dims[0])); if (H5S_set_extent_simple(tmp_space, rank, dims, NULL) < 0) HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "can't set dimensions") } /* end if */ @@ -2282,7 +2282,7 @@ H5S__point_project_simple(const H5S_t *base_space, H5S_t *new_space, hsize_t *of rank_diff = base_space->extent.rank - new_space->extent.rank; /* Calculate offset of selection in projected buffer */ - HDmemset(block, 0, sizeof(block)); + memset(block, 0, sizeof(block)); H5MM_memcpy(block, base_space->select.sel_info.pnt_lst->head->pnt, sizeof(hsize_t) * rank_diff); *offset = H5VM_array_offset(base_space->extent.rank, base_space->extent.size, block); @@ -2338,7 +2338,7 @@ H5S__point_project_simple(const H5S_t *base_space, H5S_t *new_space, hsize_t *of new_node->next = NULL; /* Copy over the point's coordinates */ - HDmemset(new_node->pnt, 0, sizeof(hsize_t) * rank_diff); + memset(new_node->pnt, 0, sizeof(hsize_t) * rank_diff); H5MM_memcpy(&new_node->pnt[rank_diff], base_node->pnt, (base_space->extent.rank * sizeof(hsize_t))); diff --git a/src/H5Sselect.c b/src/H5Sselect.c index 071ff2c..1a06414 100644 --- a/src/H5Sselect.c +++ b/src/H5Sselect.c @@ -2227,7 +2227,7 @@ H5S_select_construct_projection(H5S_t *base_space, H5S_t **new_space_ptr, unsign */ if (H5S_GET_EXTENT_TYPE(base_space) == H5S_SIMPLE && base_space->select.offset_changed) { if (new_space_rank > base_space_rank) { - HDmemset(new_space->select.offset, 0, sizeof(new_space->select.offset[0]) * rank_diff); + memset(new_space->select.offset, 0, sizeof(new_space->select.offset[0]) * rank_diff); H5MM_memcpy(&new_space->select.offset[rank_diff], base_space->select.offset, sizeof(new_space->select.offset[0]) * base_space_rank); } /* end if */ @@ -2476,8 +2476,8 @@ H5S_select_project_intersection(H5S_t *src_space, H5S_t *dst_space, H5S_t *src_i /* Get source space bounds. Should be a single point. */ if (H5S_SELECT_BOUNDS(src_space, coords_start, coords_end) < 0) HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't get source space bounds") - assert(0 == HDmemcmp(coords_start, coords_end, - H5S_GET_EXTENT_NDIMS(src_space) * sizeof(coords_start[0]))); + assert(0 == memcmp(coords_start, coords_end, + H5S_GET_EXTENT_NDIMS(src_space) * sizeof(coords_start[0]))); /* Check for intersection */ if ((intersect = H5S_SELECT_INTERSECT_BLOCK(src_intersect_space, coords_start, coords_end)) < 0) @@ -2526,7 +2526,7 @@ H5T__register(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst, H5T_con (tmp_did = H5I_register(H5I_DATATYPE, H5T_copy(old_path->dst, H5T_COPY_ALL), FALSE)) < 0) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register data types for conv query") - HDmemset(&cdata, 0, sizeof cdata); + memset(&cdata, 0, sizeof cdata); cdata.command = H5T_CONV_INIT; if (conv->is_app) { if ((conv->u.app_func)(tmp_sid, tmp_did, &cdata, (size_t)0, (size_t)0, (size_t)0, NULL, NULL, @@ -2707,8 +2707,7 @@ H5T__unregister(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst, H5T_c if (func && func != soft->conv.u.app_func) continue; - HDmemmove(H5T_g.soft + i, H5T_g.soft + i + 1, - (size_t)(H5T_g.nsoft - (i + 1)) * sizeof(H5T_soft_t)); + memmove(H5T_g.soft + i, H5T_g.soft + i + 1, (size_t)(H5T_g.nsoft - (i + 1)) * sizeof(H5T_soft_t)); --H5T_g.nsoft; } /* end for */ } /* end if */ @@ -2733,8 +2732,8 @@ H5T__unregister(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst, H5T_c } /* end if */ else { /* Remove from table */ - HDmemmove(H5T_g.path + i, H5T_g.path + i + 1, - (size_t)(H5T_g.npaths - (i + 1)) * sizeof(H5T_path_t *)); + memmove(H5T_g.path + i, H5T_g.path + i + 1, + (size_t)(H5T_g.npaths - (i + 1)) * sizeof(H5T_path_t *)); --H5T_g.npaths; /* Shut down path */ @@ -3534,7 +3533,7 @@ H5T__complete_copy(H5T_t *new_dt, const H5T_t *old_dt, H5T_shared_t *reopened_fo } else { /* Empty enum */ - HDmemset(&new_dt->shared->u.enumer, 0, sizeof(H5T_enum_t)); + memset(&new_dt->shared->u.enumer, 0, sizeof(H5T_enum_t)); } break; @@ -4576,8 +4575,8 @@ H5T_cmp(const H5T_t *dt1, const H5T_t *dt2, hbool_t superset) idx = u; } /* end else */ - tmp = HDmemcmp((uint8_t *)dt1->shared->u.enumer.value + idx1[u] * base_size, - (uint8_t *)dt2->shared->u.enumer.value + idx2[idx] * base_size, base_size); + tmp = memcmp((uint8_t *)dt1->shared->u.enumer.value + idx1[u] * base_size, + (uint8_t *)dt2->shared->u.enumer.value + idx2[idx] * base_size, base_size); if (tmp < 0) HGOTO_DONE(-1); if (tmp > 0) @@ -5023,14 +5022,14 @@ H5T__path_find_real(const H5T_t *src, const H5T_t *dst, const char *name, H5T_co if (H5T_g.soft[i].conv.is_app) { if ((H5T_g.soft[i].conv.u.app_func)(src_id, dst_id, &(path->cdata), (size_t)0, (size_t)0, (size_t)0, NULL, NULL, H5CX_get_dxpl()) < 0) { - HDmemset(&(path->cdata), 0, sizeof(H5T_cdata_t)); + memset(&(path->cdata), 0, sizeof(H5T_cdata_t)); H5E_clear_stack(NULL); /*ignore the error*/ path_init_error = TRUE; } /* end if */ } /* end if */ else if ((H5T_g.soft[i].conv.u.lib_func)(src_id, dst_id, &(path->cdata), (size_t)0, (size_t)0, (size_t)0, NULL, NULL) < 0) { - HDmemset(&(path->cdata), 0, sizeof(H5T_cdata_t)); + memset(&(path->cdata), 0, sizeof(H5T_cdata_t)); H5E_clear_stack(NULL); /*ignore the error*/ path_init_error = TRUE; } /* end if */ @@ -5118,7 +5117,7 @@ H5T__path_find_real(const H5T_t *src, const H5T_t *dst, const char *name, H5T_co } /* end if */ if (cmp > 0) md++; - HDmemmove(H5T_g.path + md + 1, H5T_g.path + md, (size_t)(H5T_g.npaths - md) * sizeof(H5T_path_t *)); + memmove(H5T_g.path + md + 1, H5T_g.path + md, (size_t)(H5T_g.npaths - md) * sizeof(H5T_path_t *)); H5T_g.npaths++; H5T_g.path[md] = path; table = path; diff --git a/src/H5Tconv.c b/src/H5Tconv.c index 3cfdfbc..de43eec 100644 --- a/src/H5Tconv.c +++ b/src/H5Tconv.c @@ -2307,11 +2307,11 @@ H5T__conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, xbuf + src_memb->offset, xbkg + dst_memb->offset) < 0) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to convert compound datatype member") - HDmemmove(xbuf + offset, xbuf + src_memb->offset, dst_memb->size); + memmove(xbuf + offset, xbuf + src_memb->offset, dst_memb->size); offset += dst_memb->size; } /* end if */ else { - HDmemmove(xbuf + offset, xbuf + src_memb->offset, src_memb->size); + memmove(xbuf + offset, xbuf + src_memb->offset, src_memb->size); offset += src_memb->size; } /* end else */ } /* end for */ @@ -2341,7 +2341,7 @@ H5T__conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, } /* end if */ else offset -= dst_memb->size; - HDmemmove(xbkg + dst_memb->offset, xbuf + offset, dst_memb->size); + memmove(xbkg + dst_memb->offset, xbuf + offset, dst_memb->size); } /* end for */ assert(0 == offset); @@ -2361,7 +2361,7 @@ H5T__conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, * buffer. */ for (xbuf = buf, xbkg = bkg, elmtno = 0; elmtno < nelmts; elmtno++) { - HDmemmove(xbuf, xbkg, dst->shared->size); + memmove(xbuf, xbkg, dst->shared->size); xbuf += buf_stride ? buf_stride : dst->shared->size; xbkg += bkg_delta; } /* end for */ @@ -2552,7 +2552,7 @@ H5T__conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelm copy_size = priv->subset_info.copy_size; for (elmtno = 0; elmtno < nelmts; elmtno++) { - HDmemmove(xbkg, xbuf, copy_size); + memmove(xbkg, xbuf, copy_size); /* Update pointers */ xbuf += buf_stride; @@ -2582,14 +2582,14 @@ H5T__conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelm HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to convert compound datatype member") for (elmtno = 0; elmtno < nelmts; elmtno++) { - HDmemmove(xbkg, xbuf, dst_memb->size); + memmove(xbkg, xbuf, dst_memb->size); xbuf += buf_stride; xbkg += bkg_stride; } /* end for */ } /* end if */ else { for (xbuf = buf, elmtno = 0; elmtno < nelmts; elmtno++) { - HDmemmove(xbuf + offset, xbuf + src_memb->offset, src_memb->size); + memmove(xbuf + offset, xbuf + src_memb->offset, src_memb->size); xbuf += buf_stride; } /* end for */ offset += src_memb->size; @@ -2619,7 +2619,7 @@ H5T__conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelm HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to convert compound datatype member") for (elmtno = 0; elmtno < nelmts; elmtno++) { - HDmemmove(xbkg, xbuf, dst_memb->size); + memmove(xbkg, xbuf, dst_memb->size); xbuf += buf_stride; xbkg += bkg_stride; } /* end for */ @@ -2632,7 +2632,7 @@ H5T__conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelm /* Move background buffer into result buffer */ for (xbuf = buf, xbkg = bkg, elmtno = 0; elmtno < nelmts; elmtno++) { - HDmemmove(xbuf, xbkg, dst->shared->size); + memmove(xbuf, xbkg, dst->shared->size); xbuf += buf_stride; xbkg += bkg_stride; } /* end for */ @@ -2915,7 +2915,7 @@ H5T__conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, si cb_struct.user_data); if (except_ret == H5T_CONV_UNHANDLED) - HDmemset(d, 0xff, dst->shared->size); + memset(d, 0xff, dst->shared->size); else if (except_ret == H5T_CONV_ABORT) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception") @@ -2935,8 +2935,8 @@ H5T__conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, si while (lt < rt) { md = (lt + rt) / 2; - cmp = HDmemcmp(s, (uint8_t *)src->shared->u.enumer.value + (md * src->shared->size), - src->shared->size); + cmp = memcmp(s, (uint8_t *)src->shared->u.enumer.value + (md * src->shared->size), + src->shared->size); if (cmp < 0) rt = md; else if (cmp > 0) @@ -2952,7 +2952,7 @@ H5T__conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, si cb_struct.user_data); if (except_ret == H5T_CONV_UNHANDLED) - HDmemset(d, 0xff, dst->shared->size); + memset(d, 0xff, dst->shared->size); else if (except_ret == H5T_CONV_ABORT) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception") @@ -3318,7 +3318,7 @@ H5T__conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, si if (NULL == (conv_buf = H5FL_BLK_REALLOC(vlen_seq, conv_buf, conv_buf_size))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion") - HDmemset(conv_buf, 0, conv_buf_size); + memset(conv_buf, 0, conv_buf_size); } /* end else-if */ /* Read in VL sequence */ @@ -3336,7 +3336,7 @@ H5T__conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, si if (NULL == (tmp_buf = H5FL_BLK_REALLOC(vlen_seq, tmp_buf, tmp_buf_size))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion") - HDmemset(tmp_buf, 0, tmp_buf_size); + memset(tmp_buf, 0, tmp_buf_size); } /* end if */ /* If we are writing and there is a nested VL type, read @@ -3358,7 +3358,7 @@ H5T__conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, si (tmp_buf = H5FL_BLK_REALLOC(vlen_seq, tmp_buf, tmp_buf_size))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion") - HDmemset(tmp_buf, 0, tmp_buf_size); + memset(tmp_buf, 0, tmp_buf_size); } /* end if */ /* Read in background VL sequence */ @@ -3370,8 +3370,8 @@ H5T__conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, si /* If the sequence gets shorter, pad out the original sequence with zeros */ if (bg_seq_len < seq_len) - HDmemset((uint8_t *)tmp_buf + dst_base_size * bg_seq_len, 0, - (seq_len - bg_seq_len) * dst_base_size); + memset((uint8_t *)tmp_buf + dst_base_size * bg_seq_len, 0, + (seq_len - bg_seq_len) * dst_base_size); } /* end if */ /* Convert VL sequence */ @@ -3562,7 +3562,7 @@ H5T__conv_array(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, s /* Perform the actual conversion */ for (elmtno = 0; elmtno < nelmts; elmtno++) { /* Copy the source array into the correct location for the destination */ - HDmemmove(dp, sp, src->shared->size); + memmove(dp, sp, src->shared->size); /* Convert array */ if (H5T_convert(tpath, tsrc_id, tdst_id, src->shared->u.array.nelem, (size_t)0, bkg_stride, @@ -3752,7 +3752,7 @@ H5T__conv_ref(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, siz if (NULL == (conv_buf = H5FL_BLK_REALLOC(ref_seq, conv_buf, conv_buf_size))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for type conversion") - HDmemset(conv_buf, 0, conv_buf_size); + memset(conv_buf, 0, conv_buf_size); } /* end if */ if (dst_copy && (src->shared->u.atomic.u.r.loc == H5T_LOC_DISK)) @@ -8478,7 +8478,7 @@ next: dp += direction * (ssize_t)dst_p->shared->size; } - HDmemset(int_buf, 0, buf_size); + memset(int_buf, 0, buf_size); } break; @@ -8831,7 +8831,7 @@ H5T__conv_i_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, siz /*make destination infinity by setting exponent to maximal number and *mantissa to zero.*/ expo = expo_max; - HDmemset(int_buf, 0, buf_size); + memset(int_buf, 0, buf_size); } } @@ -8901,7 +8901,7 @@ padding: dp += direction * (ssize_t)dst_p->shared->size; } - HDmemset(int_buf, 0, buf_size); + memset(int_buf, 0, buf_size); } break; diff --git a/src/H5Tenum.c b/src/H5Tenum.c index 1e00ee1..fa083a6 100644 --- a/src/H5Tenum.c +++ b/src/H5Tenum.c @@ -173,8 +173,7 @@ H5T__enum_insert(const H5T_t *dt, const char *name, const void *value) for (i = 0; i < dt->shared->u.enumer.nmembs; i++) { if (!HDstrcmp(dt->shared->u.enumer.name[i], name)) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "name redefinition") - if (!HDmemcmp((uint8_t *)dt->shared->u.enumer.value + (i * dt->shared->size), value, - dt->shared->size)) + if (!memcmp((uint8_t *)dt->shared->u.enumer.value + (i * dt->shared->size), value, dt->shared->size)) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "value redefinition") } @@ -363,8 +362,8 @@ H5T__enum_nameof(const H5T_t *dt, const void *value, char *name /*out*/, size_t rt = copied_dt->shared->u.enumer.nmembs; while (lt < rt) { md = (lt + rt) / 2; - cmp = HDmemcmp(value, (uint8_t *)copied_dt->shared->u.enumer.value + (md * copied_dt->shared->size), - copied_dt->shared->size); + cmp = memcmp(value, (uint8_t *)copied_dt->shared->u.enumer.value + (md * copied_dt->shared->size), + copied_dt->shared->size); if (cmp < 0) rt = md; else if (cmp > 0) diff --git a/src/H5Tfields.c b/src/H5Tfields.c index 556e71c..fdeaac0 100644 --- a/src/H5Tfields.c +++ b/src/H5Tfields.c @@ -308,8 +308,8 @@ H5T__sort_value(const H5T_t *dt, int *map) assert(size <= sizeof(tbuf)); for (i = (nmembs - 1), swapped = TRUE; i > 0 && swapped; --i) { for (j = 0, swapped = FALSE; j < i; j++) { - if (HDmemcmp((uint8_t *)dt->shared->u.enumer.value + (j * size), - (uint8_t *)dt->shared->u.enumer.value + ((j + 1) * size), size) > 0) { + if (memcmp((uint8_t *)dt->shared->u.enumer.value + (j * size), + (uint8_t *)dt->shared->u.enumer.value + ((j + 1) * size), size) > 0) { /* Swap names */ char *tmp = dt->shared->u.enumer.name[j]; dt->shared->u.enumer.name[j] = dt->shared->u.enumer.name[j + 1]; @@ -336,8 +336,8 @@ H5T__sort_value(const H5T_t *dt, int *map) #ifndef NDEBUG /* I never trust a sort :-) -RPM */ for (i = 0; i < (nmembs - 1); i++) - assert(HDmemcmp((uint8_t *)dt->shared->u.enumer.value + (i * size), - (uint8_t *)dt->shared->u.enumer.value + ((i + 1) * size), size) < 0); + assert(memcmp((uint8_t *)dt->shared->u.enumer.value + (i * size), + (uint8_t *)dt->shared->u.enumer.value + ((i + 1) * size), size) < 0); #endif } /* end if */ } /* end else */ diff --git a/src/H5Tref.c b/src/H5Tref.c index aac3634..f0cdb29 100644 --- a/src/H5Tref.c +++ b/src/H5Tref.c @@ -303,7 +303,7 @@ H5T__ref_set_loc(H5T_t *dt, H5VL_object_t *file, H5T_loc_t loc) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "unable to get container info") /* Retrieve min encode size (when references have no vlen part) */ - HDmemset(&fixed_ref, 0, sizeof(fixed_ref)); + memset(&fixed_ref, 0, sizeof(fixed_ref)); fixed_ref.type = (int8_t)H5R_OBJECT2; fixed_ref.token_size = (uint8_t)cont_info.token_size; if (H5R__encode(NULL, &fixed_ref, NULL, &ref_encode_size, 0) < 0) @@ -370,7 +370,7 @@ H5T__ref_mem_isnull(const H5VL_object_t H5_ATTR_UNUSED *src_file, const void *sr assert(src_buf); assert(isnull); - *isnull = (0 == HDmemcmp(src_buf, zeros, H5T_REF_MEM_SIZE)) ? TRUE : FALSE; + *isnull = (0 == memcmp(src_buf, zeros, H5T_REF_MEM_SIZE)) ? TRUE : FALSE; FUNC_LEAVE_NOAPI(ret_value) } /* end H5T__ref_mem_isnull() */ @@ -392,7 +392,7 @@ H5T__ref_mem_setnull(H5VL_object_t H5_ATTR_UNUSED *dst_file, void *dst_buf, H5_A FUNC_ENTER_PACKAGE_NOERR H5T_REF_LOG_DEBUG(""); - HDmemset(dst_buf, 0, H5T_REF_MEM_SIZE); + memset(dst_buf, 0, H5T_REF_MEM_SIZE); FUNC_LEAVE_NOAPI(ret_value) } /* end H5T__ref_mem_setnull() */ @@ -682,7 +682,7 @@ H5T__ref_mem_write(H5VL_object_t *src_file, const void *src_buf, size_t src_size HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid VOL object") /* Make sure reference buffer is correctly initialized */ - HDmemset(&tmp_ref, 0, sizeof(tmp_ref)); + memset(&tmp_ref, 0, sizeof(tmp_ref)); switch (src_type) { case H5R_OBJECT1: { @@ -737,7 +737,7 @@ H5T__ref_mem_write(H5VL_object_t *src_file, const void *src_buf, size_t src_size } /* end if */ /* Set output info */ - HDmemcpy(dst_ref, &tmp_ref, sizeof(tmp_ref)); + memcpy(dst_ref, &tmp_ref, sizeof(tmp_ref)); done: if ((file_id != H5I_INVALID_HID) && (H5I_dec_ref(file_id) < 0)) @@ -840,7 +840,7 @@ H5T__ref_disk_setnull(H5VL_object_t *dst_file, void *dst_buf, void *bg_buf) } /* end if */ /* Copy header manually so that it does not get encoded into the blob */ - HDmemset(q, 0, H5R_ENCODE_HEADER_SIZE); + memset(q, 0, H5R_ENCODE_HEADER_SIZE); q += H5R_ENCODE_HEADER_SIZE; /* Set the size */ diff --git a/src/H5Tvlen.c b/src/H5Tvlen.c index 1da9d6c..121f6b0 100644 --- a/src/H5Tvlen.c +++ b/src/H5Tvlen.c @@ -367,7 +367,7 @@ H5T__vlen_mem_seq_getlen(H5VL_object_t H5_ATTR_UNUSED *file, const void *_vl, si /* Copy to ensure correct alignment. memcpy is best here because * it optimizes to fast code. */ - HDmemcpy(&vl, _vl, sizeof(hvl_t)); + memcpy(&vl, _vl, sizeof(hvl_t)); *len = vl.len; @@ -393,7 +393,7 @@ H5T__vlen_mem_seq_getptr(void *_vl) /* check parameters, return result */ assert(_vl); /* Copy to ensure correct alignment. */ - HDmemcpy(&vl, _vl, sizeof(hvl_t)); + memcpy(&vl, _vl, sizeof(hvl_t)); FUNC_LEAVE_NOAPI(vl.p) } /* end H5T__vlen_mem_seq_getptr() */ @@ -418,7 +418,7 @@ H5T__vlen_mem_seq_isnull(const H5VL_object_t H5_ATTR_UNUSED *file, void *_vl, hb assert(_vl); /* Copy to ensure correct alignment. */ - HDmemcpy(&vl, _vl, sizeof(hvl_t)); + memcpy(&vl, _vl, sizeof(hvl_t)); *isnull = ((vl.len == 0 || vl.p == NULL) ? TRUE : FALSE); @@ -474,7 +474,7 @@ H5T__vlen_mem_seq_read(H5VL_object_t H5_ATTR_UNUSED *file, void *_vl, void *buf, assert(buf); assert(_vl); /* Copy to ensure correct alignment. */ - HDmemcpy(&vl, _vl, sizeof(hvl_t)); + memcpy(&vl, _vl, sizeof(hvl_t)); assert(vl.p); H5MM_memcpy(buf, vl.p, len); @@ -553,7 +553,7 @@ H5T__vlen_mem_str_getlen(H5VL_object_t H5_ATTR_UNUSED *file, const void *_vl, si assert(_vl); /* Copy to ensure correct alignment. */ - HDmemcpy(&s, _vl, sizeof(char *)); + memcpy(&s, _vl, sizeof(char *)); *len = HDstrlen(s); @@ -579,7 +579,7 @@ H5T__vlen_mem_str_getptr(void *_vl) /* check parameters */ assert(_vl); /* Copy to ensure correct alignment. */ - HDmemcpy(&s, _vl, sizeof(char *)); + memcpy(&s, _vl, sizeof(char *)); FUNC_LEAVE_NOAPI(s) } /* end H5T__vlen_mem_str_getptr() */ @@ -601,7 +601,7 @@ H5T__vlen_mem_str_isnull(const H5VL_object_t H5_ATTR_UNUSED *file, void *_vl, hb FUNC_ENTER_PACKAGE_NOERR /* Copy to ensure correct alignment. */ - HDmemcpy(&s, _vl, sizeof(char *)); + memcpy(&s, _vl, sizeof(char *)); *isnull = (s == NULL ? TRUE : FALSE); @@ -651,7 +651,7 @@ H5T__vlen_mem_str_read(H5VL_object_t H5_ATTR_UNUSED *file, void *_vl, void *buf, assert(buf); assert(_vl); /* Copy to ensure correct alignment. */ - HDmemcpy(&s, _vl, sizeof(char *)); + memcpy(&s, _vl, sizeof(char *)); H5MM_memcpy(buf, s, len); } /* end if */ diff --git a/src/H5VLcallback.c b/src/H5VLcallback.c index 289f37a..5535f25 100644 --- a/src/H5VLcallback.c +++ b/src/H5VLcallback.c @@ -496,7 +496,7 @@ H5VL_cmp_connector_info(const H5VL_class_t *connector, int *cmp_value, const voi } /* end if */ else { assert(connector->info_cls.size > 0); - *cmp_value = HDmemcmp(info1, info2, connector->info_cls.size); + *cmp_value = memcmp(info1, info2, connector->info_cls.size); } /* end else */ done: @@ -7662,7 +7662,7 @@ H5VL__token_cmp(void *obj, const H5VL_class_t *cls, const H5O_token_t *token1, c HGOTO_ERROR(H5E_VOL, H5E_CANTCOMPARE, FAIL, "can't compare object tokens") } /* end if */ else - *cmp_value = HDmemcmp(token1, token2, sizeof(H5O_token_t)); + *cmp_value = memcmp(token1, token2, sizeof(H5O_token_t)); } /* end else */ done: diff --git a/src/H5VLnative.c b/src/H5VLnative.c index 2ee8d16..d6a8666 100644 --- a/src/H5VLnative.c +++ b/src/H5VLnative.c @@ -441,7 +441,7 @@ H5VL_native_addr_to_token(void *obj, H5I_type_t obj_type, haddr_t addr, H5O_toke HGOTO_ERROR(H5E_VOL, H5E_CANTGET, FAIL, "couldn't get length of haddr_t from VOL object") /* Ensure that token is initialized */ - HDmemset(token, 0, sizeof(H5O_token_t)); + memset(token, 0, sizeof(H5O_token_t)); /* Encode token */ p = (uint8_t *)token; diff --git a/src/H5VLnative_group.c b/src/H5VLnative_group.c index 0cc22f8..163e03f 100644 --- a/src/H5VLnative_group.c +++ b/src/H5VLnative_group.c @@ -90,7 +90,7 @@ H5VL__native_group_create(void *obj, const H5VL_loc_params_t *loc_params, const /* Set up group creation info */ gcrt_info.gcpl_id = gcpl_id; gcrt_info.cache_type = H5G_NOTHING_CACHED; - HDmemset(&gcrt_info.cache, 0, sizeof(gcrt_info.cache)); + memset(&gcrt_info.cache, 0, sizeof(gcrt_info.cache)); /* Create the new group & get its ID */ if (NULL == (grp = H5G__create(loc.oloc->file, &gcrt_info))) diff --git a/src/H5VLnative_token.c b/src/H5VLnative_token.c index 4091c1d..78d0350 100644 --- a/src/H5VLnative_token.c +++ b/src/H5VLnative_token.c @@ -73,7 +73,7 @@ H5VL__native_token_cmp(void H5_ATTR_UNUSED *obj, const H5O_token_t *token1, cons assert(token1); assert(token2); - *cmp_value = HDmemcmp(token1, token2, sizeof(H5O_token_t)); + *cmp_value = memcmp(token1, token2, sizeof(H5O_token_t)); FUNC_LEAVE_NOAPI(ret_value) } /* end H5VL__native_token_cmp() */ @@ -580,7 +580,7 @@ H5VM_stride_fill(unsigned n, hsize_t elmt_size, const hsize_t *size, const hsize for (i = 0; i < nelmts; i++) { /* Copy an element */ H5_CHECK_OVERFLOW(elmt_size, hsize_t, size_t); - HDmemset(dst, (int)fill_value, (size_t)elmt_size); /*lint !e671 The elmt_size will be OK */ + memset(dst, (int)fill_value, (size_t)elmt_size); /*lint !e671 The elmt_size will be OK */ /* Decrement indices and advance pointer */ for (j = (int)(n - 1), carry = TRUE; j >= 0 && carry; --j) { diff --git a/src/H5VMprivate.h b/src/H5VMprivate.h index a81ef0d..903635c 100644 --- a/src/H5VMprivate.h +++ b/src/H5VMprivate.h @@ -40,10 +40,10 @@ typedef herr_t (*H5VM_opvv_func_t)(hsize_t dst_off, hsize_t src_off, size_t len, if (SRC) \ H5MM_memcpy(DST, SRC, (N) * sizeof(*(DST))); \ else \ - HDmemset(DST, 0, (N) * sizeof(*(DST))); \ + memset(DST, 0, (N) * sizeof(*(DST))); \ } while (0) -#define H5VM_vector_zero(N, DST) HDmemset(DST, 0, (N) * sizeof(*(DST))) +#define H5VM_vector_zero(N, DST) memset(DST, 0, (N) * sizeof(*(DST))) /* Given a coordinate offset array (COORDS) of type TYPE, move the unlimited * dimension (UNLIM_DIM) value to offset 0, sliding any intermediate values down @@ -57,7 +57,7 @@ typedef herr_t (*H5VM_opvv_func_t)(hsize_t dst_off, hsize_t src_off, size_t len, if (0 != (UNLIM_DIM)) { \ TYPE _tmp = (COORDS)[UNLIM_DIM]; \ \ - HDmemmove(&(COORDS)[1], &(COORDS)[0], sizeof(TYPE) * (UNLIM_DIM)); \ + memmove(&(COORDS)[1], &(COORDS)[0], sizeof(TYPE) * (UNLIM_DIM)); \ (COORDS)[0] = _tmp; \ } /* end if */ \ } while (0) @@ -75,7 +75,7 @@ typedef herr_t (*H5VM_opvv_func_t)(hsize_t dst_off, hsize_t src_off, size_t len, if (0 != (UNLIM_DIM)) { \ TYPE _tmp = (COORDS)[0]; \ \ - HDmemmove(&(COORDS)[0], &(COORDS)[1], sizeof(TYPE) * (UNLIM_DIM)); \ + memmove(&(COORDS)[0], &(COORDS)[1], sizeof(TYPE) * (UNLIM_DIM)); \ (COORDS)[UNLIM_DIM] = _tmp; \ } /* end if */ \ } while (0) @@ -216,7 +216,7 @@ H5WB_actual_clear(H5WB_t *wb, size_t need) HGOTO_ERROR(H5E_ATTR, H5E_NOSPACE, NULL, "memory allocation failed") /* Clear the buffer */ - HDmemset(ret_value, 0, need); + memset(ret_value, 0, need); done: FUNC_LEAVE_NOAPI(ret_value) @@ -325,7 +325,7 @@ H5Z_register(const H5Z_class2_t *cls) i = H5Z_table_used_g++; H5MM_memcpy(H5Z_table_g + i, cls, sizeof(H5Z_class2_t)); #ifdef H5Z_DEBUG - HDmemset(H5Z_stat_table_g + i, 0, sizeof(H5Z_stats_t)); + memset(H5Z_stat_table_g + i, 0, sizeof(H5Z_stats_t)); #endif /* H5Z_DEBUG */ } /* end if */ /* Filter already registered */ @@ -428,11 +428,11 @@ H5Z__unregister(H5Z_filter_t filter_id) /* Remove filter from table */ /* Don't worry about shrinking table size (for now) */ - HDmemmove(&H5Z_table_g[filter_index], &H5Z_table_g[filter_index + 1], - sizeof(H5Z_class2_t) * ((H5Z_table_used_g - 1) - filter_index)); + memmove(&H5Z_table_g[filter_index], &H5Z_table_g[filter_index + 1], + sizeof(H5Z_class2_t) * ((H5Z_table_used_g - 1) - filter_index)); #ifdef H5Z_DEBUG - HDmemmove(&H5Z_stat_table_g[filter_index], &H5Z_stat_table_g[filter_index + 1], - sizeof(H5Z_stats_t) * ((H5Z_table_used_g - 1) - filter_index)); + memmove(&H5Z_stat_table_g[filter_index], &H5Z_stat_table_g[filter_index + 1], + sizeof(H5Z_stats_t) * ((H5Z_table_used_g - 1) - filter_index)); #endif /* H5Z_DEBUG */ H5Z_table_used_g--; @@ -1636,7 +1636,7 @@ H5Z_delete(H5O_pline_t *pline, H5Z_filter_t filter) pline->nused--; /* Reset information for previous last filter in pipeline */ - HDmemset(&pline->filter[pline->nused], 0, sizeof(H5Z_filter_info_t)); + memset(&pline->filter[pline->nused], 0, sizeof(H5Z_filter_info_t)); } /* end else */ done: diff --git a/src/H5Zdeflate.c b/src/H5Zdeflate.c index 414f03f..dccdf2c 100644 --- a/src/H5Zdeflate.c +++ b/src/H5Zdeflate.c @@ -84,7 +84,7 @@ H5Z__filter_deflate(unsigned flags, size_t cd_nelmts, const unsigned cd_values[] HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, 0, "memory allocation failed for deflate uncompression") /* Set the uncompression parameters */ - HDmemset(&z_strm, 0, sizeof(z_strm)); + memset(&z_strm, 0, sizeof(z_strm)); z_strm.next_in = (Bytef *)*buf; H5_CHECKED_ASSIGN(z_strm.avail_in, unsigned, nbytes, size_t); z_strm.next_out = (Bytef *)outbuf; diff --git a/src/H5Znbit.c b/src/H5Znbit.c index 40c7f84..a157933 100644 --- a/src/H5Znbit.c +++ b/src/H5Znbit.c @@ -1258,7 +1258,7 @@ H5Z__nbit_decompress(unsigned char *data, unsigned d_nelmts, unsigned char *buff FUNC_ENTER_PACKAGE /* may not have to initialize to zeros */ - HDmemset(data, 0, d_nelmts * (size_t)parms[4]); + memset(data, 0, d_nelmts * (size_t)parms[4]); /* initialization before the loop */ j = 0; @@ -1528,7 +1528,7 @@ H5Z__nbit_compress(unsigned char *data, unsigned d_nelmts, unsigned char *buffer unsigned parms_index; /* index in array parms used by compression/decompression functions */ /* must initialize buffer to be zeros */ - HDmemset(buffer, 0, *buffer_size); + memset(buffer, 0, *buffer_size); /* initialization before the loop */ buf_len = sizeof(unsigned char) * 8; diff --git a/src/H5Zscaleoffset.c b/src/H5Zscaleoffset.c index 91ed5cd..e605672 100644 --- a/src/H5Zscaleoffset.c +++ b/src/H5Zscaleoffset.c @@ -947,7 +947,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, @@ -1334,7 +1334,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) { diff --git a/src/H5Ztrans.c b/src/H5Ztrans.c index 5890036..64b8b05 100644 --- a/src/H5Ztrans.c +++ b/src/H5Ztrans.c @@ -1037,8 +1037,8 @@ H5Z__xform_eval_full(H5Z_node *tree, const size_t array_size, const hid_t array_ /* check args */ assert(tree); - HDmemset(&resl, 0, sizeof(H5Z_result)); - HDmemset(&resr, 0, sizeof(H5Z_result)); + memset(&resl, 0, sizeof(H5Z_result)); + memset(&resr, 0, sizeof(H5Z_result)); if (tree->type == H5Z_XFORM_INTEGER) { res->type = H5Z_XFORM_INTEGER; diff --git a/src/H5encode.h b/src/H5encode.h index 1dd7abe..a9172ff 100644 --- a/src/H5encode.h +++ b/src/H5encode.h @@ -128,7 +128,7 @@ \ HDcompile_assert(sizeof(double) == 8); \ HDcompile_assert(sizeof(double) == sizeof(uint64_t)); \ - HDmemcpy(&_n, &n, sizeof(double)); \ + memcpy(&_n, &n, sizeof(double)); \ for (_u = 0; _u < sizeof(uint64_t); _u++, _n >>= 8) \ *_p++ = (uint8_t)(_n & 0xff); \ (p) = (uint8_t *)(p) + 8; \ @@ -245,7 +245,7 @@ (p) += 8; \ for (_u = 0; _u < sizeof(uint64_t); _u++) \ _n = (_n << 8) | *(--p); \ - HDmemcpy(&(n), &_n, sizeof(double)); \ + memcpy(&(n), &_n, sizeof(double)); \ (p) += 8; \ } while (0) diff --git a/src/H5mpi.c b/src/H5mpi.c index 51a6f2f..4a4287d 100644 --- a/src/H5mpi.c +++ b/src/H5mpi.c @@ -391,9 +391,9 @@ H5_mpi_info_cmp(MPI_Info info1, MPI_Info info2, int *result) same = TRUE; /* Memset the buffers to zero */ - HDmemset(key, 0, MPI_MAX_INFO_KEY); - HDmemset(value1, 0, MPI_MAX_INFO_VAL); - HDmemset(value2, 0, MPI_MAX_INFO_VAL); + memset(key, 0, MPI_MAX_INFO_KEY); + memset(value1, 0, MPI_MAX_INFO_VAL); + memset(value2, 0, MPI_MAX_INFO_VAL); /* Get the nth key */ if (MPI_SUCCESS != (mpi_code = MPI_Info_get_nthkey(info1, i, key))) @@ -406,7 +406,7 @@ H5_mpi_info_cmp(MPI_Info info1, MPI_Info info2, int *result) HMPI_GOTO_ERROR(FAIL, "MPI_Info_get failed", mpi_code) /* Compare values and flags */ - if (!flag1 || !flag2 || HDmemcmp(value1, value2, MPI_MAX_INFO_VAL)) { + if (!flag1 || !flag2 || memcmp(value1, value2, MPI_MAX_INFO_VAL)) { same = FALSE; break; } diff --git a/src/H5private.h b/src/H5private.h index a062ae7..71f32da 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -835,18 +835,6 @@ H5_DLL H5_ATTR_CONST int Nflock(int fd, int operation); #ifndef HDlstat #define HDlstat(S, B) lstat(S, B) #endif -#ifndef HDmemcmp -#define HDmemcmp(X, Y, Z) memcmp(X, Y, Z) -#endif -#ifndef HDmemcpy -#define HDmemcpy(X, Y, Z) memcpy(X, Y, Z) -#endif -#ifndef HDmemmove -#define HDmemmove(X, Y, Z) memmove((char *)(X), (const char *)(Y), Z) -#endif -#ifndef HDmemset -#define HDmemset(X, C, Z) memset(X, C, Z) -#endif #ifndef HDmkdir #define HDmkdir(S, M) mkdir(S, M) #endif diff --git a/src/H5timer.c b/src/H5timer.c index eb80af5..c0a945b 100644 --- a/src/H5timer.c +++ b/src/H5timer.c @@ -359,7 +359,7 @@ H5_timer_init(H5_timer_t *timer /*in,out*/) assert(timer); /* Initialize everything */ - HDmemset(timer, 0, sizeof(H5_timer_t)); + memset(timer, 0, sizeof(H5_timer_t)); return 0; } /* end H5_timer_init() */ diff --git a/test/API/H5_api_attribute_test.c b/test/API/H5_api_attribute_test.c index 45f4704..144b0a4 100644 --- a/test/API/H5_api_attribute_test.c +++ b/test/API/H5_api_attribute_test.c @@ -4932,7 +4932,7 @@ test_get_attribute_info(void) PART_ERROR(H5Aget_info); } - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info(attr_id, &attr_info) < 0) { H5_FAILED(); printf(" couldn't get attribute info\n"); @@ -4975,7 +4975,7 @@ test_get_attribute_info(void) { TESTING_2("H5Aget_info_by_name"); - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_name(group_id, ".", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME, &attr_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -4998,7 +4998,7 @@ test_get_attribute_info(void) PART_ERROR(H5Aget_info_by_name); } - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_name(group_id, ".", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME2, &attr_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -5021,7 +5021,7 @@ test_get_attribute_info(void) PART_ERROR(H5Aget_info_by_name); } - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_name(group_id, ".", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME3, &attr_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -5058,7 +5058,7 @@ test_get_attribute_info(void) PART_EMPTY(H5Aget_info_by_idx_crt_order_increasing); } - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, &attr_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -5083,7 +5083,7 @@ test_get_attribute_info(void) PART_ERROR(H5Aget_info_by_idx_crt_order_increasing); } - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, &attr_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -5108,7 +5108,7 @@ test_get_attribute_info(void) PART_ERROR(H5Aget_info_by_idx_crt_order_increasing); } - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, &attr_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -5147,7 +5147,7 @@ test_get_attribute_info(void) PART_EMPTY(H5Aget_info_by_idx_crt_order_decreasing); } - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, &attr_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -5172,7 +5172,7 @@ test_get_attribute_info(void) PART_ERROR(H5Aget_info_by_idx_crt_order_decreasing); } - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, &attr_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -5197,7 +5197,7 @@ test_get_attribute_info(void) PART_ERROR(H5Aget_info_by_idx_crt_order_decreasing); } - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, &attr_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -5230,7 +5230,7 @@ test_get_attribute_info(void) { TESTING_2("H5Aget_info_by_idx by alphabetical order in increasing order"); - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &attr_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -5255,7 +5255,7 @@ test_get_attribute_info(void) PART_ERROR(H5Aget_info_by_idx_name_order_increasing); } - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, &attr_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -5280,7 +5280,7 @@ test_get_attribute_info(void) PART_ERROR(H5Aget_info_by_idx_name_order_increasing); } - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, &attr_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -5313,7 +5313,7 @@ test_get_attribute_info(void) { TESTING_2("H5Aget_info_by_idx by alphabetical order in decreasing order"); - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, &attr_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -5338,7 +5338,7 @@ test_get_attribute_info(void) PART_ERROR(H5Aget_info_by_idx_name_order_decreasing); } - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, &attr_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -5363,7 +5363,7 @@ test_get_attribute_info(void) PART_ERROR(H5Aget_info_by_idx_name_order_decreasing); } - HDmemset(&attr_info, 0, sizeof(attr_info)); + memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, &attr_info, H5P_DEFAULT) < 0) { H5_FAILED(); diff --git a/test/API/H5_api_dataset_test.c b/test/API/H5_api_dataset_test.c index 55c4497..d99516f 100644 --- a/test/API/H5_api_dataset_test.c +++ b/test/API/H5_api_dataset_test.c @@ -3656,7 +3656,7 @@ test_dataset_property_lists(void) { hsize_t tmp_chunk_dims[DATASET_PROPERTY_LIST_TEST_SPACE_RANK]; - HDmemset(tmp_chunk_dims, 0, sizeof(tmp_chunk_dims)); + memset(tmp_chunk_dims, 0, sizeof(tmp_chunk_dims)); if (H5Pget_chunk(dcpl_id1, DATASET_PROPERTY_LIST_TEST_SPACE_RANK, tmp_chunk_dims) < 0) { H5_FAILED(); @@ -3771,7 +3771,7 @@ test_dataset_property_lists(void) PART_ERROR(H5Dget_access_plist); } - HDmemset(tmp_prefix, 0, (size_t)buf_size + 1); + memset(tmp_prefix, 0, (size_t)buf_size + 1); if (H5Pget_efile_prefix(dapl_id2, tmp_prefix, (size_t)buf_size) < 0) { H5_FAILED(); @@ -3858,7 +3858,7 @@ test_dataset_property_lists(void) { hsize_t tmp_chunk_dims[DATASET_PROPERTY_LIST_TEST_SPACE_RANK]; - HDmemset(tmp_chunk_dims, 0, sizeof(tmp_chunk_dims)); + memset(tmp_chunk_dims, 0, sizeof(tmp_chunk_dims)); if (H5Pget_chunk(dcpl_id1, DATASET_PROPERTY_LIST_TEST_SPACE_RANK, tmp_chunk_dims) < 0) { H5_FAILED(); @@ -7217,7 +7217,7 @@ test_dataset_set_extent_chunked_unlimited(void) * Remember the current dimensionality of the dataset before * changing them again. */ - HDmemcpy(dims, new_dims, sizeof(new_dims)); + memcpy(dims, new_dims, sizeof(new_dims)); } /* @@ -7282,7 +7282,7 @@ test_dataset_set_extent_chunked_unlimited(void) * Remember the current dimensionality of the dataset before * changing them again. */ - HDmemcpy(dims, new_dims, sizeof(new_dims)); + memcpy(dims, new_dims, sizeof(new_dims)); } if (H5Pclose(dcpl_id) < 0) @@ -7478,7 +7478,7 @@ test_dataset_set_extent_chunked_fixed(void) * Remember the current dimensionality of the dataset before * changing them again. */ - HDmemcpy(dims, new_dims, sizeof(new_dims)); + memcpy(dims, new_dims, sizeof(new_dims)); } /* @@ -7556,7 +7556,7 @@ test_dataset_set_extent_chunked_fixed(void) * Remember the current dimensionality of the dataset before * changing them again. */ - HDmemcpy(dims2, new_dims, sizeof(new_dims)); + memcpy(dims2, new_dims, sizeof(new_dims)); } if (H5Pclose(dcpl_id) < 0) diff --git a/test/API/H5_api_link_test.c b/test/API/H5_api_link_test.c index ffc5de5..3abd602 100644 --- a/test/API/H5_api_link_test.c +++ b/test/API/H5_api_link_test.c @@ -11564,7 +11564,7 @@ test_get_link_val(void) TESTING_2("H5Lget_val on soft link"); - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_VAL_TEST_SUBGROUP1_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { @@ -11642,7 +11642,7 @@ test_get_link_val(void) TESTING_2("H5Lget_val on external link"); - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); HDsnprintf(ext_link_filename, H5_API_TEST_FILENAME_MAX_LENGTH, "%s", EXTERNAL_LINK_TEST_FILE_NAME); @@ -11849,7 +11849,7 @@ test_get_link_val(void) } /* Retrieve the info and value of each link in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -11865,7 +11865,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -11880,7 +11880,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -11896,7 +11896,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -11911,7 +11911,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -11927,7 +11927,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -12043,7 +12043,7 @@ test_get_link_val(void) } /* Retrieve the info and value of each link in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -12059,7 +12059,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -12074,7 +12074,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -12090,7 +12090,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -12105,7 +12105,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -12121,7 +12121,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -12231,7 +12231,7 @@ test_get_link_val(void) } /* Retrieve the info and value of each link in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -12247,7 +12247,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -12262,7 +12262,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -12278,7 +12278,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -12293,7 +12293,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -12309,7 +12309,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -12419,7 +12419,7 @@ test_get_link_val(void) } /* Retrieve the info and value of each link in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -12435,7 +12435,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -12450,7 +12450,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -12466,7 +12466,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -12481,7 +12481,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -12497,7 +12497,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -12625,7 +12625,7 @@ test_get_link_val(void) } /* Retrieve the info and value of each link in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -12641,7 +12641,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -12670,7 +12670,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -12686,7 +12686,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -12715,7 +12715,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -12731,7 +12731,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -12875,7 +12875,7 @@ test_get_link_val(void) } /* Retrieve the info and value of each link in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -12891,7 +12891,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -12920,7 +12920,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -12936,7 +12936,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -12965,7 +12965,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -12981,7 +12981,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -13119,7 +13119,7 @@ test_get_link_val(void) } /* Retrieve the info and value of each link in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -13135,7 +13135,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -13164,7 +13164,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -13180,7 +13180,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -13209,7 +13209,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -13225,7 +13225,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -13363,7 +13363,7 @@ test_get_link_val(void) } /* Retrieve the info and value of each link in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -13379,7 +13379,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -13408,7 +13408,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -13424,7 +13424,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -13453,7 +13453,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -13469,7 +13469,7 @@ test_get_link_val(void) PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } - HDmemset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); + memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -13705,7 +13705,7 @@ test_get_link_val_invalid_params(void) { TESTING_2("H5Lget_val with an invalid location ID"); - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); H5E_BEGIN_TRY { @@ -13781,7 +13781,7 @@ test_get_link_val_invalid_params(void) { TESTING_2("H5Lget_val_by_idx with an invalid location ID"); - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); H5E_BEGIN_TRY { @@ -14033,7 +14033,7 @@ test_get_link_info(void) { TESTING_2("H5Lget_info2 on hard link"); - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP1_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { @@ -14104,7 +14104,7 @@ test_get_link_info(void) { TESTING_2("H5Lget_info2 on soft link"); - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP2_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { @@ -14187,7 +14187,7 @@ test_get_link_info(void) { TESTING_2("H5Lget_info2 on external link"); - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); HDsnprintf(ext_link_filename, H5_API_TEST_FILENAME_MAX_LENGTH, "%s", EXTERNAL_LINK_TEST_FILE_NAME); @@ -14380,7 +14380,7 @@ test_get_link_info(void) } /* Retrieve info of links in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -14401,7 +14401,7 @@ test_get_link_info(void) PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -14422,7 +14422,7 @@ test_get_link_info(void) PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -14543,7 +14543,7 @@ test_get_link_info(void) } /* Retrieve info of links in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -14564,7 +14564,7 @@ test_get_link_info(void) PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -14585,7 +14585,7 @@ test_get_link_info(void) PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -14700,7 +14700,7 @@ test_get_link_info(void) } /* Retrieve info of links in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -14723,7 +14723,7 @@ test_get_link_info(void) } } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -14746,7 +14746,7 @@ test_get_link_info(void) } } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -14863,7 +14863,7 @@ test_get_link_info(void) } /* Retrieve info of links in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -14886,7 +14886,7 @@ test_get_link_info(void) } } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -14909,7 +14909,7 @@ test_get_link_info(void) } } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -15038,7 +15038,7 @@ test_get_link_info(void) } /* Retrieve info of links in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -15069,7 +15069,7 @@ test_get_link_info(void) PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -15100,7 +15100,7 @@ test_get_link_info(void) PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -15237,7 +15237,7 @@ test_get_link_info(void) } /* Retrieve info of links in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -15268,7 +15268,7 @@ test_get_link_info(void) PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -15299,7 +15299,7 @@ test_get_link_info(void) PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -15430,7 +15430,7 @@ test_get_link_info(void) } /* Retrieve info of links in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -15463,7 +15463,7 @@ test_get_link_info(void) } } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -15496,7 +15496,7 @@ test_get_link_info(void) } } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -15629,7 +15629,7 @@ test_get_link_info(void) } /* Retrieve info of links in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -15662,7 +15662,7 @@ test_get_link_info(void) } } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -15695,7 +15695,7 @@ test_get_link_info(void) } } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -15843,7 +15843,7 @@ test_get_link_info(void) } /* Retrieve info of links in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -15872,7 +15872,7 @@ test_get_link_info(void) PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -15901,7 +15901,7 @@ test_get_link_info(void) PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -16047,7 +16047,7 @@ test_get_link_info(void) } /* Retrieve info of links in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -16076,7 +16076,7 @@ test_get_link_info(void) PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -16105,7 +16105,7 @@ test_get_link_info(void) PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -16245,7 +16245,7 @@ test_get_link_info(void) } /* Retrieve info of links in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -16276,7 +16276,7 @@ test_get_link_info(void) } } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -16307,7 +16307,7 @@ test_get_link_info(void) } } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -16449,7 +16449,7 @@ test_get_link_info(void) } /* Retrieve info of links in turn */ - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -16480,7 +16480,7 @@ test_get_link_info(void) } } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -16511,7 +16511,7 @@ test_get_link_info(void) } } - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, &link_info, H5P_DEFAULT) < 0) { H5_FAILED(); @@ -16740,7 +16740,7 @@ test_get_link_info_invalid_params(void) { TESTING_2("H5Lget_info2 with an invalid location ID"); - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); H5E_BEGIN_TRY { @@ -16812,7 +16812,7 @@ test_get_link_info_invalid_params(void) } PART_END(H5Lget_info_invalid_lapl); - HDmemset(&link_info, 0, sizeof(link_info)); + memset(&link_info, 0, sizeof(link_info)); PART_BEGIN(H5Lget_info_by_idx_invalid_loc_id) { diff --git a/test/API/tarray.c b/test/API/tarray.c index 935379e..39bb419 100644 --- a/test/API/tarray.c +++ b/test/API/tarray.c @@ -1634,7 +1634,7 @@ test_array_bkg(void) /* ------------------- */ dtsinfo = (CmpDTSinfo *)malloc(sizeof(CmpDTSinfo)); CHECK_PTR(dtsinfo, "malloc"); - HDmemset(dtsinfo, 0, sizeof(CmpDTSinfo)); + memset(dtsinfo, 0, sizeof(CmpDTSinfo)); for (i = 0; i < LENGTH; i++) { for (j = 0; j < ALEN; j++) { cf[i].a[j] = 100 * (i + 1) + j; @@ -1849,7 +1849,7 @@ test_array_bkg(void) /* Reset the data to read in */ /* ------------------------- */ - HDmemset(cfr, 0, sizeof(CmpField) * LENGTH); + memset(cfr, 0, sizeof(CmpField) * LENGTH); status = H5Dread(dataset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, cfr); CHECK(status, FAIL, "H5Dread"); diff --git a/test/API/tattr.c b/test/API/tattr.c index 06a45e5..182d62d 100644 --- a/test/API/tattr.c +++ b/test/API/tattr.c @@ -935,7 +935,7 @@ test_attr_compound_read(hid_t fapl) /* Verify values read in */ for (i = 0; i < ATTR4_DIM1; i++) for (j = 0; j < ATTR4_DIM2; j++) - if (HDmemcmp(&attr_data4[i][j], &read_data4[i][j], sizeof(struct attr4_struct)) != 0) { + if (memcmp(&attr_data4[i][j], &read_data4[i][j], sizeof(struct attr4_struct)) != 0) { printf("%d: attribute data different: attr_data4[%d][%d].i=%d, read_data4[%d][%d].i=%d\n", __LINE__, i, j, attr_data4[i][j].i, i, j, read_data4[i][j].i); printf("%d: attribute data different: attr_data4[%d][%d].d=%f, read_data4[%d][%d].d=%f\n", @@ -5832,19 +5832,19 @@ attr_info_by_idx_check(hid_t obj_id, const char *attrname, hsize_t n, hbool_t us old_nerrs = nerrors; /* Verify the information for first attribute, in increasing creation order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, 0, "H5Aget_info_by_idx"); /* Verify the information for new attribute, in increasing creation order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, n, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, n, "H5Aget_info_by_idx"); /* Verify the name for new link, in increasing creation order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, n, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_name_by_idx"); @@ -5857,21 +5857,21 @@ attr_info_by_idx_check(hid_t obj_id, const char *attrname, hsize_t n, hbool_t us */ if (use_index) { /* Verify the information for first attribute, in native creation order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC /* H5_ITER_NATIVE */, (hsize_t)0, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, 0, "H5Aget_info_by_idx"); /* Verify the information for new attribute, in native creation order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC /* H5_ITER_NATIVE */, n, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, n, "H5Aget_info_by_idx"); /* Verify the name for new link, in increasing native order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC /* H5_ITER_NATIVE */, n, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_name_by_idx"); @@ -5880,19 +5880,19 @@ attr_info_by_idx_check(hid_t obj_id, const char *attrname, hsize_t n, hbool_t us } /* end if */ /* Verify the information for first attribute, in decreasing creation order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, n, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, 0, "H5Aget_info_by_idx"); /* Verify the information for new attribute, in increasing creation order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)0, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, n, "H5Aget_info_by_idx"); /* Verify the name for new link, in increasing creation order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_name_by_idx"); @@ -5900,19 +5900,19 @@ attr_info_by_idx_check(hid_t obj_id, const char *attrname, hsize_t n, hbool_t us TestErrPrintf("Line %d: attribute name size wrong!\n", __LINE__); /* Verify the information for first attribute, in increasing name order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)0, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, 0, "H5Aget_info_by_idx"); /* Verify the information for new attribute, in increasing name order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_NAME, H5_ITER_INC, n, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, n, "H5Aget_info_by_idx"); /* Verify the name for new link, in increasing name order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(obj_id, ".", H5_INDEX_NAME, H5_ITER_INC, n, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_name_by_idx"); @@ -5924,19 +5924,19 @@ attr_info_by_idx_check(hid_t obj_id, const char *attrname, hsize_t n, hbool_t us */ /* Verify the information for first attribute, in decreasing name order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_NAME, H5_ITER_DEC, n, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, 0, "H5Aget_info_by_idx"); /* Verify the information for new attribute, in increasing name order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_NAME, H5_ITER_DEC, (hsize_t)0, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, n, "H5Aget_info_by_idx"); /* Verify the name for new link, in increasing name order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(obj_id, ".", H5_INDEX_NAME, H5_ITER_DEC, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_name_by_idx"); @@ -6654,7 +6654,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Adelete_by_idx"); /* Verify the attribute information for first attribute in appropriate order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, &ainfo, H5P_DEFAULT); if (new_format) { @@ -6667,7 +6667,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) } /* end if */ /* Verify the name for first attribute in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); if (order == H5_ITER_INC) @@ -6787,7 +6787,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Adelete_by_idx"); /* Verify the attribute information for first attribute in appropriate order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, &ainfo, H5P_DEFAULT); if (new_format) { @@ -6800,7 +6800,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) } /* end if */ /* Verify the name for first attribute in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); if (order == H5_ITER_INC) @@ -6904,7 +6904,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Adelete_by_idx"); /* Verify the attribute information for first attribute in appropriate order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(my_dataset, ".", idx_type, order, (hsize_t)u, &ainfo, H5P_DEFAULT); if (new_format) { @@ -6918,7 +6918,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) } /* end if */ /* Verify the name for first attribute in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", idx_type, order, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); if (order == H5_ITER_INC) @@ -6957,7 +6957,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Adelete_by_idx"); /* Verify the attribute information for first attribute in appropriate order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, &ainfo, H5P_DEFAULT); if (new_format) { @@ -6971,7 +6971,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) } /* end if */ /* Verify the name for first attribute in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); if (order == H5_ITER_INC) @@ -7162,7 +7162,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_attrs - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate2(obj_id, idx_type, order, &skip, attr_iterate2_cb, iter_info); CHECK(ret, FAIL, "H5Aiterate2"); @@ -7177,7 +7177,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_attrs - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate_by_name(fid, dsetname, idx_type, order, &skip, attr_iterate2_cb, iter_info, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aiterate_by_name"); @@ -7192,7 +7192,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_attrs - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate_by_name(obj_id, ".", idx_type, order, &skip, attr_iterate2_cb, iter_info, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aiterate_by_name"); @@ -7209,7 +7209,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_attrs - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate1(obj_id, &oskip, attr_iterate1_cb, iter_info); CHECK(ret, FAIL, "H5Aiterate1"); @@ -7226,7 +7226,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? skip : ((max_attrs - 1) - skip); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate2(obj_id, idx_type, order, &skip, attr_iterate2_cb, iter_info); CHECK(ret, FAIL, "H5Aiterate2"); @@ -7257,7 +7257,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? skip : ((max_attrs - 1) - skip); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate_by_name(fid, dsetname, idx_type, order, &skip, attr_iterate2_cb, iter_info, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aiterate_by_name"); @@ -7288,7 +7288,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? skip : ((max_attrs - 1) - skip); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate_by_name(obj_id, ".", idx_type, order, &skip, attr_iterate2_cb, iter_info, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aiterate_by_name"); @@ -7321,7 +7321,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? (unsigned)oskip : ((max_attrs - 1) - oskip); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate1(obj_id, &oskip, attr_iterate1_cb, iter_info); CHECK(ret, FAIL, "H5Aiterate1"); @@ -7354,7 +7354,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_attrs - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate2(obj_id, idx_type, order, &skip, attr_iterate2_cb, iter_info); CHECK(ret, FAIL, "H5Aiterate2"); VERIFY(ret, CORDER_ITER_STOP, "H5Aiterate2"); @@ -7366,7 +7366,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_attrs - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate_by_name(fid, dsetname, idx_type, order, &skip, attr_iterate2_cb, iter_info, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aiterate_by_name"); VERIFY(ret, CORDER_ITER_STOP, "H5Aiterate_by_name"); @@ -7378,7 +7378,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_attrs - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate_by_name(obj_id, ".", idx_type, order, &skip, attr_iterate2_cb, iter_info, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aiterate_by_name"); VERIFY(ret, CORDER_ITER_STOP, "H5Aiterate_by_name"); @@ -7392,7 +7392,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_attrs - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate1(obj_id, &oskip, attr_iterate1_cb, iter_info); CHECK(ret, FAIL, "H5Aiterate1"); VERIFY(ret, CORDER_ITER_STOP, "H5Aiterate1"); @@ -8802,7 +8802,7 @@ test_attr_shared_write(hid_t fcpl, hid_t fapl) /* Allocate & initialize "big" attribute data */ big_value = (unsigned *)malloc((size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3) * sizeof(unsigned)); CHECK_PTR(big_value, "malloc"); - HDmemset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); + memset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); /* Create dataspace for dataset */ sid = H5Screate(H5S_SCALAR); @@ -9153,7 +9153,7 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl) /* Allocate & initialize "big" attribute data */ big_value = (unsigned *)malloc((size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3) * sizeof(unsigned)); CHECK_PTR(big_value, "malloc"); - HDmemset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); + memset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); /* Create dataspace for dataset */ sid = H5Screate(H5S_SCALAR); @@ -9612,7 +9612,7 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl) /* Allocate & initialize "big" attribute data */ big_value = (unsigned *)malloc((size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3) * sizeof(unsigned)); CHECK_PTR(big_value, "malloc"); - HDmemset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); + memset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); /* Create dataspace for dataset */ sid = H5Screate(H5S_SCALAR); @@ -9996,7 +9996,7 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl) /* Allocate & initialize "big" attribute data */ big_value = (unsigned *)malloc((size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3) * sizeof(unsigned)); CHECK_PTR(big_value, "malloc"); - HDmemset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); + memset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); /* Create dataspace for dataset */ sid = H5Screate(H5S_SCALAR); diff --git a/test/API/tchecksum.c b/test/API/tchecksum.c index 450be3f..62db33c 100644 --- a/test/API/tchecksum.c +++ b/test/API/tchecksum.c @@ -55,7 +55,7 @@ test_chksum_size_one(void) VERIFY(chksum, 0xa209c931, "H5_checksum_lookup3"); /* Buffer w/zero(s) for data */ - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); chksum = H5_checksum_fletcher32(buf, sizeof(buf)); VERIFY(chksum, 0, "H5_checksum_fletcher32"); @@ -88,7 +88,7 @@ test_chksum_size_two(void) VERIFY(chksum, 0x8ba7a6c9, "H5_checksum_lookup3"); /* Buffer w/zero(s) for data */ - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); chksum = H5_checksum_fletcher32(buf, sizeof(buf)); VERIFY(chksum, 0, "H5_checksum_fletcher32"); @@ -121,7 +121,7 @@ test_chksum_size_three(void) VERIFY(chksum, 0xcebdf4f0, "H5_checksum_lookup3"); /* Buffer w/zero(s) for data */ - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); chksum = H5_checksum_fletcher32(buf, sizeof(buf)); VERIFY(chksum, 0, "H5_checksum_fletcher32"); @@ -154,7 +154,7 @@ test_chksum_size_four(void) VERIFY(chksum, 0x2c88bb51, "H5_checksum_lookup3"); /* Buffer w/zero(s) for data */ - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); chksum = H5_checksum_fletcher32(buf, sizeof(buf)); VERIFY(chksum, 0, "H5_checksum_fletcher32"); @@ -196,7 +196,7 @@ test_chksum_large(void) VERIFY(chksum, 0x1bd2ee7b, "H5_checksum_lookup3"); /* Buffer w/zero(s) for data */ - HDmemset(large_buf, 0, (size_t)BUF_LEN); + memset(large_buf, 0, (size_t)BUF_LEN); chksum = H5_checksum_fletcher32(large_buf, (size_t)BUF_LEN); VERIFY(chksum, 0, "H5_checksum_fletcher32"); diff --git a/test/API/tcoords.c b/test/API/tcoords.c index 2a6e301..d9b9711 100644 --- a/test/API/tcoords.c +++ b/test/API/tcoords.c @@ -86,7 +86,7 @@ test_singleEnd_selElements(hid_t file, hbool_t is_chunked) } /* Construct dataset's name */ - HDmemset(dset_name, 0, (size_t)NAME_LEN); + memset(dset_name, 0, (size_t)NAME_LEN); HDstrcat(dset_name, SINGLE_END_DSET); if (is_chunked) HDstrcat(dset_name, "_chunked"); @@ -258,7 +258,7 @@ test_singleEnd_selHyperslab(hid_t file, hbool_t is_chunked) hsize_t mem3_block[4] = {1, 3, 6, 1}; /* Construct dataset's name */ - HDmemset(dset_name, 0, NAME_LEN); + memset(dset_name, 0, NAME_LEN); HDstrcat(dset_name, SINGLE_END_DSET); if (is_chunked) HDstrcat(dset_name, "_chunked"); @@ -461,7 +461,7 @@ test_multiple_ends(hid_t file, hbool_t is_chunked) } /* Construct dataset's name */ - HDmemset(dset_name, 0, NAME_LEN); + memset(dset_name, 0, NAME_LEN); HDstrcat(dset_name, MULTI_ENDS_SEL_HYPER_DSET); if (is_chunked) HDstrcat(dset_name, "_chunked"); diff --git a/test/API/testhdf5.c b/test/API/testhdf5.c index 5f2c1b8..62d4a7d 100644 --- a/test/API/testhdf5.c +++ b/test/API/testhdf5.c @@ -275,7 +275,7 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu if (!base_name || !fullname || size < 1) return NULL; - HDmemset(fullname, 0, size); + memset(fullname, 0, size); /* Determine if driver is set by environment variable. If it is, * only generate a suffix if fixing the filename for the superblock diff --git a/test/API/tfile.c b/test/API/tfile.c index 8b00742..8f1cc28 100644 --- a/test/API/tfile.c +++ b/test/API/tfile.c @@ -2852,7 +2852,7 @@ test_file_double_file_dataset_open(hbool_t new_format) CHECK(tid1, FAIL, "H5Tcopy"); /* Second file's dataset read */ - HDmemset(buffer, 0, sizeof(char *) * 5); + memset(buffer, 0, sizeof(char *) * 5); ret = H5Dread(did2, tid2, H5S_ALL, H5S_ALL, H5P_DEFAULT, buffer); CHECK(ret, FAIL, "H5Dread"); ret = H5Treclaim(tid2, sid1, H5P_DEFAULT, buffer); @@ -2867,7 +2867,7 @@ test_file_double_file_dataset_open(hbool_t new_format) CHECK(ret, FAIL, "H5Fclose"); /* First file's dataset read */ - HDmemset(buffer, 0, sizeof(char *) * 5); + memset(buffer, 0, sizeof(char *) * 5); ret = H5Dread(did1, tid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, buffer); CHECK(ret, FAIL, "H5Dread"); ret = H5Treclaim(tid2, sid1, H5P_DEFAULT, buffer); @@ -4475,7 +4475,7 @@ set_multi_split(hid_t fapl, hsize_t pagesize, hbool_t split) assert(split); - HDmemset(memb_name, 0, sizeof memb_name); + memset(memb_name, 0, sizeof memb_name); /* Get current split settings */ if (H5Pget_fapl_multi(fapl, memb_map, memb_fapl_arr, memb_name, memb_addr, &relax) < 0) @@ -4830,7 +4830,7 @@ test_sects_freespace(const char *env_h5_drvr, hbool_t new_format) VERIFY(nsects, FAIL, "H5Fget_free_sections"); /* Retrieve and verify free space info for all the sections */ - HDmemset(all_sect_info, 0, sizeof(all_sect_info)); + memset(all_sect_info, 0, sizeof(all_sect_info)); nsects = H5Fget_free_sections(file, H5FD_MEM_DEFAULT, (size_t)nall, all_sect_info); VERIFY(nsects, nall, "H5Fget_free_sections"); @@ -4844,7 +4844,7 @@ test_sects_freespace(const char *env_h5_drvr, hbool_t new_format) last_size = all_sect_info[nall - 1].size; /* Retrieve and verify free space info for -1 sections */ - HDmemset(sect_info, 0, sizeof(sect_info)); + memset(sect_info, 0, sizeof(sect_info)); nsects = H5Fget_free_sections(file, H5FD_MEM_DEFAULT, (size_t)(nall - 1), sect_info); VERIFY(nsects, nall, "H5Fget_free_sections"); @@ -4859,7 +4859,7 @@ test_sects_freespace(const char *env_h5_drvr, hbool_t new_format) VERIFY(((hsize_t)free_space - last_size), total, "H5Fget_free_sections"); #endif /* Retrieve and verify free-space info for +1 sections */ - HDmemset(sect_info, 0, sizeof(sect_info)); + memset(sect_info, 0, sizeof(sect_info)); nsects = H5Fget_free_sections(file, H5FD_MEM_DEFAULT, (size_t)(nall + 1), sect_info); VERIFY(nsects, nall, "H5Fget_free_sections"); @@ -4876,7 +4876,7 @@ test_sects_freespace(const char *env_h5_drvr, hbool_t new_format) VERIFY(free_space, total, "H5Fget_free_sections"); #endif - HDmemset(meta_sect_info, 0, sizeof(meta_sect_info)); + memset(meta_sect_info, 0, sizeof(meta_sect_info)); if (multi_vfd) { hssize_t ntmp; @@ -4909,7 +4909,7 @@ test_sects_freespace(const char *env_h5_drvr, hbool_t new_format) CHECK(nraw, FAIL, "H5Fget_free_sections"); /* Retrieve and verify free-space sections for raw data */ - HDmemset(raw_sect_info, 0, sizeof(raw_sect_info)); + memset(raw_sect_info, 0, sizeof(raw_sect_info)); nsects = H5Fget_free_sections(file, H5FD_MEM_DRAW, (size_t)nraw, raw_sect_info); VERIFY(nsects, nraw, "H5Fget_free_sections"); diff --git a/test/API/tgenprop.c b/test/API/tgenprop.c index 10c2d3a..fed974c 100644 --- a/test/API/tgenprop.c +++ b/test/API/tgenprop.c @@ -802,7 +802,7 @@ test_genprop_basic_list_prop(void) /* Check values of temporary properties (set with regular values) */ ret = H5Pget(lid1, PROP3_NAME, &prop3_value); CHECK_I(ret, "H5Pget"); - if (HDmemcmp(&prop3_value, PROP3_DEF_VALUE, PROP3_SIZE) != 0) + if (memcmp(&prop3_value, PROP3_DEF_VALUE, PROP3_SIZE) != 0) TestErrPrintf("Property #3 doesn't match!, line=%d\n", __LINE__); ret = H5Pget(lid1, PROP4_NAME, &prop4_value); CHECK_I(ret, "H5Pget"); @@ -1028,7 +1028,7 @@ test_genprop_prop_crt_cb1(const char *name, size_t size, void *def_value) prop1_cb_info.crt_count++; prop1_cb_info.crt_name = HDstrdup(name); prop1_cb_info.crt_value = malloc(size); - HDmemcpy(prop1_cb_info.crt_value, def_value, size); + memcpy(prop1_cb_info.crt_value, def_value, size); return (SUCCEED); } @@ -1048,7 +1048,7 @@ test_genprop_prop_set_cb1(hid_t plist_id, const char *name, size_t size, void *v prop1_cb_info.set_name = HDstrdup(name); if (prop1_cb_info.set_value == NULL) prop1_cb_info.set_value = malloc(size); - HDmemcpy(prop1_cb_info.set_value, value, size); + memcpy(prop1_cb_info.set_value, value, size); return (SUCCEED); } @@ -1068,7 +1068,7 @@ test_genprop_prop_get_cb1(hid_t plist_id, const char *name, size_t size, void *v prop1_cb_info.get_name = HDstrdup(name); if (prop1_cb_info.get_value == NULL) prop1_cb_info.get_value = malloc(size); - HDmemcpy(prop1_cb_info.get_value, value, size); + memcpy(prop1_cb_info.get_value, value, size); return (SUCCEED); } @@ -1087,7 +1087,7 @@ test_genprop_prop_cop_cb1(const char *name, size_t size, void *value) prop1_cb_info.cop_name = HDstrdup(name); if (prop1_cb_info.cop_value == NULL) prop1_cb_info.cop_value = malloc(size); - HDmemcpy(prop1_cb_info.cop_value, value, size); + memcpy(prop1_cb_info.cop_value, value, size); return (SUCCEED); } @@ -1103,7 +1103,7 @@ test_genprop_prop_cmp_cb1(const void *value1, const void *value2, size_t size) /* Set the information from the comparison call */ prop1_cb_info.cmp_count++; - return (HDmemcmp(value1, value2, size)); + return (memcmp(value1, value2, size)); } /**************************************************************** @@ -1117,7 +1117,7 @@ test_genprop_prop_cmp_cb3(const void *value1, const void *value2, size_t size) /* Set the information from the comparison call */ prop3_cb_info.cmp_count++; - return (HDmemcmp(value1, value2, size)); + return (memcmp(value1, value2, size)); } /**************************************************************** @@ -1134,7 +1134,7 @@ test_genprop_prop_cls_cb1(const char *name, size_t size, void *value) prop1_cb_info.cls_name = HDstrdup(name); if (prop1_cb_info.cls_value == NULL) prop1_cb_info.cls_value = malloc(size); - HDmemcpy(prop1_cb_info.cls_value, value, size); + memcpy(prop1_cb_info.cls_value, value, size); return (SUCCEED); } @@ -1152,7 +1152,7 @@ test_genprop_prop_del_cb2(hid_t plist_id, const char *name, size_t size, void *v prop2_cb_info.del_plist_id = plist_id; prop2_cb_info.del_name = HDstrdup(name); prop2_cb_info.del_value = malloc(size); - HDmemcpy(prop2_cb_info.del_value, value, size); + memcpy(prop2_cb_info.del_value, value, size); return (SUCCEED); } @@ -1221,9 +1221,9 @@ test_genprop_list_callback(void) cop_cb_struct.id = (-1); /* Initialize callback information for properties tracked */ - HDmemset(&prop1_cb_info, 0, sizeof(prop_cb_info)); - HDmemset(&prop2_cb_info, 0, sizeof(prop_cb_info)); - HDmemset(&prop3_cb_info, 0, sizeof(prop_cb_info)); + memset(&prop1_cb_info, 0, sizeof(prop_cb_info)); + memset(&prop2_cb_info, 0, sizeof(prop_cb_info)); + memset(&prop3_cb_info, 0, sizeof(prop_cb_info)); /* Create a property list from the class */ lid1 = H5Pcreate(cid1); @@ -1240,7 +1240,7 @@ test_genprop_list_callback(void) VERIFY(prop1_cb_info.crt_count, 1, "H5Pcreate"); if (HDstrcmp(prop1_cb_info.crt_name, PROP1_NAME) != 0) TestErrPrintf("Property #1 name doesn't match!, line=%d\n", __LINE__); - if (HDmemcmp(prop1_cb_info.crt_value, PROP1_DEF_VALUE, PROP1_SIZE) != 0) + if (memcmp(prop1_cb_info.crt_value, PROP1_DEF_VALUE, PROP1_SIZE) != 0) TestErrPrintf("Property #1 value doesn't match!, line=%d\n", __LINE__); /* Check values of permanent properties (set with default values) */ @@ -1259,7 +1259,7 @@ test_genprop_list_callback(void) /* Check values of temporary properties (set with regular values) */ ret = H5Pget(lid1, PROP3_NAME, &prop3_value); CHECK_I(ret, "H5Pget"); - if (HDmemcmp(&prop3_value, PROP3_DEF_VALUE, PROP3_SIZE) != 0) + if (memcmp(&prop3_value, PROP3_DEF_VALUE, PROP3_SIZE) != 0) TestErrPrintf("Property #3 doesn't match!, line=%d\n", __LINE__); /* The compare callback should not have been called, as there is no get * callback for this property */ @@ -1276,7 +1276,7 @@ test_genprop_list_callback(void) VERIFY(prop1_cb_info.get_plist_id, lid1, "H5Pget"); if (HDstrcmp(prop1_cb_info.get_name, PROP1_NAME) != 0) TestErrPrintf("Property #1 name doesn't match!, line=%d\n", __LINE__); - if (HDmemcmp(prop1_cb_info.get_value, PROP1_DEF_VALUE, PROP1_SIZE) != 0) + if (memcmp(prop1_cb_info.get_value, PROP1_DEF_VALUE, PROP1_SIZE) != 0) TestErrPrintf("Property #1 value doesn't match!, line=%d\n", __LINE__); /* Set value of property #1 to different value */ @@ -1288,7 +1288,7 @@ test_genprop_list_callback(void) VERIFY(prop1_cb_info.set_plist_id, lid1, "H5Pset"); if (HDstrcmp(prop1_cb_info.set_name, PROP1_NAME) != 0) TestErrPrintf("Property #1 name doesn't match!, line=%d\n", __LINE__); - if (HDmemcmp(prop1_cb_info.set_value, &prop1_new_value, PROP1_SIZE) != 0) + if (memcmp(prop1_cb_info.set_value, &prop1_new_value, PROP1_SIZE) != 0) TestErrPrintf("Property #1 value doesn't match!, line=%d\n", __LINE__); /* The compare callback should not have been called */ @@ -1311,7 +1311,7 @@ test_genprop_list_callback(void) VERIFY(prop1_cb_info.get_plist_id, lid1, "H5Pget"); if (HDstrcmp(prop1_cb_info.get_name, PROP1_NAME) != 0) TestErrPrintf("Property #1 name doesn't match!, line=%d\n", __LINE__); - if (HDmemcmp(prop1_cb_info.get_value, &prop1_new_value, PROP1_SIZE) != 0) + if (memcmp(prop1_cb_info.get_value, &prop1_new_value, PROP1_SIZE) != 0) TestErrPrintf("Property #1 value doesn't match!, line=%d\n", __LINE__); /* Delete property #2 */ @@ -1323,7 +1323,7 @@ test_genprop_list_callback(void) VERIFY(prop2_cb_info.del_plist_id, lid1, "H5Premove"); if (HDstrcmp(prop2_cb_info.del_name, PROP2_NAME) != 0) TestErrPrintf("Property #2 name doesn't match!, line=%d\n", __LINE__); - if (HDmemcmp(prop2_cb_info.del_value, PROP2_DEF_VALUE, PROP2_SIZE) != 0) + if (memcmp(prop2_cb_info.del_value, PROP2_DEF_VALUE, PROP2_SIZE) != 0) TestErrPrintf("Property #2 value doesn't match!, line=%d\n", __LINE__); /* Copy first list */ @@ -1334,7 +1334,7 @@ test_genprop_list_callback(void) VERIFY(prop1_cb_info.cop_count, 1, "H5Pcopy"); if (HDstrcmp(prop1_cb_info.cop_name, PROP1_NAME) != 0) TestErrPrintf("Property #1 name doesn't match!, line=%d\n", __LINE__); - if (HDmemcmp(prop1_cb_info.cop_value, &prop1_new_value, PROP1_SIZE) != 0) + if (memcmp(prop1_cb_info.cop_value, &prop1_new_value, PROP1_SIZE) != 0) TestErrPrintf("Property #1 value doesn't match!, line=%d\n", __LINE__); /* Verify that the class creation callback occurred */ @@ -1357,7 +1357,7 @@ test_genprop_list_callback(void) VERIFY(prop1_cb_info.cls_count, 1, "H5Pclose"); if (HDstrcmp(prop1_cb_info.cls_name, PROP1_NAME) != 0) TestErrPrintf("Property #1 name doesn't match!, line=%d\n", __LINE__); - if (HDmemcmp(prop1_cb_info.cls_value, &prop1_new_value, PROP1_SIZE) != 0) + if (memcmp(prop1_cb_info.cls_value, &prop1_new_value, PROP1_SIZE) != 0) TestErrPrintf("Property #1 value doesn't match!, line=%d\n", __LINE__); /* Close second list */ diff --git a/test/API/th5o.c b/test/API/th5o.c index b961468..d733eb9 100644 --- a/test/API/th5o.c +++ b/test/API/th5o.c @@ -1463,8 +1463,8 @@ test_h5o_getinfo_same_file(void) CHECK(gid2, FAIL, "H5Gcreate2"); /* Reset object info */ - HDmemset(&oinfo1, 0, sizeof(oinfo1)); - HDmemset(&oinfo2, 0, sizeof(oinfo2)); + memset(&oinfo1, 0, sizeof(oinfo1)); + memset(&oinfo2, 0, sizeof(oinfo2)); /* Query the object info for each object, through group IDs */ ret = H5Oget_info3(gid1, &oinfo1, H5O_INFO_BASIC); @@ -1475,8 +1475,8 @@ test_h5o_getinfo_same_file(void) VERIFY(oinfo1.fileno, oinfo2.fileno, "file number from H5Oget_info3"); /* Reset object info */ - HDmemset(&oinfo1, 0, sizeof(oinfo1)); - HDmemset(&oinfo2, 0, sizeof(oinfo2)); + memset(&oinfo1, 0, sizeof(oinfo1)); + memset(&oinfo2, 0, sizeof(oinfo2)); /* Query the object info for each object, by name */ ret = H5Oget_info_by_name3(fid1, "group1", &oinfo1, H5O_INFO_BASIC, H5P_DEFAULT); @@ -1507,8 +1507,8 @@ test_h5o_getinfo_same_file(void) CHECK(gid2, FAIL, "H5Gopen2"); /* Reset object info */ - HDmemset(&oinfo1, 0, sizeof(oinfo1)); - HDmemset(&oinfo2, 0, sizeof(oinfo2)); + memset(&oinfo1, 0, sizeof(oinfo1)); + memset(&oinfo2, 0, sizeof(oinfo2)); /* Query the object info for each object, through group IDs */ ret = H5Oget_info3(gid1, &oinfo1, H5O_INFO_BASIC); @@ -1519,8 +1519,8 @@ test_h5o_getinfo_same_file(void) VERIFY(oinfo1.fileno, oinfo2.fileno, "file number from H5Oget_info3"); /* Reset object info */ - HDmemset(&oinfo1, 0, sizeof(oinfo1)); - HDmemset(&oinfo2, 0, sizeof(oinfo2)); + memset(&oinfo1, 0, sizeof(oinfo1)); + memset(&oinfo2, 0, sizeof(oinfo2)); /* Query the object info for each object, by name */ ret = H5Oget_info_by_name3(fid1, "group1", &oinfo1, H5O_INFO_BASIC, H5P_DEFAULT); @@ -1782,8 +1782,8 @@ test_h5o_getinfo_visit(void) CHECK(gid2, FAIL, "H5Gcreate2"); /* Reset object info */ - HDmemset(&oinfo1, 0, sizeof(oinfo1)); - HDmemset(&oinfo2, 0, sizeof(oinfo2)); + memset(&oinfo1, 0, sizeof(oinfo1)); + memset(&oinfo2, 0, sizeof(oinfo2)); /* Query the object info for "group1" via H5Oget_info1 and H5Oget_info2 */ ret = H5Oget_info1(gid1, &oinfo1); @@ -1796,8 +1796,8 @@ test_h5o_getinfo_visit(void) VERIFY(oinfo1.num_attrs, oinfo2.num_attrs, "obj info from H5Oget_info1/2"); /* Reset object info */ - HDmemset(&oinfo1, 0, sizeof(oinfo1)); - HDmemset(&oinfo2, 0, sizeof(oinfo2)); + memset(&oinfo1, 0, sizeof(oinfo1)); + memset(&oinfo2, 0, sizeof(oinfo2)); /* Query the object info for "group2" via H5Oget_info1 and H5Oget_info2 */ ret = H5Oget_info_by_name1(fid, "group2", &oinfo1, H5P_DEFAULT); diff --git a/test/API/th5s.c b/test/API/th5s.c index 626e59c..da45d28 100644 --- a/test/API/th5s.c +++ b/test/API/th5s.c @@ -148,7 +148,7 @@ test_h5s_basic(void) rank = H5Sget_simple_extent_dims(sid1, tdims, NULL); CHECK(rank, FAIL, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); sid2 = H5Screate_simple(SPACE2_RANK, dims2, max2); CHECK(sid2, FAIL, "H5Screate_simple"); @@ -163,16 +163,16 @@ test_h5s_basic(void) rank = H5Sget_simple_extent_dims(sid2, tdims, tmax); CHECK(rank, FAIL, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tdims, dims2, SPACE2_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tmax, max2, SPACE2_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tdims, dims2, SPACE2_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tmax, max2, SPACE2_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); /* Change max dims to be equal to the dimensions */ ret = H5Sset_extent_simple(sid1, SPACE1_RANK, dims1, NULL); CHECK(ret, FAIL, "H5Sset_extent_simple"); rank = H5Sget_simple_extent_dims(sid1, tdims, tmax); CHECK(rank, FAIL, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tmax, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tmax, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); ret = H5Sclose(sid1); CHECK(ret, FAIL, "H5Sclose"); @@ -1043,7 +1043,7 @@ test_h5s_zero_dim(void) rank = H5Sget_simple_extent_dims(sid_chunk, tdims, NULL); CHECK(rank, FAIL, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); /* Set it to chunked dataset */ plist_id = H5Pcreate(H5P_DATASET_CREATE); @@ -1307,7 +1307,7 @@ test_h5s_encode(H5F_libver_t low, H5F_libver_t high) /* Retrieve and verify the dataspace dimensions */ rank = H5Sget_simple_extent_dims(decoded_sid1, tdims, NULL); CHECK(rank, FAIL, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); /* Verify the type of dataspace selection */ sel_type = H5Sget_select_type(decoded_sid1); @@ -1499,7 +1499,7 @@ test_h5s_encode1(void) /* Retrieve and verify the dataspace dimensions */ rank = H5Sget_simple_extent_dims(decoded_sid1, tdims, NULL); CHECK(rank, FAIL, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); /* Verify the type of dataspace selection */ sel_type = H5Sget_select_type(decoded_sid1); @@ -2478,7 +2478,7 @@ test_h5s_compound_scalar_read(void) ret = H5Dread(dataset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata); CHECK(ret, FAIL, "H5Dread"); - if (HDmemcmp(&space4_data, &rdata, sizeof(struct space4_struct)) != 0) { + if (memcmp(&space4_data, &rdata, sizeof(struct space4_struct)) != 0) { printf("scalar data different: space4_data.c1=%c, read_data4.c1=%c\n", space4_data.c1, rdata.c1); printf("scalar data different: space4_data.u=%u, read_data4.u=%u\n", space4_data.u, rdata.u); printf("scalar data different: space4_data.f=%f, read_data4.f=%f\n", (double)space4_data.f, @@ -2583,8 +2583,8 @@ test_h5s_chunk(void) CHECK(status, FAIL, "H5Fclose"); /* Reset/initialize the data arrays to read in */ - HDmemset(chunk_data_dbl_data, 0, sizeof(double) * CHUNK_DATA_NX * CHUNK_DATA_NY); - HDmemset(chunk_data_flt_data, 0, sizeof(float) * CHUNK_DATA_NX * CHUNK_DATA_NY); + memset(chunk_data_dbl_data, 0, sizeof(double) * CHUNK_DATA_NX * CHUNK_DATA_NY); + memset(chunk_data_flt_data, 0, sizeof(float) * CHUNK_DATA_NX * CHUNK_DATA_NY); fileID = H5Fopen(DATAFILE, H5F_ACC_RDONLY, H5P_DEFAULT); CHECK(fileID, FAIL, "H5Fopen"); diff --git a/test/API/tid.c b/test/API/tid.c index 3433b20..b353a8a 100644 --- a/test/API/tid.c +++ b/test/API/tid.c @@ -740,7 +740,7 @@ test_remove_clear_type(void) * Build object list * *********************/ - HDmemset(obj_list.objects, 0, list_size); + memset(obj_list.objects, 0, list_size); /* The number of objects used is a random number between the min and max */ obj_list.count = obj_list.remaining = diff --git a/test/API/titerate.c b/test/API/titerate.c index a72c304..1349e70 100644 --- a/test/API/titerate.c +++ b/test/API/titerate.c @@ -444,7 +444,7 @@ test_iter_attr(hid_t fapl, hbool_t new_format) if ((vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) && (vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) && (vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) && (vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { - HDmemset(&info, 0, sizeof(iter_info)); + memset(&info, 0, sizeof(iter_info)); /* Create the test file with the datasets */ file = H5Fcreate(DATAFILE, H5F_ACC_TRUNC, H5P_DEFAULT, fapl); diff --git a/test/API/tmisc.c b/test/API/tmisc.c index 1518d8d..d4213d2 100644 --- a/test/API/tmisc.c +++ b/test/API/tmisc.c @@ -491,8 +491,8 @@ test_misc2_write_attribute(void) char *string_att1 = HDstrdup("string attribute in file one"); char *string_att2 = HDstrdup("string attribute in file two"); - HDmemset(&data, 0, sizeof(data)); - HDmemset(&data_check, 0, sizeof(data_check)); + memset(&data, 0, sizeof(data)); + memset(&data_check, 0, sizeof(data_check)); type = misc2_create_type(); @@ -2389,7 +2389,7 @@ misc13_insert_user_block(const char *old_name, const char *new_name, const char CHECK_PTR(user_block, "calloc"); /* Copy in the user block data */ - HDmemcpy(user_block, str, HDstrlen(str)); + memcpy(user_block, str, HDstrlen(str)); /* Open the new file */ new_fp = fopen(new_name, "wb"); @@ -2883,15 +2883,15 @@ test_misc16(void) hsize_t dims[] = {MISC16_SPACE_DIM}; int i; - HDmemset(wdata, 0, sizeof(wdata)); - HDmemset(rdata, 0, sizeof(rdata)); + memset(wdata, 0, sizeof(wdata)); + memset(rdata, 0, sizeof(rdata)); /* Initialize the data */ /* (Note that these are supposed to stress the code, so are a little weird) */ - HDmemcpy(wdata[0], "1234567", MISC16_STR_SIZE); - HDmemcpy(wdata[1], "1234567\0", MISC16_STR_SIZE); - HDmemcpy(wdata[2], "12345678", MISC16_STR_SIZE); - HDmemcpy(wdata[3], "\0\0\0\0\0\0\0\0", MISC16_STR_SIZE); + memcpy(wdata[0], "1234567", MISC16_STR_SIZE); + memcpy(wdata[1], "1234567\0", MISC16_STR_SIZE); + memcpy(wdata[2], "12345678", MISC16_STR_SIZE); + memcpy(wdata[3], "\0\0\0\0\0\0\0\0", MISC16_STR_SIZE); /* Create the file */ file = H5Fcreate(MISC16_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); @@ -2974,15 +2974,15 @@ test_misc17(void) hsize_t dims[] = {MISC17_SPACE_DIM1, MISC17_SPACE_DIM2}; int i; - HDmemset(wdata, 0, sizeof(wdata)); - HDmemset(rdata, 0, sizeof(rdata)); + memset(wdata, 0, sizeof(wdata)); + memset(rdata, 0, sizeof(rdata)); /* Initialize the data */ /* (Note that these are supposed to stress the code, so are a little weird) */ - HDmemcpy(wdata[0], "1234567", MISC17_SPACE_DIM2); - HDmemcpy(wdata[1], "1234567\0", MISC17_SPACE_DIM2); - HDmemcpy(wdata[2], "12345678", MISC17_SPACE_DIM2); - HDmemcpy(wdata[3], "\0\0\0\0\0\0\0\0", MISC17_SPACE_DIM2); + memcpy(wdata[0], "1234567", MISC17_SPACE_DIM2); + memcpy(wdata[1], "1234567\0", MISC17_SPACE_DIM2); + memcpy(wdata[2], "12345678", MISC17_SPACE_DIM2); + memcpy(wdata[3], "\0\0\0\0\0\0\0\0", MISC17_SPACE_DIM2); /* Create the file */ file = H5Fcreate(MISC17_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); diff --git a/test/API/trefer.c b/test/API/trefer.c index 12723e7..81c2321 100644 --- a/test/API/trefer.c +++ b/test/API/trefer.c @@ -1047,7 +1047,7 @@ test_reference_cmpnd_obj(void) CHECK(dataset, H5I_INVALID_HID, "H5Dcreate2"); /* Reset buffer for writing */ - HDmemset(&cmpnd_wbuf, 0, sizeof(cmpnd_wbuf)); + memset(&cmpnd_wbuf, 0, sizeof(cmpnd_wbuf)); /* Create reference to dataset */ ret = H5Rcreate_object(fid1, "/Group1/Dataset1", H5P_DEFAULT, &cmpnd_wbuf.ref0); diff --git a/test/API/tselect.c b/test/API/tselect.c index a9568a4..fc6a275 100644 --- a/test/API/tselect.c +++ b/test/API/tselect.c @@ -649,7 +649,7 @@ test_select_point(hid_t xfer_plist) /* Save points for later iteration */ /* (these are in the second half of the buffer, because we are prepending */ /* the next list of points to the beginning of the point selection list) */ - HDmemcpy(((char *)pi.coord) + sizeof(coord2), coord2, sizeof(coord2)); + memcpy(((char *)pi.coord) + sizeof(coord2), coord2, sizeof(coord2)); ret = (int)H5Sget_select_npoints(sid2); VERIFY(ret, 10, "H5Sget_select_npoints"); @@ -689,7 +689,7 @@ test_select_point(hid_t xfer_plist) VERIFY(ret, 20, "H5Sget_select_npoints"); /* Save points for later iteration */ - HDmemcpy(pi.coord, coord2, sizeof(coord2)); + memcpy(pi.coord, coord2, sizeof(coord2)); /* Create a dataset */ dataset = H5Dcreate2(fid1, SPACE1_NAME, H5T_NATIVE_UCHAR, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); @@ -1537,7 +1537,7 @@ test_select_hyper_contig(hid_t dset_type, hid_t xfer_plist) CHECK(ret, FAIL, "H5Dread"); /* Compare data read with data written out */ - if (HDmemcmp(rbuf, wbuf, sizeof(uint16_t) * 30 * 12) != 0) + if (memcmp(rbuf, wbuf, sizeof(uint16_t) * 30 * 12) != 0) TestErrPrintf("hyperslab values don't match! Line=%d\n", __LINE__); /* Close memory dataspace */ @@ -1680,7 +1680,7 @@ test_select_hyper_contig2(hid_t dset_type, hid_t xfer_plist) CHECK(ret, FAIL, "H5Dread"); /* Compare data read with data written out */ - if (HDmemcmp(rbuf, wbuf, sizeof(uint16_t) * 2 * SPACE8_DIM3 * SPACE8_DIM2 * SPACE8_DIM1) != 0) + if (memcmp(rbuf, wbuf, sizeof(uint16_t) * 2 * SPACE8_DIM3 * SPACE8_DIM2 * SPACE8_DIM1) != 0) TestErrPrintf("Error: hyperslab values don't match!\n"); /* Close memory dataspace */ @@ -2199,7 +2199,7 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co */ /* zero out the in-memory large cube */ - HDmemset(large_cube_buf_1, 0, large_cube_size * sizeof(uint16_t)); + memset(large_cube_buf_1, 0, large_cube_size * sizeof(uint16_t)); u = 0; do { @@ -2268,7 +2268,7 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co TestErrPrintf("large cube read from small cube has bad data! Line=%u\n", __LINE__); /* Zero out the buffer for the next pass */ - HDmemset(large_cube_buf_1 + start_index, 0, small_cube_size * sizeof(uint16_t)); + memset(large_cube_buf_1 + start_index, 0, small_cube_size * sizeof(uint16_t)); x++; } while ((large_rank >= 2) && (small_rank <= 1) && (x < edge_size)); @@ -3176,7 +3176,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ VERIFY(check, TRUE, "H5Sselect_shape_same"); /* zero the buffer that we will be using for reading */ - HDmemset(small_cube_buf_1, 0, sizeof(*small_cube_buf_1) * small_cube_size); + memset(small_cube_buf_1, 0, sizeof(*small_cube_buf_1) * small_cube_size); /* Read selection from disk */ ret = H5Dread(large_cube_dataset, H5T_NATIVE_UINT16, mem_small_cube_sid, @@ -3256,7 +3256,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ VERIFY(check, TRUE, "H5Sselect_shape_same"); /* zero out the in memory large cube */ - HDmemset(large_cube_buf_1, 0, sizeof(*large_cube_buf_1) * large_cube_size); + memset(large_cube_buf_1, 0, sizeof(*large_cube_buf_1) * large_cube_size); /* Read selection from disk */ ret = H5Dread(small_cube_dataset, H5T_NATIVE_UINT16, mem_large_cube_sid, @@ -3383,7 +3383,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ CHECK(ret, FAIL, "H5Dwrite"); /* zero the buffer that we will be using for reading */ - HDmemset(small_cube_buf_1, 0, sizeof(*small_cube_buf_1) * small_cube_size); + memset(small_cube_buf_1, 0, sizeof(*small_cube_buf_1) * small_cube_size); /* read the on disk small cube into memory */ ret = H5Dread(small_cube_dataset, H5T_NATIVE_UINT16, full_small_cube_sid, @@ -3479,7 +3479,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ CHECK(ret, FAIL, "H5Dwrite"); /* zero out the in memory large cube */ - HDmemset(large_cube_buf_1, 0, sizeof(*large_cube_buf_1) * large_cube_size); + memset(large_cube_buf_1, 0, sizeof(*large_cube_buf_1) * large_cube_size); /* read the on disk large cube into memory */ ret = H5Dread(large_cube_dataset, H5T_NATIVE_UINT16, full_large_cube_sid, @@ -3797,7 +3797,7 @@ test_select_hyper_copy(void) CHECK(ret, FAIL, "H5Dread"); /* Compare data read with data written out */ - if (HDmemcmp(rbuf, rbuf2, sizeof(uint16_t) * SPACE3_DIM1 * SPACE3_DIM2) != 0) + if (memcmp(rbuf, rbuf2, sizeof(uint16_t) * SPACE3_DIM1 * SPACE3_DIM2) != 0) TestErrPrintf("hyperslab values don't match! Line=%d\n", __LINE__); /* Close memory dataspace */ @@ -4010,7 +4010,7 @@ test_select_point_copy(void) CHECK(ret, FAIL, "H5Dread"); /* Compare data read with data written out */ - if (HDmemcmp(rbuf, rbuf2, sizeof(uint16_t) * SPACE3_DIM1 * SPACE3_DIM2) != 0) + if (memcmp(rbuf, rbuf2, sizeof(uint16_t) * SPACE3_DIM1 * SPACE3_DIM2) != 0) TestErrPrintf("point values don't match!\n"); /* Close memory dataspace */ @@ -5271,7 +5271,7 @@ test_select_hyper_union_stagger(void) CHECK(error, FAIL, "H5Fclose"); /* Initialize input buffer */ - HDmemset(data_out, 0, 7 * 7 * sizeof(int)); + memset(data_out, 0, 7 * 7 * sizeof(int)); /* Open file */ file_id = H5Fopen(FILENAME, H5F_ACC_RDONLY, H5P_DEFAULT); @@ -6401,7 +6401,7 @@ test_select_hyper_union_random_5d(hid_t read_plist) } /* end if */ /* Set the read buffer back to all zeroes */ - HDmemset(rbuf, 0, (size_t)SPACE6_DIM1); + memset(rbuf, 0, (size_t)SPACE6_DIM1); } /* end for */ /* Close memory dataspace */ @@ -7133,7 +7133,7 @@ test_select_combine(void) VERIFY(nblocks, 1, "H5Sget_select_hyper_nblocks"); /* Retrieve the block defined */ - HDmemset(blocks, -1, sizeof(blocks)); /* Reset block list */ + memset(blocks, -1, sizeof(blocks)); /* Reset block list */ error = H5Sget_select_hyper_blocklist(space1, (hsize_t)0, (hsize_t)nblocks, (hsize_t *)blocks); CHECK(error, FAIL, "H5Sget_select_hyper_blocklist"); @@ -7168,7 +7168,7 @@ test_select_combine(void) VERIFY(nblocks, 2, "H5Sget_select_hyper_nblocks"); /* Retrieve the block defined */ - HDmemset(blocks, -1, sizeof(blocks)); /* Reset block list */ + memset(blocks, -1, sizeof(blocks)); /* Reset block list */ error = H5Sget_select_hyper_blocklist(space1, (hsize_t)0, (hsize_t)nblocks, (hsize_t *)blocks); CHECK(error, FAIL, "H5Sget_select_hyper_blocklist"); @@ -7207,7 +7207,7 @@ test_select_combine(void) VERIFY(nblocks, 2, "H5Sget_select_hyper_nblocks"); /* Retrieve the block defined */ - HDmemset(blocks, -1, sizeof(blocks)); /* Reset block list */ + memset(blocks, -1, sizeof(blocks)); /* Reset block list */ error = H5Sget_select_hyper_blocklist(space1, (hsize_t)0, (hsize_t)nblocks, (hsize_t *)blocks); CHECK(error, FAIL, "H5Sget_select_hyper_blocklist"); @@ -7266,7 +7266,7 @@ test_select_combine(void) VERIFY(nblocks, 1, "H5Sget_select_hyper_nblocks"); /* Retrieve the block defined */ - HDmemset(blocks, -1, sizeof(blocks)); /* Reset block list */ + memset(blocks, -1, sizeof(blocks)); /* Reset block list */ error = H5Sget_select_hyper_blocklist(space1, (hsize_t)0, (hsize_t)nblocks, (hsize_t *)blocks); CHECK(error, FAIL, "H5Sget_select_hyper_blocklist"); @@ -7321,7 +7321,7 @@ test_select_combine(void) VERIFY(nblocks, 1, "H5Sget_select_hyper_nblocks"); /* Retrieve the block defined */ - HDmemset(blocks, -1, sizeof(blocks)); /* Reset block list */ + memset(blocks, -1, sizeof(blocks)); /* Reset block list */ error = H5Sget_select_hyper_blocklist(space1, (hsize_t)0, (hsize_t)nblocks, (hsize_t *)blocks); CHECK(error, FAIL, "H5Sget_select_hyper_blocklist"); @@ -7376,7 +7376,7 @@ test_select_combine(void) VERIFY(nblocks, 1, "H5Sget_select_hyper_nblocks"); /* Retrieve the block defined */ - HDmemset(blocks, -1, sizeof(blocks)); /* Reset block list */ + memset(blocks, -1, sizeof(blocks)); /* Reset block list */ error = H5Sget_select_hyper_blocklist(space1, (hsize_t)0, (hsize_t)nblocks, (hsize_t *)blocks); CHECK(error, FAIL, "H5Sget_select_hyper_blocklist"); @@ -7561,14 +7561,14 @@ test_select_fill_point(hssize_t *offset) CHECK(ret, FAIL, "H5Sselect_elements"); if (offset != NULL) { - HDmemcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); + memcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); /* Set offset, if provided */ ret = H5Soffset_simple(sid1, real_offset); CHECK(ret, FAIL, "H5Soffset_simple"); } /* end if */ else - HDmemset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); + memset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); /* Set fill value */ fill_value = SPACE7_FILL; @@ -7665,14 +7665,14 @@ test_select_fill_hyper_simple(hssize_t *offset) CHECK(ret, FAIL, "H5Sselect_hyperslab"); if (offset != NULL) { - HDmemcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); + memcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); /* Set offset, if provided */ ret = H5Soffset_simple(sid1, real_offset); CHECK(ret, FAIL, "H5Soffset_simple"); } /* end if */ else - HDmemset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); + memset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); /* Set fill value */ fill_value = SPACE7_FILL; @@ -7780,14 +7780,14 @@ test_select_fill_hyper_regular(hssize_t *offset) CHECK(ret, FAIL, "H5Sselect_hyperslab"); if (offset != NULL) { - HDmemcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); + memcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); /* Set offset, if provided */ ret = H5Soffset_simple(sid1, real_offset); CHECK(ret, FAIL, "H5Soffset_simple"); } /* end if */ else - HDmemset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); + memset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); /* Set fill value */ fill_value = SPACE7_FILL; @@ -7904,14 +7904,14 @@ test_select_fill_hyper_irregular(hssize_t *offset) CHECK(ret, FAIL, "H5Sselect_hyperslab"); if (offset != NULL) { - HDmemcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); + memcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); /* Set offset, if provided */ ret = H5Soffset_simple(sid1, real_offset); CHECK(ret, FAIL, "H5Soffset_simple"); } /* end if */ else - HDmemset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); + memset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); /* Set fill value */ fill_value = SPACE7_FILL; @@ -14334,7 +14334,7 @@ test_hyper_unlim_check(hid_t sid, hsize_t *dims, hssize_t endpoints, hssize_t en CHECK(lim_sid, FAIL, "H5Scopy"); /* "And" lim_sid with dims to create limited selection */ - HDmemset(start, 0, sizeof(start)); + memset(start, 0, sizeof(start)); ret = H5Sselect_hyperslab(lim_sid, H5S_SELECT_AND, start, NULL, dims, NULL); CHECK(ret, FAIL, "H5Sselect_hyperslab"); @@ -14361,18 +14361,18 @@ test_hyper_unlim_check(hid_t sid, hsize_t *dims, hssize_t endpoints, hssize_t en /* Verify blocklist */ if (nblocks == (hssize_t)1) { - if (HDmemcmp(blocklist, eblock1, 6 * sizeof(eblock1[0])) != 0) + if (memcmp(blocklist, eblock1, 6 * sizeof(eblock1[0])) != 0) ERROR("H5Sget_select_hyper_blocklist"); } /* end if */ else { assert(nblocks == (hssize_t)2); - if (HDmemcmp(blocklist, eblock1, 6 * sizeof(eblock1[0])) != 0) { - if (HDmemcmp(blocklist, eblock2, 6 * sizeof(eblock2[0])) != 0) + if (memcmp(blocklist, eblock1, 6 * sizeof(eblock1[0])) != 0) { + if (memcmp(blocklist, eblock2, 6 * sizeof(eblock2[0])) != 0) ERROR("H5Sget_select_hyper_blocklist"); - if (HDmemcmp(&blocklist[6], eblock1, 6 * sizeof(eblock1[0])) != 0) + if (memcmp(&blocklist[6], eblock1, 6 * sizeof(eblock1[0])) != 0) ERROR("H5Sget_select_hyper_blocklist"); } /* end if */ - else if (HDmemcmp(&blocklist[6], eblock2, 6 * sizeof(eblock2[0])) != 0) + else if (memcmp(&blocklist[6], eblock2, 6 * sizeof(eblock2[0])) != 0) ERROR("H5Sget_select_hyper_blocklist"); } /* end else */ } /* end if */ @@ -15144,7 +15144,7 @@ test_irreg_io(void) CHECK(ret, FAIL, "H5Sselect_hyperslab"); /* Reset the buffer */ - HDmemset(rbuf, 0, sizeof(rbuf)); + memset(rbuf, 0, sizeof(rbuf)); /* Read selection from disk */ ret = H5Dread(did, H5T_NATIVE_UCHAR, mem_sid, sid, H5P_DEFAULT, rbuf); diff --git a/test/API/tunicode.c b/test/API/tunicode.c index 326de86..93e28e3 100644 --- a/test/API/tunicode.c +++ b/test/API/tunicode.c @@ -180,7 +180,7 @@ test_strpad(hid_t H5_ATTR_UNUSED fid, const char *string) cmpbuf[2 * small_len - 1] = '\0'; HDstrcpy(&cmpbuf[2 * small_len], new_string); - VERIFY(HDmemcmp(buf, cmpbuf, 2 * big_len), 0, "HDmemcmp"); + VERIFY(memcmp(buf, cmpbuf, 2 * big_len), 0, "memcmp"); /* Now convert from smaller datatype to bigger datatype. This should * leave our buffer looking like: "abc\0\0\0\0\0abc\0\0\0\0\0" */ @@ -188,12 +188,12 @@ test_strpad(hid_t H5_ATTR_UNUSED fid, const char *string) CHECK(ret, FAIL, "H5Tconvert"); /* First fill the buffer with NULLs */ - HDmemset(cmpbuf, '\0', (size_t)LONG_BUF_SIZE); + memset(cmpbuf, '\0', (size_t)LONG_BUF_SIZE); /* Copy in the characters */ HDstrncpy(cmpbuf, new_string, small_len - 1); HDstrncpy(&cmpbuf[big_len], new_string, small_len - 1); - VERIFY(HDmemcmp(buf, cmpbuf, 2 * big_len), 0, "HDmemcmp"); + VERIFY(memcmp(buf, cmpbuf, 2 * big_len), 0, "memcmp"); ret = H5Tclose(src_type); CHECK(ret, FAIL, "H5Tclose"); @@ -240,7 +240,7 @@ test_strpad(hid_t H5_ATTR_UNUSED fid, const char *string) HDstrncpy(&cmpbuf[small_len], new_string, small_len); HDstrncpy(&cmpbuf[2 * small_len], new_string, big_len); - VERIFY(HDmemcmp(buf, cmpbuf, 2 * big_len), 0, "HDmemcmp"); + VERIFY(memcmp(buf, cmpbuf, 2 * big_len), 0, "memcmp"); /* Now convert from smaller datatype to bigger datatype. This should * leave our buffer looking like: "abcd\0\0\0\0abcd\0\0\0\0" */ @@ -248,12 +248,12 @@ test_strpad(hid_t H5_ATTR_UNUSED fid, const char *string) CHECK(ret, FAIL, "H5Tconvert"); /* First fill the buffer with NULLs */ - HDmemset(cmpbuf, '\0', (size_t)LONG_BUF_SIZE); + memset(cmpbuf, '\0', (size_t)LONG_BUF_SIZE); /* Copy in the characters */ HDstrncpy(cmpbuf, new_string, small_len); HDstrncpy(&cmpbuf[big_len], new_string, small_len); - VERIFY(HDmemcmp(buf, cmpbuf, 2 * big_len), 0, "HDmemcmp"); + VERIFY(memcmp(buf, cmpbuf, 2 * big_len), 0, "memcmp"); ret = H5Tclose(src_type); CHECK(ret, FAIL, "H5Tclose"); @@ -285,7 +285,7 @@ test_strpad(hid_t H5_ATTR_UNUSED fid, const char *string) HDstrncpy(&cmpbuf[small_len], new_string, small_len); HDstrncpy(&cmpbuf[2 * small_len], new_string, big_len); - VERIFY(HDmemcmp(buf, cmpbuf, 2 * big_len), 0, "HDmemcmp"); + VERIFY(memcmp(buf, cmpbuf, 2 * big_len), 0, "memcmp"); /* Now convert from smaller datatype to bigger datatype. This should * leave our buffer looking like: "abcd abcd " */ @@ -293,12 +293,12 @@ test_strpad(hid_t H5_ATTR_UNUSED fid, const char *string) CHECK(ret, FAIL, "H5Tconvert"); /* First fill the buffer with spaces */ - HDmemset(cmpbuf, ' ', (size_t)LONG_BUF_SIZE); + memset(cmpbuf, ' ', (size_t)LONG_BUF_SIZE); /* Copy in the characters */ HDstrncpy(cmpbuf, new_string, small_len); HDstrncpy(&cmpbuf[big_len], new_string, small_len); - VERIFY(HDmemcmp(buf, cmpbuf, 2 * big_len), 0, "HDmemcmp"); + VERIFY(memcmp(buf, cmpbuf, 2 * big_len), 0, "memcmp"); ret = H5Tclose(src_type); CHECK(ret, FAIL, "H5Tclose"); @@ -589,7 +589,7 @@ test_compound(hid_t fid, const char *string) herr_t ret; /* Initialize compound data */ - HDmemset(&s1, 0, sizeof(s1_t)); /* To make purify happy */ + memset(&s1, 0, sizeof(s1_t)); /* To make purify happy */ s1.a = COMP_INT_VAL; s1.c = COMP_DOUBLE_VAL; s1.b = COMP_FLOAT_VAL; @@ -814,7 +814,7 @@ test_unicode(void) /* Create a random string with length NUM_CHARS */ HDsrandom((unsigned)HDtime(NULL)); - HDmemset(test_string, 0, sizeof(test_string)); + memset(test_string, 0, sizeof(test_string)); for (x = 0; x < NUM_CHARS; x++) { /* We need to avoid unprintable characters (codes 0-31) and the * . and / characters, since they aren't allowed in path names. diff --git a/test/API/tvlstr.c b/test/API/tvlstr.c index 8819a51..ced17ea 100644 --- a/test/API/tvlstr.c +++ b/test/API/tvlstr.c @@ -163,7 +163,7 @@ test_vlstrings_basic(void) CHECK(dataset, FAIL, "H5Dcreate2"); wdata2 = (char *)calloc((size_t)65534, sizeof(char)); - HDmemset(wdata2, 'A', (size_t)65533); + memset(wdata2, 'A', (size_t)65533); ret = H5Dwrite(dataset2, tid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata2); CHECK(ret, FAIL, "H5Dwrite"); @@ -626,7 +626,7 @@ test_write_vl_string_attribute(void) CHECK(att, FAIL, "H5Acreate2"); string_att_write = (char *)calloc((size_t)8192, sizeof(char)); - HDmemset(string_att_write, 'A', (size_t)8191); + memset(string_att_write, 'A', (size_t)8191); ret = H5Awrite(att, type, &string_att_write); CHECK(ret, FAIL, "H5Awrite"); diff --git a/test/API/tvltypes.c b/test/API/tvltypes.c index d62f703..53275cc 100644 --- a/test/API/tvltypes.c +++ b/test/API/tvltypes.c @@ -1633,7 +1633,7 @@ test_vltypes_compound_vlen_atomic(void) CHECK(dcpl_pid, FAIL, "H5Pcreate"); /* Set the fill value for the second dataset */ - HDmemset(&fill, 0, sizeof(s1)); + memset(&fill, 0, sizeof(s1)); ret = H5Pset_fill_value(dcpl_pid, tid2, &fill); CHECK(ret, FAIL, "H5Pset_fill_value"); @@ -2835,7 +2835,7 @@ test_vltypes_fill_value(void) CHECK(ret, FAIL, "H5Treclaim"); /* Clear the read buffer */ - HDmemset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); + memset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); /* Read in non-contiguous selection from 'empty' dataset of fill value */ ret = H5Dread(dset_id, dtype1_id, dset_select_dspace_id, dset_select_dspace_id, xfer_pid, rbuf); @@ -2893,7 +2893,7 @@ test_vltypes_fill_value(void) CHECK(ret, FAIL, "H5Treclaim"); /* Clear the read buffer */ - HDmemset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); + memset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); /* Read in non-contiguous selection from 'empty' dataset of fill value */ ret = H5Dread(dset_id, dtype1_id, dset_select_dspace_id, dset_select_dspace_id, xfer_pid, rbuf); @@ -3048,7 +3048,7 @@ test_vltypes_fill_value(void) CHECK(ret, FAIL, "H5Treclaim"); /* Clear the read buffer */ - HDmemset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); + memset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); /* Read in non-contiguous selection from dataset */ ret = H5Dread(dset_id, dtype1_id, dset_select_dspace_id, dset_select_dspace_id, xfer_pid, rbuf); @@ -3136,7 +3136,7 @@ test_vltypes_fill_value(void) CHECK(ret, FAIL, "H5Treclaim"); /* Clear the read buffer */ - HDmemset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); + memset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); /* Read in non-contiguous selection from dataset */ ret = H5Dread(dset_id, dtype1_id, dset_select_dspace_id, dset_select_dspace_id, xfer_pid, rbuf); diff --git a/test/accum.c b/test/accum.c index cc26009..6f4db2d 100644 --- a/test/accum.c +++ b/test/accum.c @@ -198,7 +198,7 @@ test_write_read(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(0, 1024, read_buf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(write_buf, read_buf, (size_t)1024) != 0) + if (memcmp(write_buf, read_buf, (size_t)1024) != 0) TEST_ERROR; if (accum_reset(f) < 0) @@ -260,7 +260,7 @@ test_write_read_nonacc_front(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(0, 1024, read_buf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(write_buf, read_buf, (size_t)1024) != 0) + if (memcmp(write_buf, read_buf, (size_t)1024) != 0) TEST_ERROR; if (accum_reset(f) < 0) @@ -322,7 +322,7 @@ test_write_read_nonacc_end(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(1024, 1024, read_buf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(write_buf, read_buf, (size_t)1024) != 0) + if (memcmp(write_buf, read_buf, (size_t)1024) != 0) TEST_ERROR; if (accum_reset(f) < 0) @@ -406,7 +406,7 @@ test_free(H5F_t *f) /* Check that the accumulator still contains the correct data */ if (accum_read(1 * sizeof(int32_t), 127 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf + 1, rbuf, 127 * sizeof(int32_t)) != 0) + if (memcmp(wbuf + 1, rbuf, 127 * sizeof(int32_t)) != 0) TEST_ERROR; /* Free the block of 4B at 127*4B */ @@ -416,7 +416,7 @@ test_free(H5F_t *f) /* Check that the accumulator still contains the correct data */ if (accum_read(1 * sizeof(int32_t), 126 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf + 1, rbuf, 126 * sizeof(int32_t)) != 0) + if (memcmp(wbuf + 1, rbuf, 126 * sizeof(int32_t)) != 0) TEST_ERROR; /* Free the block of 4B at 2*4B */ @@ -426,125 +426,125 @@ test_free(H5F_t *f) /* Check that the accumulator still contains the correct data */ if (accum_read(1 * sizeof(int32_t), 1 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf + 1, rbuf, 1 * sizeof(int32_t)) != 0) + if (memcmp(wbuf + 1, rbuf, 1 * sizeof(int32_t)) != 0) TEST_ERROR; if (accum_read(3 * sizeof(int32_t), 124 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf + 3, rbuf, 124 * sizeof(int32_t)) != 0) + if (memcmp(wbuf + 3, rbuf, 124 * sizeof(int32_t)) != 0) TEST_ERROR; /* Test freeing section that overlaps the start of the accumulator and is * entirely before dirty section */ if (accum_write(64 * sizeof(int32_t), 128 * sizeof(int32_t), wbuf) < 0) FAIL_STACK_ERROR; - HDmemcpy(expect + 64, wbuf, 128 * sizeof(int32_t)); + memcpy(expect + 64, wbuf, 128 * sizeof(int32_t)); if (accum_flush(f) < 0) FAIL_STACK_ERROR; if (accum_write(68 * sizeof(int32_t), 4 * sizeof(int32_t), wbuf) < 0) FAIL_STACK_ERROR; - HDmemcpy(expect + 68, wbuf, 4 * sizeof(int32_t)); + memcpy(expect + 68, wbuf, 4 * sizeof(int32_t)); if (accum_free(f, 62 * sizeof(int32_t), 4 * sizeof(int32_t)) < 0) FAIL_STACK_ERROR; /* Check that the accumulator still contains the correct data */ if (accum_read(66 * sizeof(int32_t), 126 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(expect + 66, rbuf, 126 * sizeof(int32_t)) != 0) + if (memcmp(expect + 66, rbuf, 126 * sizeof(int32_t)) != 0) TEST_ERROR; /* Test freeing section that overlaps the start of the accumulator and * completely contains dirty section */ if (accum_write(64 * sizeof(int32_t), 128 * sizeof(int32_t), wbuf) < 0) FAIL_STACK_ERROR; - HDmemcpy(expect + 64, wbuf, 128 * sizeof(int32_t)); + memcpy(expect + 64, wbuf, 128 * sizeof(int32_t)); if (accum_flush(f) < 0) FAIL_STACK_ERROR; if (accum_write(68 * sizeof(int32_t), 4 * sizeof(int32_t), wbuf) < 0) FAIL_STACK_ERROR; - HDmemcpy(expect + 68, wbuf, 4 * sizeof(int32_t)); + memcpy(expect + 68, wbuf, 4 * sizeof(int32_t)); if (accum_free(f, 62 * sizeof(int32_t), 16 * sizeof(int32_t)) < 0) FAIL_STACK_ERROR; /* Check that the accumulator still contains the correct data */ if (accum_read(78 * sizeof(int32_t), 114 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(expect + 78, rbuf, 114 * sizeof(int32_t)) != 0) + if (memcmp(expect + 78, rbuf, 114 * sizeof(int32_t)) != 0) TEST_ERROR; /* Test freeing section completely contained in accumulator and is entirely * before dirty section */ if (accum_write(64 * sizeof(int32_t), 128 * sizeof(int32_t), wbuf) < 0) FAIL_STACK_ERROR; - HDmemcpy(expect + 64, wbuf, 128 * sizeof(int32_t)); + memcpy(expect + 64, wbuf, 128 * sizeof(int32_t)); if (accum_flush(f) < 0) FAIL_STACK_ERROR; if (accum_write(72 * sizeof(int32_t), 4 * sizeof(int32_t), wbuf) < 0) FAIL_STACK_ERROR; - HDmemcpy(expect + 72, wbuf, 4 * sizeof(int32_t)); + memcpy(expect + 72, wbuf, 4 * sizeof(int32_t)); if (accum_free(f, 66 * sizeof(int32_t), 4 * sizeof(int32_t)) < 0) FAIL_STACK_ERROR; /* Check that the accumulator still contains the correct data */ if (accum_read(70 * sizeof(int32_t), 122 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(expect + 70, rbuf, 122 * sizeof(int32_t)) != 0) + if (memcmp(expect + 70, rbuf, 122 * sizeof(int32_t)) != 0) TEST_ERROR; /* Test freeing section completely contained in accumulator, starts before * dirty section, and ends in dirty section */ if (accum_write(64 * sizeof(int32_t), 128 * sizeof(int32_t), wbuf) < 0) FAIL_STACK_ERROR; - HDmemcpy(expect + 64, wbuf, 128 * sizeof(int32_t)); + memcpy(expect + 64, wbuf, 128 * sizeof(int32_t)); if (accum_flush(f) < 0) FAIL_STACK_ERROR; if (accum_write(72 * sizeof(int32_t), 4 * sizeof(int32_t), wbuf) < 0) FAIL_STACK_ERROR; - HDmemcpy(expect + 72, wbuf, 4 * sizeof(int32_t)); + memcpy(expect + 72, wbuf, 4 * sizeof(int32_t)); if (accum_free(f, 70 * sizeof(int32_t), 4 * sizeof(int32_t)) < 0) FAIL_STACK_ERROR; /* Check that the accumulator still contains the correct data */ if (accum_read(74 * sizeof(int32_t), 118 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(expect + 74, rbuf, 118 * sizeof(int32_t)) != 0) + if (memcmp(expect + 74, rbuf, 118 * sizeof(int32_t)) != 0) TEST_ERROR; /* Test freeing section completely contained in accumulator and completely * contains dirty section */ if (accum_write(64 * sizeof(int32_t), 128 * sizeof(int32_t), wbuf) < 0) FAIL_STACK_ERROR; - HDmemcpy(expect + 64, wbuf, 128 * sizeof(int32_t)); + memcpy(expect + 64, wbuf, 128 * sizeof(int32_t)); if (accum_flush(f) < 0) FAIL_STACK_ERROR; if (accum_write(72 * sizeof(int32_t), 4 * sizeof(int32_t), wbuf) < 0) FAIL_STACK_ERROR; - HDmemcpy(expect + 72, wbuf, 4 * sizeof(int32_t)); + memcpy(expect + 72, wbuf, 4 * sizeof(int32_t)); if (accum_free(f, 70 * sizeof(int32_t), 8 * sizeof(int32_t)) < 0) FAIL_STACK_ERROR; /* Check that the accumulator still contains the correct data */ if (accum_read(78 * sizeof(int32_t), 114 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(expect + 78, rbuf, 114 * sizeof(int32_t)) != 0) + if (memcmp(expect + 78, rbuf, 114 * sizeof(int32_t)) != 0) TEST_ERROR; /* Test freeing section completely contained in accumulator, starts at start * of dirty section, and ends in dirty section */ if (accum_write(64 * sizeof(int32_t), 128 * sizeof(int32_t), wbuf) < 0) FAIL_STACK_ERROR; - HDmemcpy(expect + 64, wbuf, 128 * sizeof(int32_t)); + memcpy(expect + 64, wbuf, 128 * sizeof(int32_t)); if (accum_flush(f) < 0) FAIL_STACK_ERROR; if (accum_write(72 * sizeof(int32_t), 8 * sizeof(int32_t), wbuf) < 0) FAIL_STACK_ERROR; - HDmemcpy(expect + 72, wbuf, 8 * sizeof(int32_t)); + memcpy(expect + 72, wbuf, 8 * sizeof(int32_t)); if (accum_free(f, 72 * sizeof(int32_t), 4 * sizeof(int32_t)) < 0) FAIL_STACK_ERROR; /* Check that the accumulator still contains the correct data */ if (accum_read(76 * sizeof(int32_t), 116 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(expect + 76, rbuf, 116 * sizeof(int32_t)) != 0) + if (memcmp(expect + 76, rbuf, 116 * sizeof(int32_t)) != 0) TEST_ERROR; free(wbuf); @@ -608,7 +608,7 @@ test_accum_overlap(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(40, 10 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 10 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 10 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 2: End of new piece aligns with start of accumulated data */ @@ -620,7 +620,7 @@ test_accum_overlap(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(20, 5 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 5 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 5 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 3: Start of new piece aligns with start of accumulated data */ @@ -632,7 +632,7 @@ test_accum_overlap(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(20, 3 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 3 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 3 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 4: New piece overlaps start of accumulated data */ @@ -644,7 +644,7 @@ test_accum_overlap(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(8, 5 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 5 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 5 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 5: New piece completely within accumulated data */ @@ -656,7 +656,7 @@ test_accum_overlap(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(48, 4 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 4 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 4 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 6: End of new piece aligns with end of accumulated data */ @@ -668,7 +668,7 @@ test_accum_overlap(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(68, 3 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 3 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 3 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 7: New piece overlaps end of accumulated data */ @@ -680,7 +680,7 @@ test_accum_overlap(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(76, 5 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 5 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 5 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 8: Start of new piece aligns with end of accumulated data */ @@ -692,7 +692,7 @@ test_accum_overlap(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(96, 3 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 3 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 3 * sizeof(int32_t)) != 0) TEST_ERROR; /* Set up expected data buffer and verify contents of @@ -717,7 +717,7 @@ test_accum_overlap(H5F_t *f) wbuf[i] = 8; if (accum_read(8, 25 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 25 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 25 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 9: New piece completely before accumulated data */ @@ -729,7 +729,7 @@ test_accum_overlap(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(0, 1 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 1 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 1 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 10: New piece completely after accumulated data */ @@ -741,7 +741,7 @@ test_accum_overlap(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(116, 4 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 4 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 4 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 11: New piece completely overlaps accumulated data */ @@ -753,7 +753,7 @@ test_accum_overlap(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(112, 6 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 6 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 6 * sizeof(int32_t)) != 0) TEST_ERROR; if (accum_reset(f) < 0) @@ -812,7 +812,7 @@ test_accum_overlap_clean(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(40, 10 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 10 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 10 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 2: End of new piece aligns with start of clean accumulated data */ @@ -826,7 +826,7 @@ test_accum_overlap_clean(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(20, 5 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 5 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 5 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 3: Start of new piece aligns with start of accumulated data, @@ -839,7 +839,7 @@ test_accum_overlap_clean(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(20, 6 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 6 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 6 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 4: New piece completely within accumulated data, overlaps @@ -852,7 +852,7 @@ test_accum_overlap_clean(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(40, 2 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 2 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 2 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 5: New piece completely within accumulated data, completely @@ -865,7 +865,7 @@ test_accum_overlap_clean(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(52, 2 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 2 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 2 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 6: New piece completely within clean accumulated data */ @@ -879,7 +879,7 @@ test_accum_overlap_clean(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(44, 3 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 3 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 3 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 7: New piece overlaps start of clean accumulated data */ @@ -893,7 +893,7 @@ test_accum_overlap_clean(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(16, 2 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 2 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 2 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 8: New piece overlaps start of accumulated data, completely @@ -906,7 +906,7 @@ test_accum_overlap_clean(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(12, 4 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 4 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 4 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 9: Start of new piece aligns with end of clean accumulated data */ @@ -920,7 +920,7 @@ test_accum_overlap_clean(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(80, 3 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 3 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 3 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 10: New piece overlaps end of clean accumulated data */ @@ -934,7 +934,7 @@ test_accum_overlap_clean(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(88, 2 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 2 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 2 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 11: New piece overlaps end of accumulated data, completely encloses @@ -947,7 +947,7 @@ test_accum_overlap_clean(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(84, 4 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 4 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 4 * sizeof(int32_t)) != 0) TEST_ERROR; /* Set up expected data buffer and verify contents of @@ -970,7 +970,7 @@ test_accum_overlap_clean(H5F_t *f) wbuf[i] = 7; if (accum_read(12, 22 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 22 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 22 * sizeof(int32_t)) != 0) TEST_ERROR; if (accum_reset(f) < 0) @@ -1028,7 +1028,7 @@ test_accum_non_overlap_size(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(140, 10 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 10 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 10 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 9: New piece completely before accumulated data */ @@ -1040,7 +1040,7 @@ test_accum_non_overlap_size(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(0, 20 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 20 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 20 * sizeof(int32_t)) != 0) TEST_ERROR; if (accum_reset(f) < 0) @@ -1099,7 +1099,7 @@ test_accum_overlap_size(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(64, 10 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 10 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 10 * sizeof(int32_t)) != 0) TEST_ERROR; /* Case 9: New piece completely before accumulated data */ @@ -1111,7 +1111,7 @@ test_accum_overlap_size(H5F_t *f) FAIL_STACK_ERROR; if (accum_read(60, 72 * sizeof(int32_t), rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, 72 * sizeof(int32_t)) != 0) + if (memcmp(wbuf, rbuf, 72 * sizeof(int32_t)) != 0) TEST_ERROR; if (accum_reset(f) < 0) @@ -1199,13 +1199,13 @@ test_accum_adjust(H5F_t *f) /* Read back and verify first write */ if (accum_read((1024 * 1024), (1024 * 1024) - 1, rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, (size_t)((1024 * 1024) - 1)) != 0) + if (memcmp(wbuf, rbuf, (size_t)((1024 * 1024) - 1)) != 0) TEST_ERROR; /* Read back and verify second write */ if (accum_read((1024 * 1024) - 1024, 1024, rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, (size_t)1024) != 0) + if (memcmp(wbuf, rbuf, (size_t)1024) != 0) TEST_ERROR; /* Reset accumulator for next case */ @@ -1236,12 +1236,12 @@ test_accum_adjust(H5F_t *f) /* Read back and verify both pieces of data */ if (accum_read(1048576, 1048575, rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, (size_t)1048576) != 0) + if (memcmp(wbuf, rbuf, (size_t)1048576) != 0) TEST_ERROR; if (accum_read(5, 1048571, rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, (size_t)1048571) != 0) + if (memcmp(wbuf, rbuf, (size_t)1048571) != 0) TEST_ERROR; /* Reset accumulator for next case */ @@ -1283,7 +1283,7 @@ test_accum_adjust(H5F_t *f) the data is as expected */ if (accum_read((1024 * 1024) - 1, 1024, rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, (size_t)1024) != 0) + if (memcmp(wbuf, rbuf, (size_t)1024) != 0) TEST_ERROR; /* Reset accumulator for next case */ @@ -1331,7 +1331,7 @@ test_accum_adjust(H5F_t *f) the data is as expected */ if (accum_read(1048571, 349523, rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, (size_t)349523) != 0) + if (memcmp(wbuf, rbuf, (size_t)349523) != 0) TEST_ERROR; /* Reset accumulator for next case */ @@ -1376,7 +1376,7 @@ test_accum_adjust(H5F_t *f) the data is as expected */ if (accum_read((1024 * 1024) - 5, 10, rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, (size_t)10) != 0) + if (memcmp(wbuf, rbuf, (size_t)10) != 0) TEST_ERROR; /* Reset accumulator for next case */ @@ -1414,7 +1414,7 @@ test_accum_adjust(H5F_t *f) the data is as expected */ if (accum_read(1048571, 349523, rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, (size_t)349523) != 0) + if (memcmp(wbuf, rbuf, (size_t)349523) != 0) TEST_ERROR; if (accum_reset(f) < 0) @@ -1500,7 +1500,7 @@ test_read_after(H5F_t *f) the data is as expected */ if (accum_read(512, 512, rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf, rbuf, (size_t)128) != 0) + if (memcmp(wbuf, rbuf, (size_t)128) != 0) TEST_ERROR; if (accum_reset(f) < 0) @@ -1566,13 +1566,13 @@ test_big(H5F_t *f) FAIL_STACK_ERROR; /* Verify data read */ - if (HDmemcmp(wbuf, rbuf, (size_t)BIG_BUF_SIZE) != 0) + if (memcmp(wbuf, rbuf, (size_t)BIG_BUF_SIZE) != 0) TEST_ERROR; /* Reset data in file back to zeros & reset the read buffer */ if (accum_write(0, BIG_BUF_SIZE, zbuf) < 0) FAIL_STACK_ERROR; - HDmemset(rbuf, 0, (size_t)BIG_BUF_SIZE); + memset(rbuf, 0, (size_t)BIG_BUF_SIZE); if (accum_reset(f) < 0) FAIL_STACK_ERROR; @@ -1586,17 +1586,17 @@ test_big(H5F_t *f) FAIL_STACK_ERROR; /* Verify data read */ - if (HDmemcmp(zbuf, rbuf, (size_t)1024) != 0) + if (memcmp(zbuf, rbuf, (size_t)1024) != 0) TEST_ERROR; - if (HDmemcmp(wbuf, rbuf + 1024, (size_t)1024) != 0) + if (memcmp(wbuf, rbuf + 1024, (size_t)1024) != 0) TEST_ERROR; - if (HDmemcmp(zbuf, rbuf + 2048, (size_t)(BIG_BUF_SIZE - 2048)) != 0) + if (memcmp(zbuf, rbuf + 2048, (size_t)(BIG_BUF_SIZE - 2048)) != 0) TEST_ERROR; /* Reset data in file back to zeros & reset the read buffer */ if (accum_write(1024, 1024, zbuf) < 0) FAIL_STACK_ERROR; - HDmemset(rbuf, 0, (size_t)BIG_BUF_SIZE); + memset(rbuf, 0, (size_t)BIG_BUF_SIZE); if (accum_reset(f) < 0) FAIL_STACK_ERROR; @@ -1610,15 +1610,15 @@ test_big(H5F_t *f) FAIL_STACK_ERROR; /* Verify data read */ - if (HDmemcmp(zbuf, rbuf, (size_t)(BIG_BUF_SIZE - 512)) != 0) + if (memcmp(zbuf, rbuf, (size_t)(BIG_BUF_SIZE - 512)) != 0) TEST_ERROR; - if (HDmemcmp(wbuf, rbuf + (BIG_BUF_SIZE - 512), (size_t)512) != 0) + if (memcmp(wbuf, rbuf + (BIG_BUF_SIZE - 512), (size_t)512) != 0) TEST_ERROR; /* Reset data in file back to zeros & reset the read buffer */ if (accum_write(BIG_BUF_SIZE - 512, 1024, zbuf) < 0) FAIL_STACK_ERROR; - HDmemset(rbuf, 0, (size_t)BIG_BUF_SIZE); + memset(rbuf, 0, (size_t)BIG_BUF_SIZE); if (accum_reset(f) < 0) FAIL_STACK_ERROR; @@ -1632,15 +1632,15 @@ test_big(H5F_t *f) FAIL_STACK_ERROR; /* Verify data read */ - if (HDmemcmp(wbuf + 512, rbuf, (size_t)512) != 0) + if (memcmp(wbuf + 512, rbuf, (size_t)512) != 0) TEST_ERROR; - if (HDmemcmp(zbuf, rbuf + 512, (size_t)(BIG_BUF_SIZE - 512)) != 0) + if (memcmp(zbuf, rbuf + 512, (size_t)(BIG_BUF_SIZE - 512)) != 0) TEST_ERROR; /* Reset data in file back to zeros & reset the read buffer */ if (accum_write(0, 1024, zbuf) < 0) FAIL_STACK_ERROR; - HDmemset(rbuf, 0, (size_t)BIG_BUF_SIZE); + memset(rbuf, 0, (size_t)BIG_BUF_SIZE); if (accum_reset(f) < 0) FAIL_STACK_ERROR; @@ -1660,13 +1660,13 @@ test_big(H5F_t *f) FAIL_STACK_ERROR; /* Verify data read */ - if (HDmemcmp(wbuf2, rbuf, (size_t)BIG_BUF_SIZE) != 0) + if (memcmp(wbuf2, rbuf, (size_t)BIG_BUF_SIZE) != 0) TEST_ERROR; /* Reset data in file back to zeros & reset the read buffer */ if (accum_write(0, BIG_BUF_SIZE, zbuf) < 0) FAIL_STACK_ERROR; - HDmemset(rbuf, 0, (size_t)BIG_BUF_SIZE); + memset(rbuf, 0, (size_t)BIG_BUF_SIZE); if (accum_reset(f) < 0) FAIL_STACK_ERROR; @@ -1686,15 +1686,15 @@ test_big(H5F_t *f) FAIL_STACK_ERROR; /* Verify data read */ - if (HDmemcmp(wbuf2, rbuf, (size_t)BIG_BUF_SIZE) != 0) + if (memcmp(wbuf2, rbuf, (size_t)BIG_BUF_SIZE) != 0) TEST_ERROR; - if (HDmemcmp(wbuf + 512, rbuf + BIG_BUF_SIZE, (size_t)512) != 0) + if (memcmp(wbuf + 512, rbuf + BIG_BUF_SIZE, (size_t)512) != 0) TEST_ERROR; /* Reset data in file back to zeros & reset the read buffer */ if (accum_write(0, BIG_BUF_SIZE + 512, zbuf) < 0) FAIL_STACK_ERROR; - HDmemset(rbuf, 0, (size_t)(BIG_BUF_SIZE + 512)); + memset(rbuf, 0, (size_t)(BIG_BUF_SIZE + 512)); if (accum_reset(f) < 0) FAIL_STACK_ERROR; @@ -1719,17 +1719,17 @@ test_big(H5F_t *f) FAIL_STACK_ERROR; /* Verify data read */ - if (HDmemcmp(wbuf2, rbuf, (size_t)BIG_BUF_SIZE) != 0) + if (memcmp(wbuf2, rbuf, (size_t)BIG_BUF_SIZE) != 0) TEST_ERROR; - if (HDmemcmp(zbuf, rbuf + BIG_BUF_SIZE, (size_t)512) != 0) + if (memcmp(zbuf, rbuf + BIG_BUF_SIZE, (size_t)512) != 0) TEST_ERROR; - if (HDmemcmp(wbuf, rbuf + BIG_BUF_SIZE + 512, (size_t)512) != 0) + if (memcmp(wbuf, rbuf + BIG_BUF_SIZE + 512, (size_t)512) != 0) TEST_ERROR; /* Reset data in file back to zeros & reset the read buffer */ if (accum_write(0, BIG_BUF_SIZE + 1536, zbuf) < 0) FAIL_STACK_ERROR; - HDmemset(rbuf, 0, (size_t)(BIG_BUF_SIZE + 1024)); + memset(rbuf, 0, (size_t)(BIG_BUF_SIZE + 1024)); if (accum_reset(f) < 0) FAIL_STACK_ERROR; @@ -1756,15 +1756,15 @@ test_big(H5F_t *f) FAIL_STACK_ERROR; /* Verify data read */ - if (HDmemcmp(zbuf, rbuf, (size_t)1536) != 0) + if (memcmp(zbuf, rbuf, (size_t)1536) != 0) TEST_ERROR; - if (HDmemcmp(wbuf2, rbuf + 1536, (size_t)BIG_BUF_SIZE) != 0) + if (memcmp(wbuf2, rbuf + 1536, (size_t)BIG_BUF_SIZE) != 0) TEST_ERROR; /* Reset data in file back to zeros & reset the read buffer */ if (accum_write(1536, BIG_BUF_SIZE, zbuf) < 0) FAIL_STACK_ERROR; - HDmemset(rbuf, 0, (size_t)(BIG_BUF_SIZE + 1536)); + memset(rbuf, 0, (size_t)(BIG_BUF_SIZE + 1536)); if (accum_reset(f) < 0) FAIL_STACK_ERROR; @@ -1789,15 +1789,15 @@ test_big(H5F_t *f) FAIL_STACK_ERROR; /* Verify data read */ - if (HDmemcmp(zbuf, rbuf, (size_t)512) != 0) + if (memcmp(zbuf, rbuf, (size_t)512) != 0) TEST_ERROR; - if (HDmemcmp(wbuf2, rbuf + 512, (size_t)BIG_BUF_SIZE) != 0) + if (memcmp(wbuf2, rbuf + 512, (size_t)BIG_BUF_SIZE) != 0) TEST_ERROR; /* Reset data in file back to zeros & reset the read buffer */ if (accum_write(512, BIG_BUF_SIZE, zbuf) < 0) FAIL_STACK_ERROR; - HDmemset(rbuf, 0, (size_t)(BIG_BUF_SIZE + 512)); + memset(rbuf, 0, (size_t)(BIG_BUF_SIZE + 512)); if (accum_reset(f) < 0) FAIL_STACK_ERROR; @@ -1822,17 +1822,17 @@ test_big(H5F_t *f) FAIL_STACK_ERROR; /* Verify data read */ - if (HDmemcmp(wbuf, rbuf, (size_t)1024) != 0) + if (memcmp(wbuf, rbuf, (size_t)1024) != 0) TEST_ERROR; - if (HDmemcmp(zbuf, rbuf + 1024, (size_t)512) != 0) + if (memcmp(zbuf, rbuf + 1024, (size_t)512) != 0) TEST_ERROR; - if (HDmemcmp(wbuf2, rbuf + 1536, (size_t)BIG_BUF_SIZE) != 0) + if (memcmp(wbuf2, rbuf + 1536, (size_t)BIG_BUF_SIZE) != 0) TEST_ERROR; /* Reset data in file back to zeros & reset the read buffer */ if (accum_write(0, BIG_BUF_SIZE + 1536, zbuf) < 0) FAIL_STACK_ERROR; - HDmemset(rbuf, 0, (size_t)(BIG_BUF_SIZE + 1536)); + memset(rbuf, 0, (size_t)(BIG_BUF_SIZE + 1536)); if (accum_reset(f) < 0) FAIL_STACK_ERROR; @@ -1857,9 +1857,9 @@ test_big(H5F_t *f) FAIL_STACK_ERROR; /* Verify data read */ - if (HDmemcmp(wbuf, rbuf, (size_t)512) != 0) + if (memcmp(wbuf, rbuf, (size_t)512) != 0) TEST_ERROR; - if (HDmemcmp(wbuf2, rbuf + 512, (size_t)BIG_BUF_SIZE) != 0) + if (memcmp(wbuf2, rbuf + 512, (size_t)BIG_BUF_SIZE) != 0) TEST_ERROR; if (accum_reset(f) < 0) @@ -1993,7 +1993,7 @@ fprintf(stderr, "Random # seed was: %u\n", seed); /* Verify individual reads */ if (accum_read(RANDOM_BASE_OFF + off[u], len[u], rbuf) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(wbuf + off[u], rbuf, len[u]) != 0) + if (memcmp(wbuf + off[u], rbuf, len[u]) != 0) TEST_ERROR; } /* end for */ @@ -2002,7 +2002,7 @@ fprintf(stderr, "Random # seed was: %u\n", seed); FAIL_STACK_ERROR; /* Verify data read back in */ - if (HDmemcmp(wbuf, rbuf, (size_t)RANDOM_BUF_SIZE) != 0) + if (memcmp(wbuf, rbuf, (size_t)RANDOM_BUF_SIZE) != 0) TEST_ERROR; if (accum_reset(f) < 0) @@ -2148,7 +2148,7 @@ test_swmr_write_big(hbool_t newest_format) if (H5F_block_read(rf, H5FD_MEM_DEFAULT, (haddr_t)1024, (size_t)1024, rbuf) < 0) FAIL_STACK_ERROR; /* Verify the data read is correct */ - if (HDmemcmp(wbuf, rbuf, (size_t)1024) != 0) + if (memcmp(wbuf, rbuf, (size_t)1024) != 0) TEST_ERROR; /* Flush the data to disk */ if (accum_reset(rf) < 0) @@ -2169,7 +2169,7 @@ test_swmr_write_big(hbool_t newest_format) if (H5F_block_read(rf, H5FD_MEM_DEFAULT, (haddr_t)1024, (size_t)1024, rbuf) < 0) FAIL_STACK_ERROR; /* Verify the data read is correct */ - if (HDmemcmp(wbuf, rbuf, (size_t)1024) != 0) + if (memcmp(wbuf, rbuf, (size_t)1024) != 0) TEST_ERROR; /* The data stays in the accumulator */ @@ -2180,7 +2180,7 @@ test_swmr_write_big(hbool_t newest_format) if (H5F_block_read(rf, H5FD_MEM_DEFAULT, (haddr_t)2048, (size_t)BIG_BUF_SIZE, rbuf) < 0) FAIL_STACK_ERROR; /* Verify the data read is correct */ - if (HDmemcmp(wbuf2, rbuf, (size_t)BIG_BUF_SIZE) != 0) + if (memcmp(wbuf2, rbuf, (size_t)BIG_BUF_SIZE) != 0) TEST_ERROR; #if defined(H5_HAVE_WIN32_API) diff --git a/test/accum_swmr_reader.c b/test/accum_swmr_reader.c index 7ab9ab9..659a60a 100644 --- a/test/accum_swmr_reader.c +++ b/test/accum_swmr_reader.c @@ -88,7 +88,7 @@ main(void) FAIL_STACK_ERROR; /* Verify the data read is correct */ - if (HDmemcmp(buf, rbuf, (size_t)1024) != 0) + if (memcmp(buf, rbuf, (size_t)1024) != 0) TEST_ERROR; /* CLose the file */ diff --git a/test/bittests.c b/test/bittests.c index 512e84a..10cd280 100644 --- a/test/bittests.c +++ b/test/bittests.c @@ -43,7 +43,7 @@ test_find(void) TESTING("bit search operations"); /* The zero length buffer */ - HDmemset(v1, 0xaa, sizeof v1); + memset(v1, 0xaa, sizeof v1); n = H5T__bit_find(v1, (size_t)0, (size_t)0, H5T_BIT_LSB, TRUE); if (-1 != n) { H5_FAILED(); @@ -58,7 +58,7 @@ test_find(void) } /* The zero buffer */ - HDmemset(v1, 0, sizeof v1); + memset(v1, 0, sizeof v1); n = H5T__bit_find(v1, (size_t)0, 8 * sizeof(v1), H5T_BIT_LSB, TRUE); if (-1 != n) { H5_FAILED(); @@ -74,7 +74,7 @@ test_find(void) /* Try all combinations of one byte */ for (i = 0; i < 8 * (int)sizeof(v1); i++) { - HDmemset(v1, 0, sizeof v1); + memset(v1, 0, sizeof v1); v1[i / 8] = (uint8_t)(1 << (i % 8)); n = H5T__bit_find(v1, (size_t)0, 8 * sizeof(v1), H5T_BIT_LSB, TRUE); if ((ssize_t)i != n) { @@ -91,7 +91,7 @@ test_find(void) } /* The one buffer */ - HDmemset(v1, 0xff, sizeof v1); + memset(v1, 0xff, sizeof v1); n = H5T__bit_find(v1, (size_t)0, 8 * sizeof(v1), H5T_BIT_LSB, FALSE); if (-1 != n) { H5_FAILED(); @@ -107,7 +107,7 @@ test_find(void) /* Try all combinations of one byte */ for (i = 0; i < 8 * (int)sizeof(v1); i++) { - HDmemset(v1, 0xff, sizeof v1); + memset(v1, 0xff, sizeof v1); v1[i / 8] &= (uint8_t) ~(1 << (i % 8)); n = H5T__bit_find(v1, (size_t)0, 8 * sizeof(v1), H5T_BIT_LSB, FALSE); if ((ssize_t)i != n) { @@ -160,8 +160,8 @@ test_copy(void) d_offset = (size_t)HDrand() % (8 * sizeof v2); size = (unsigned)HDrand() % MIN(8 * sizeof(v1), 8 * sizeof(v2)); size = MIN3(size, 8 * sizeof(v1) - s_offset, 8 * sizeof(v2) - d_offset); - HDmemset(v1, 0xff, sizeof v1); - HDmemset(v2, 0x00, sizeof v2); + memset(v1, 0xff, sizeof v1); + memset(v2, 0x00, sizeof v2); /* Copy some bits to v2 and make sure something was copied */ H5T__bit_copy(v2, d_offset, v1, s_offset, size); @@ -285,7 +285,7 @@ test_shift(void) shift_dist = (ssize_t)((size_t)HDrand() % size); /*-------- LEFT-shift some bits and make sure something was shifted --------*/ - HDmemset(vector, 0x00, sizeof vector); + memset(vector, 0x00, sizeof vector); H5T__bit_set(vector, offset, size, 1); H5T__bit_shift(vector, shift_dist, offset, size); @@ -314,7 +314,7 @@ test_shift(void) } /*-------- RIGHT-shift some bits and make sure something was shifted --------*/ - HDmemset(vector, 0x00, sizeof vector); + memset(vector, 0x00, sizeof vector); H5T__bit_set(vector, offset, size, 1); H5T__bit_shift(vector, -shift_dist, offset, size); @@ -351,7 +351,7 @@ test_shift(void) else shift_dist = -((ssize_t)size); - HDmemset(vector, 0x00, sizeof vector); + memset(vector, 0x00, sizeof vector); H5T__bit_set(vector, offset, size, 1); H5T__bit_shift(vector, shift_dist, offset, size); @@ -417,7 +417,7 @@ test_increment(void) if (size == 0) continue; - HDmemset(vector, 0x00, sizeof vector); + memset(vector, 0x00, sizeof vector); if (size > 1) /* if size=6, make a sequence like 011111 */ H5T__bit_set(vector, offset, size - 1, 1); else /* if size=1, just set this one bit to 1 */ @@ -504,7 +504,7 @@ test_decrement(void) continue; /* All-zero sequence will become 111111(size=6) after decrement */ - HDmemset(vector, 0x00, sizeof vector); + memset(vector, 0x00, sizeof vector); /* decrement the sequence by one */ H5T__bit_dec(vector, offset, size); @@ -573,7 +573,7 @@ test_negate(void) continue; /* All-zero sequence will become 111111(size=6) after negating */ - HDmemset(vector, 0x00, sizeof vector); + memset(vector, 0x00, sizeof vector); /* negate the sequence */ H5T__bit_neg(vector, offset, size); @@ -602,7 +602,7 @@ test_negate(void) } /* All-one sequence will become 000000(size=6) after negating */ - HDmemset(vector, 0x00, sizeof vector); + memset(vector, 0x00, sizeof vector); H5T__bit_set(vector, offset, size, 1); /* negate the sequence */ @@ -668,7 +668,7 @@ test_set(void) d_offset = (size_t)HDrand() % (8 * sizeof v2); size = (size_t)HDrand() % (8 * sizeof(v2)); size = MIN(size, 8 * sizeof(v2) - d_offset); - HDmemset(v2, 0x00, sizeof v2); + memset(v2, 0x00, sizeof v2); /* Set some bits in v2 */ H5T__bit_set(v2, d_offset, size, TRUE); @@ -783,7 +783,7 @@ test_clear(void) d_offset = (size_t)HDrand() % (8 * sizeof v2); size = (size_t)HDrand() % (8 * sizeof(v2)); size = MIN(size, 8 * sizeof(v2) - d_offset); - HDmemset(v2, 0xff, sizeof v2); + memset(v2, 0xff, sizeof v2); /* Clear some bits in v2 */ H5T__bit_set(v2, d_offset, size, FALSE); diff --git a/test/btree2.c b/test/btree2.c index ff426d7..9b8edbe 100644 --- a/test/btree2.c +++ b/test/btree2.c @@ -56,7 +56,7 @@ static int init_cparam(H5B2_create_t *cparam, H5B2_create_t *cparam2) { /* Wipe out background */ - HDmemset(cparam, 0, sizeof(*cparam)); + memset(cparam, 0, sizeof(*cparam)); /* General parameters */ cparam->cls = H5B2_TEST; @@ -66,7 +66,7 @@ init_cparam(H5B2_create_t *cparam, H5B2_create_t *cparam2) cparam->merge_percent = 40; /* Wipe out background */ - HDmemset(cparam2, 0, sizeof(*cparam2)); + memset(cparam2, 0, sizeof(*cparam2)); /* General parameters */ cparam2->cls = H5B2_TEST2; diff --git a/test/cache.c b/test/cache.c index 838bc5a..673b253 100644 --- a/test/cache.c +++ b/test/cache.c @@ -8319,8 +8319,8 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) expected[i].serialized = FALSE; expected[i].destroyed = FALSE; - HDmemset(expected[i].flush_dep_par_type, 0, sizeof(expected[i].flush_dep_par_type)); - HDmemset(expected[i].flush_dep_par_idx, 0, sizeof(expected[i].flush_dep_par_idx)); + memset(expected[i].flush_dep_par_type, 0, sizeof(expected[i].flush_dep_par_type)); + memset(expected[i].flush_dep_par_idx, 0, sizeof(expected[i].flush_dep_par_idx)); expected[i].flush_dep_npar = 0; expected[i].flush_dep_nchd = 0; @@ -8365,8 +8365,8 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) expected[i].serialized = FALSE; expected[i].destroyed = FALSE; - HDmemset(expected[i].flush_dep_par_type, 0, sizeof(expected[i].flush_dep_par_type)); - HDmemset(expected[i].flush_dep_par_idx, 0, sizeof(expected[i].flush_dep_par_idx)); + memset(expected[i].flush_dep_par_type, 0, sizeof(expected[i].flush_dep_par_type)); + memset(expected[i].flush_dep_par_idx, 0, sizeof(expected[i].flush_dep_par_idx)); expected[i].flush_dep_npar = 0; expected[i].flush_dep_nchd = 0; @@ -8388,8 +8388,8 @@ check_flush_cache__flush_op_eviction_test(H5F_t *file_ptr) expected[i].serialized = FALSE; expected[i].destroyed = FALSE; - HDmemset(expected[i].flush_dep_par_type, 0, sizeof(expected[i].flush_dep_par_type)); - HDmemset(expected[i].flush_dep_par_idx, 0, sizeof(expected[i].flush_dep_par_idx)); + memset(expected[i].flush_dep_par_type, 0, sizeof(expected[i].flush_dep_par_type)); + memset(expected[i].flush_dep_par_idx, 0, sizeof(expected[i].flush_dep_par_idx)); expected[i].flush_dep_npar = 0; expected[i].flush_dep_nchd = 0; @@ -25203,8 +25203,8 @@ check_metadata_blizzard_absence(hbool_t fill_via_insertion, unsigned paged) expected[i].serialized = FALSE; expected[i].destroyed = FALSE; - HDmemset(expected[i].flush_dep_par_type, 0, sizeof(expected[i].flush_dep_par_type)); - HDmemset(expected[i].flush_dep_par_idx, 0, sizeof(expected[i].flush_dep_par_idx)); + memset(expected[i].flush_dep_par_type, 0, sizeof(expected[i].flush_dep_par_type)); + memset(expected[i].flush_dep_par_idx, 0, sizeof(expected[i].flush_dep_par_idx)); expected[i].flush_dep_npar = 0; expected[i].flush_dep_nchd = 0; @@ -31046,8 +31046,8 @@ check_metadata_cork(hbool_t fill_via_insertion, unsigned paged) expected[i].serialized = FALSE; expected[i].destroyed = FALSE; - HDmemset(expected[i].flush_dep_par_type, 0, sizeof(expected[i].flush_dep_par_type)); - HDmemset(expected[i].flush_dep_par_idx, 0, sizeof(expected[i].flush_dep_par_idx)); + memset(expected[i].flush_dep_par_type, 0, sizeof(expected[i].flush_dep_par_type)); + memset(expected[i].flush_dep_par_idx, 0, sizeof(expected[i].flush_dep_par_idx)); expected[i].flush_dep_npar = 0; expected[i].flush_dep_nchd = 0; diff --git a/test/cache_common.c b/test/cache_common.c index f469a5b..b406ff4 100644 --- a/test/cache_common.c +++ b/test/cache_common.c @@ -1105,7 +1105,7 @@ serialize(const H5F_t H5_ATTR_UNUSED *f, void *image_ptr, size_t len, void *thin assert(entry->num_flush_ops < MAX_FLUSH_OPS); /* null out the image to avoid spurious failures */ - HDmemset(image_ptr, 0, len); + memset(image_ptr, 0, len); if ((type == PICO_ENTRY_TYPE) || (type == VARIABLE_ENTRY_TYPE) || (type == NOTIFY_ENTRY_TYPE)) { assert(entry->size >= PICO_ENTRY_SIZE); @@ -2077,7 +2077,7 @@ reset_entries(void) } /* end for */ /* Make copy of entries in base_addr for later */ - HDmemcpy(orig_base_addr, base_addr, (size_t)(max_index + 1) * sizeof(*base_addr)); + memcpy(orig_base_addr, base_addr, (size_t)(max_index + 1) * sizeof(*base_addr)); } /* end for */ /* Indicate that we've made a copy for later */ @@ -2090,7 +2090,7 @@ reset_entries(void) orig_base_addr = orig_entries[i]; /* Make copy of entries in base_addr for later */ - HDmemcpy(base_addr, orig_base_addr, (size_t)(max_index + 1) * sizeof(*base_addr)); + memcpy(base_addr, orig_base_addr, (size_t)(max_index + 1) * sizeof(*base_addr)); } /* end for */ } /* end else */ @@ -4663,11 +4663,11 @@ destroy_flush_dependency(int32_t par_type, int32_t par_idx, int32_t chd_type, in break; assert(i < chd_entry_ptr->flush_dep_npar); if (i < chd_entry_ptr->flush_dep_npar - 1) - HDmemmove(&chd_entry_ptr->flush_dep_par_type[i], &chd_entry_ptr->flush_dep_par_type[i + 1], - (chd_entry_ptr->flush_dep_npar - i - 1) * sizeof(chd_entry_ptr->flush_dep_par_type[0])); + memmove(&chd_entry_ptr->flush_dep_par_type[i], &chd_entry_ptr->flush_dep_par_type[i + 1], + (chd_entry_ptr->flush_dep_npar - i - 1) * sizeof(chd_entry_ptr->flush_dep_par_type[0])); if (i < chd_entry_ptr->flush_dep_npar - 1) - HDmemmove(&chd_entry_ptr->flush_dep_par_idx[i], &chd_entry_ptr->flush_dep_par_idx[i + 1], - (chd_entry_ptr->flush_dep_npar - i - 1) * sizeof(chd_entry_ptr->flush_dep_par_idx[0])); + memmove(&chd_entry_ptr->flush_dep_par_idx[i], &chd_entry_ptr->flush_dep_par_idx[i + 1], + (chd_entry_ptr->flush_dep_npar - i - 1) * sizeof(chd_entry_ptr->flush_dep_par_idx[0])); chd_entry_ptr->flush_dep_npar--; par_entry_ptr->flush_dep_nchd--; if (par_entry_ptr->flush_dep_nchd == 0) { diff --git a/test/cache_logging.c b/test/cache_logging.c index dff9feb..5001c49 100644 --- a/test/cache_logging.c +++ b/test/cache_logging.c @@ -109,7 +109,7 @@ test_logging_api(void) /* Perform some manipulations */ for (i = 0; i < N_GROUPS; i++) { - HDmemset(group_name, 0, sizeof(group_name)); + memset(group_name, 0, sizeof(group_name)); HDsnprintf(group_name, sizeof(group_name), "%d", i); if ((gid = H5Gcreate2(fid, group_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; diff --git a/test/chunk_info.c b/test/chunk_info.c index e45dcb9..4a62458 100644 --- a/test/chunk_info.c +++ b/test/chunk_info.c @@ -329,7 +329,7 @@ verify_selected_chunks(hid_t dset, hid_t plist, const hsize_t *start, const hsiz hsize_t ii, jj; /* Array indices */ int n; - HDmemset(&read_buf, 0, sizeof(read_buf)); + memset(&read_buf, 0, sizeof(read_buf)); /* Initialize the array of chunk data for all NUM_CHUNKS chunks, this is the same as the written data and will be used to verify the read data */ @@ -351,7 +351,7 @@ verify_selected_chunks(hid_t dset, hid_t plist, const hsize_t *start, const hsiz TEST_ERROR; /* Verify that read chunk is the same as the corresponding written one */ - if (HDmemcmp(expected_buf[chk_index], read_buf, CHUNK_NX * CHUNK_NY) != 0) { + if (memcmp(expected_buf[chk_index], read_buf, CHUNK_NX * CHUNK_NY) != 0) { fprintf(stderr, "Read chunk differs from written chunk at offset (%" PRIuHSIZE ",%" PRIuHSIZE ")\n", offset[0], offset[1]); @@ -589,7 +589,7 @@ test_get_chunk_info_highest_v18(hid_t fapl) /* Allocate input (non-compressed) buffer */ if (NULL == (inbuf = calloc(1, CHK_SIZE))) TEST_ERROR; - HDmemcpy(inbuf, direct_buf, CHK_SIZE); + memcpy(inbuf, direct_buf, CHK_SIZE); #endif /* end H5_HAVE_FILTER_DEFLATE */ /* Write only NUM_CHUNKS_WRITTEN chunks at the following logical coords: @@ -2118,7 +2118,7 @@ test_flt_msk_with_skip_compress(hid_t fapl) TEST_ERROR; /* Read the raw chunk back with H5Dread_chunk */ - HDmemset(&read_direct_buf, 0, sizeof(read_direct_buf)); + memset(&read_direct_buf, 0, sizeof(read_direct_buf)); if (H5Dread_chunk(dset, H5P_DEFAULT, offset, &read_flt_msk, read_direct_buf) < 0) TEST_ERROR; if (read_flt_msk != flt_msk) diff --git a/test/cmpd_dset.c b/test/cmpd_dset.c index 06667f4..5e7a6e1 100644 --- a/test/cmpd_dset.c +++ b/test/cmpd_dset.c @@ -1678,7 +1678,7 @@ test_pack_ooo(void) /* Reshape free_order to remove j (which is no longer free) */ if (j < (num_free - 1)) - HDmemmove(&free_order[j], &free_order[j + 1], (num_free - j - 1) * sizeof(free_order[0])); + memmove(&free_order[j], &free_order[j + 1], (num_free - j - 1) * sizeof(free_order[0])); } /* end for */ /* Generate order to insert inner compound type */ diff --git a/test/cross_read.c b/test/cross_read.c index 1ee84a3..8369a76 100644 --- a/test/cross_read.c +++ b/test/cross_read.c @@ -84,7 +84,7 @@ check_data_i(const char *dsetname, hid_t fid) for (i = 0; i < NY; i++) data_in[NX][i] = -2; /* Output */ - HDmemset(data_out, 0, (NX + 1) * NY * sizeof(long long)); + memset(data_out, 0, (NX + 1) * NY * sizeof(long long)); /* Read data from hyperslab in the file into the hyperslab in * memory and display. @@ -155,7 +155,7 @@ check_data_f(const char *dsetname, hid_t fid) for (i = 0; i < NY; i++) data_in[NX][i] = -2.2; /* Output */ - HDmemset(data_out, 0, (NX + 1) * NY * sizeof(double)); + memset(data_out, 0, (NX + 1) * NY * sizeof(double)); /* Read data from hyperslab in the file into the hyperslab in * memory and display. diff --git a/test/direct_chunk.c b/test/direct_chunk.c index d72242b..078349c 100644 --- a/test/direct_chunk.c +++ b/test/direct_chunk.c @@ -611,7 +611,7 @@ test_skip_compress_write1(hid_t file) goto error; /* Read the raw chunk back */ - HDmemset(&read_direct_buf, 0, sizeof(read_direct_buf)); + memset(&read_direct_buf, 0, sizeof(read_direct_buf)); if ((status = H5Dread_chunk(dataset, H5P_DEFAULT, offset, &read_filter_mask, read_direct_buf)) < 0) goto error; if (read_filter_mask != filter_mask) @@ -879,7 +879,7 @@ test_skip_compress_write2(hid_t file) goto error; /* Read the raw chunk back */ - HDmemset(&read_direct_buf, 0, sizeof(read_direct_buf)); + memset(&read_direct_buf, 0, sizeof(read_direct_buf)); if ((status = H5Dread_chunk(dataset, H5P_DEFAULT, offset, &read_filter_mask, read_direct_buf)) < 0) goto error; if (read_filter_mask != filter_mask) @@ -1881,7 +1881,7 @@ test_read_unfiltered_dset(hid_t file) offset[0] = (hsize_t)i * CHUNK_NX; offset[1] = (hsize_t)j * CHUNK_NY; /* Read the raw chunk back */ - HDmemset(&direct_buf, 0, sizeof(direct_buf)); + memset(&direct_buf, 0, sizeof(direct_buf)); filter_mask = UINT_MAX; if ((status = H5Dread_chunk(dataset, dxpl, offset, &filter_mask, direct_buf)) < 0) goto error; @@ -1982,7 +1982,7 @@ test_read_unallocated_chunk(hid_t file) FAIL_STACK_ERROR; /* Write a single chunk to initialize the chunk storage */ - HDmemset(direct_buf, 0, CHUNK_NX * CHUNK_NY * sizeof(int)); + memset(direct_buf, 0, CHUNK_NX * CHUNK_NY * sizeof(int)); offset[0] = 0; offset[1] = 0; diff --git a/test/dsets.c b/test/dsets.c index 0679f33..6d8c9dc 100644 --- a/test/dsets.c +++ b/test/dsets.c @@ -1821,11 +1821,11 @@ filter_corrupt(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_valu if (NULL == (data = malloc((size_t)length))) TEST_ERROR; - HDmemset(data, (int)value, (size_t)length); + memset(data, (int)value, (size_t)length); if (flags & H5Z_FLAG_REVERSE) { /* Verify data is actually corrupted during read */ dst += offset; - if (HDmemcmp(data, dst, (size_t)length) != 0) + if (memcmp(data, dst, (size_t)length) != 0) TEST_ERROR; else { *buf_size = nbytes; @@ -1834,7 +1834,7 @@ filter_corrupt(unsigned int flags, size_t cd_nelmts, const unsigned int *cd_valu } /* end if */ else { /* Write corrupted data */ dst += offset; - HDmemcpy(dst, data, (size_t)length); + memcpy(dst, data, (size_t)length); *buf_size = nbytes; ret_value = *buf_size; } /* end else */ @@ -4336,7 +4336,7 @@ test_nbit_compound_3(hid_t file) /* Initialize data */ for (i = 0; i < (size_t)size[0]; i++) { power = HDpow(2.0, 17.0 - 1.0); - HDmemset(&orig_data[i], 0, sizeof(orig_data[i])); + memset(&orig_data[i], 0, sizeof(orig_data[i])); orig_data[i].i = (int)(HDrandom() % (long)power); HDstrcpy(orig_data[i].str, "fixed-length C string"); orig_data[i].vl_str = HDstrdup("variable-length C string"); @@ -7143,7 +7143,7 @@ auxread_fdata(hid_t fid, const char *name) goto error; if ((rank = H5Sget_simple_extent_ndims(space_id)) < 0) goto error; - HDmemset(dims, 0, sizeof dims); + memset(dims, 0, sizeof dims); if (H5Sget_simple_extent_dims(space_id, dims, NULL) < 0) goto error; nelmts = 1; @@ -11336,7 +11336,7 @@ test_single_chunk(hid_t fapl) if ((did = H5Dopen2(fid, DSET_SINGLE_NOMAX, H5P_DEFAULT)) < 0) TEST_ERROR; - HDmemset(rbuf, 0, sizeof(int) * (DSET_DIM1 * DSET_DIM2)); + memset(rbuf, 0, sizeof(int) * (DSET_DIM1 * DSET_DIM2)); /* Read from dataset */ if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, t_rbuf) < 0) @@ -12409,7 +12409,7 @@ test_bt2_hdr_fd(const char *env_h5_driver, hid_t fapl) TESTING("Version 2 B-tree chunk index header flush dependencies handled correctly"); /* Initialize struct */ - HDmemset(&info, 0, sizeof(info)); + memset(&info, 0, sizeof(info)); /* Skip this test if SWMR I/O is not supported for the VFD specified * by the environment variable. @@ -12563,7 +12563,7 @@ test_storage_size(hid_t fapl) FAIL_STACK_ERROR; /* Initialize buffer to zeroes */ - HDmemset(wdata, 0, sizeof(wdata)); + memset(wdata, 0, sizeof(wdata)); /* write elements to dataset */ if (H5Dwrite(dsid, H5T_NATIVE_INT, sid, sid, H5P_DEFAULT, wdata) < 0) @@ -12612,7 +12612,7 @@ test_storage_size(hid_t fapl) FAIL_STACK_ERROR; /* Initialize buffer to zeroes */ - HDmemset(wdata, 0, sizeof(wdata)); + memset(wdata, 0, sizeof(wdata)); /* write elements to dataset */ if (H5Dwrite(dsid, H5T_NATIVE_INT, sid, sid, H5P_DEFAULT, wdata) < 0) @@ -12673,7 +12673,7 @@ test_storage_size(hid_t fapl) FAIL_STACK_ERROR; /* Initialize buffer to zeroes */ - HDmemset(wdata, 0, sizeof(wdata)); + memset(wdata, 0, sizeof(wdata)); /* write elements to dataset */ if (H5Dwrite(dsid, H5T_NATIVE_INT, sid, sid, H5P_DEFAULT, wdata) < 0) @@ -12734,7 +12734,7 @@ test_storage_size(hid_t fapl) FAIL_STACK_ERROR; /* Initialize buffer to zeroes */ - HDmemset(wdata, 0, sizeof(wdata)); + memset(wdata, 0, sizeof(wdata)); /* write elements to dataset */ if (H5Dwrite(dsid, H5T_NATIVE_INT, sid, sid, H5P_DEFAULT, wdata) < 0) @@ -12795,7 +12795,7 @@ test_storage_size(hid_t fapl) FAIL_STACK_ERROR; /* Initialize buffer to zeroes */ - HDmemset(wdata, 0, sizeof(wdata)); + memset(wdata, 0, sizeof(wdata)); /* write elements to dataset */ if (H5Dwrite(dsid, H5T_NATIVE_INT, sid, sid, H5P_DEFAULT, wdata) < 0) @@ -12856,7 +12856,7 @@ test_storage_size(hid_t fapl) FAIL_STACK_ERROR; /* Initialize buffer to zeroes */ - HDmemset(wdata, 0, sizeof(wdata)); + memset(wdata, 0, sizeof(wdata)); /* write elements to dataset */ if (H5Dwrite(dsid, H5T_NATIVE_INT, sid, sid, H5P_DEFAULT, wdata) < 0) @@ -12917,7 +12917,7 @@ test_storage_size(hid_t fapl) FAIL_STACK_ERROR; /* Initialize buffer to zeroes */ - HDmemset(wdata, 0, sizeof(wdata)); + memset(wdata, 0, sizeof(wdata)); /* write elements to dataset */ if (H5Dwrite(dsid, H5T_NATIVE_INT, sid, sid, H5P_DEFAULT, wdata) < 0) @@ -13171,14 +13171,14 @@ test_scatter(void) TEST_ERROR; /* Initialize dst_buf and expect_dst_buf */ - (void)HDmemset(expect_dst_buf, 0, sizeof(expect_dst_buf)); + (void)memset(expect_dst_buf, 0, sizeof(expect_dst_buf)); for (i = 0; i < 8; i++) expect_dst_buf[0][0][i] = src_buf[i]; /* Loop over buffer sizes */ for (src_buf_size = 1; src_buf_size <= 9; src_buf_size++) { /* Reset dst_buf */ - (void)HDmemset(dst_buf, 0, sizeof(dst_buf)); + (void)memset(dst_buf, 0, sizeof(dst_buf)); /* Set up scatter info */ scatter_info.src_buf = src_buf; @@ -13207,7 +13207,7 @@ test_scatter(void) TEST_ERROR; /* Initialize expect_dst_buf */ - (void)HDmemset(expect_dst_buf, 0, sizeof(expect_dst_buf)); + (void)memset(expect_dst_buf, 0, sizeof(expect_dst_buf)); src_i = 0; for (i = 3; i < 5; i++) for (j = 2; j < 5; j++) @@ -13217,7 +13217,7 @@ test_scatter(void) /* Loop over buffer sizes */ for (src_buf_size = 1; src_buf_size <= 13; src_buf_size++) { /* Reset dst_buf */ - (void)HDmemset(dst_buf, 0, sizeof(dst_buf)); + (void)memset(dst_buf, 0, sizeof(dst_buf)); /* Set up scatter info */ scatter_info.src_buf = src_buf; @@ -13255,7 +13255,7 @@ test_scatter(void) /* Iterate over block containing selection, checking if each element is in * selection. Note that the algorithm used here (if statement) would not * work for overlapping hyperslabs. */ - (void)HDmemset(expect_dst_buf, 0, sizeof(expect_dst_buf)); + (void)memset(expect_dst_buf, 0, sizeof(expect_dst_buf)); src_i = 0; for (i = 1; i < 8; i++) for (j = 1; j < 4; j++) @@ -13271,7 +13271,7 @@ test_scatter(void) /* Loop over buffer sizes */ for (src_buf_size = 1; src_buf_size <= 37; src_buf_size++) { /* Reset dst_buf */ - (void)HDmemset(dst_buf, 0, sizeof(dst_buf)); + (void)memset(dst_buf, 0, sizeof(dst_buf)); /* Set up scatter info */ scatter_info.src_buf = src_buf; @@ -13310,7 +13310,7 @@ test_scatter(void) /* Initialize expect_dst_buf */ /* Iterate over block containing selection, checking if each element is in * selection. */ - (void)HDmemset(expect_dst_buf, 0, sizeof(expect_dst_buf)); + (void)memset(expect_dst_buf, 0, sizeof(expect_dst_buf)); src_i = 0; for (i = 1; i < 4; i++) for (j = 1; j < 4; j++) @@ -13326,7 +13326,7 @@ test_scatter(void) /* Loop over buffer sizes */ for (src_buf_size = 1; src_buf_size <= 17; src_buf_size++) { /* Reset dst_buf */ - (void)HDmemset(dst_buf, 0, sizeof(dst_buf)); + (void)memset(dst_buf, 0, sizeof(dst_buf)); /* Set up scatter info */ scatter_info.src_buf = src_buf; @@ -13351,14 +13351,14 @@ test_scatter(void) /* Initialize expect_dst_buf */ /* Iterate over block containing selection, checking if each element is in * selection. */ - (void)HDmemset(expect_dst_buf, 0, sizeof(expect_dst_buf)); + (void)memset(expect_dst_buf, 0, sizeof(expect_dst_buf)); for (i = 0; i < (int)(sizeof(point) / sizeof(point[0])); i++) expect_dst_buf[point[i][0]][point[i][1]][point[i][2]] = src_buf[i]; /* Loop over buffer sizes */ for (src_buf_size = 1; src_buf_size <= 5; src_buf_size++) { /* Reset dst_buf */ - (void)HDmemset(dst_buf, 0, sizeof(dst_buf)); + (void)memset(dst_buf, 0, sizeof(dst_buf)); /* Set up scatter info */ scatter_info.src_buf = src_buf; @@ -13489,14 +13489,14 @@ test_gather(void) TEST_ERROR; /* Initialize expect_dst_buf */ - (void)HDmemset(expect_dst_buf, 0, sizeof(expect_dst_buf)); + (void)memset(expect_dst_buf, 0, sizeof(expect_dst_buf)); for (i = 0; i < 8; i++) expect_dst_buf[i] = src_buf[0][0][i]; /* Loop over buffer sizes */ for (dst_buf_size = 1; dst_buf_size <= 9; dst_buf_size++) { /* Reset dst_buf */ - (void)HDmemset(dst_buf, 0, sizeof(dst_buf)); + (void)memset(dst_buf, 0, sizeof(dst_buf)); /* Initialize gather_info */ gather_info.expect_dst_buf = expect_dst_buf; @@ -13517,7 +13517,7 @@ test_gather(void) /* Loop over buffer sizes */ for (dst_buf_size = 8; dst_buf_size <= 9; dst_buf_size++) { /* Reset dst_buf */ - (void)HDmemset(dst_buf, 0, sizeof(dst_buf)); + (void)memset(dst_buf, 0, sizeof(dst_buf)); /* Gather data */ if (H5Dgather(sid, src_buf, H5T_NATIVE_INT, dst_buf_size * sizeof(dst_buf[0]), dst_buf, NULL, NULL) < @@ -13533,7 +13533,7 @@ test_gather(void) /* Test with a dst_buf_size that is not a multiple of the datatype size */ /* Reset dst_buf */ dst_buf_size = 7; - (void)HDmemset(dst_buf, 0, sizeof(dst_buf)); + (void)memset(dst_buf, 0, sizeof(dst_buf)); /* Initialize gather_info */ gather_info.expect_dst_buf = expect_dst_buf; @@ -13563,7 +13563,7 @@ test_gather(void) TEST_ERROR; /* Initialize expect_dst_buf */ - (void)HDmemset(expect_dst_buf, 0, sizeof(expect_dst_buf)); + (void)memset(expect_dst_buf, 0, sizeof(expect_dst_buf)); dst_i = 0; for (i = 3; i < 5; i++) for (j = 2; j < 5; j++) @@ -13573,7 +13573,7 @@ test_gather(void) /* Loop over buffer sizes */ for (dst_buf_size = 1; dst_buf_size <= 13; dst_buf_size++) { /* Reset dst_buf */ - (void)HDmemset(dst_buf, 0, sizeof(dst_buf)); + (void)memset(dst_buf, 0, sizeof(dst_buf)); /* Initialize gather_info */ gather_info.expect_dst_buf = expect_dst_buf; @@ -13613,7 +13613,7 @@ test_gather(void) /* Iterate over block containing selection, checking if each element is in * selection. Note that the algorithm used here (if statement) would not * work for overlapping hyperslabs. */ - (void)HDmemset(expect_dst_buf, 0, sizeof(expect_dst_buf)); + (void)memset(expect_dst_buf, 0, sizeof(expect_dst_buf)); dst_i = 0; for (i = 1; i < 8; i++) for (j = 1; j < 4; j++) @@ -13629,7 +13629,7 @@ test_gather(void) /* Loop over buffer sizes */ for (dst_buf_size = 1; dst_buf_size <= 37; dst_buf_size++) { /* Reset dst_buf */ - (void)HDmemset(dst_buf, 0, sizeof(dst_buf)); + (void)memset(dst_buf, 0, sizeof(dst_buf)); /* Initialize gather_info */ gather_info.expect_dst_buf = expect_dst_buf; @@ -13670,7 +13670,7 @@ test_gather(void) /* Initialize expect_dst_buf */ /* Iterate over block containing selection, checking if each element is in * selection. */ - (void)HDmemset(expect_dst_buf, 0, sizeof(expect_dst_buf)); + (void)memset(expect_dst_buf, 0, sizeof(expect_dst_buf)); dst_i = 0; for (i = 1; i < 4; i++) for (j = 1; j < 4; j++) @@ -13686,7 +13686,7 @@ test_gather(void) /* Loop over buffer sizes */ for (dst_buf_size = 1; dst_buf_size <= 17; dst_buf_size++) { /* Reset dst_buf */ - (void)HDmemset(dst_buf, 0, sizeof(dst_buf)); + (void)memset(dst_buf, 0, sizeof(dst_buf)); /* Initialize gather_info */ gather_info.expect_dst_buf = expect_dst_buf; @@ -13713,14 +13713,14 @@ test_gather(void) /* Initialize expect_dst_buf */ /* Iterate over block containing selection, checking if each element is in * selection. */ - (void)HDmemset(expect_dst_buf, 0, sizeof(expect_dst_buf)); + (void)memset(expect_dst_buf, 0, sizeof(expect_dst_buf)); for (i = 0; i < (int)(sizeof(point) / sizeof(point[0])); i++) expect_dst_buf[i] = src_buf[point[i][0]][point[i][1]][point[i][2]]; /* Loop over buffer sizes */ for (dst_buf_size = 1; dst_buf_size <= 5; dst_buf_size++) { /* Reset dst_buf */ - (void)HDmemset(dst_buf, 0, sizeof(dst_buf)); + (void)memset(dst_buf, 0, sizeof(dst_buf)); /* Initialize gather_info */ gather_info.expect_dst_buf = expect_dst_buf; @@ -14031,7 +14031,7 @@ test_gather_error(void) TEST_ERROR; /* Initialize expect_dst_buf */ - (void)HDmemset(expect_dst_buf, 0, sizeof(expect_dst_buf)); + (void)memset(expect_dst_buf, 0, sizeof(expect_dst_buf)); for (i = 0; i < 6; i++) expect_dst_buf[i] = src_buf[i + 2]; @@ -14904,7 +14904,7 @@ test_h5s_block(void) FAIL_STACK_ERROR; /* Reset the memory buffer */ - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); /* Read the entire dataset */ if (H5Dread(dset_id, H5T_NATIVE_INT, H5S_BLOCK, H5S_ALL, H5P_DEFAULT, buf) < 0) @@ -15082,7 +15082,7 @@ test_h5s_plist(void) FAIL_STACK_ERROR; /* Reset the memory buffer */ - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); /* Read the entire dataset */ if (H5Dread(dset_id, H5T_NATIVE_INT, H5S_BLOCK, H5S_ALL, H5P_DEFAULT, buf) < 0) @@ -15094,7 +15094,7 @@ test_h5s_plist(void) TEST_ERROR; /* Reset the memory buffer */ - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); /* Set valid selection in DXPL */ if (H5Pset_dataset_io_hyperslab_selection(dxpl_id, 1, H5S_SELECT_SET, &start, &stride, &count, &block) < @@ -15111,7 +15111,7 @@ test_h5s_plist(void) TEST_ERROR; /* Reset the memory buffer */ - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); /* Check for copying property list w/selection */ if ((dxpl_id_copy = H5Pcopy(dxpl_id)) < 0) @@ -15309,7 +15309,7 @@ test_0sized_dset_metadata_alloc(hid_t fapl_id) FAIL_STACK_ERROR; /* Retrieve & verify the dataset's index info */ - HDmemset(&nat_info, 0, sizeof(nat_info)); + memset(&nat_info, 0, sizeof(nat_info)); if (H5Oget_native_info(dset_id, &nat_info, H5O_NATIVE_INFO_META_SIZE) < 0) FAIL_STACK_ERROR; if (0 != nat_info.meta_size.obj.index_size) @@ -15348,7 +15348,7 @@ test_0sized_dset_metadata_alloc(hid_t fapl_id) FAIL_STACK_ERROR; /* Retrieve & verify the dataset's index info */ - HDmemset(&nat_info, 0, sizeof(nat_info)); + memset(&nat_info, 0, sizeof(nat_info)); if (H5Oget_native_info(dset_id, &nat_info, H5O_NATIVE_INFO_META_SIZE) < 0) FAIL_STACK_ERROR; if (0 == nat_info.meta_size.obj.index_size) diff --git a/test/dt_arith.c b/test/dt_arith.c index 57ef5ca..ed80d5f 100644 --- a/test/dt_arith.c +++ b/test/dt_arith.c @@ -113,8 +113,8 @@ static int without_hardware_g = 0; NELMTS = SRC_PREC * 3; \ BUF = (unsigned char *)aligned_malloc(NELMTS * MAX(SRC_SIZE, DST_SIZE)); \ SAVED = (unsigned char *)aligned_malloc(NELMTS * MAX(SRC_SIZE, DST_SIZE)); \ - HDmemset(BUF, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ - HDmemset(SAVED, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ + memset(BUF, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ + memset(SAVED, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ \ buf_p = BUF; \ saved_p = SAVED; \ @@ -123,14 +123,14 @@ static int without_hardware_g = 0; /*VALUE2 ascends from 00000000, to 00000011, 00000111,..., until 11111111.*/ \ for (n = 0; n < SRC_PREC; n++) { \ { \ - HDmemcpy(buf_p, &value1, SRC_SIZE); \ - HDmemcpy(saved_p, &value1, SRC_SIZE); \ + memcpy(buf_p, &value1, SRC_SIZE); \ + memcpy(saved_p, &value1, SRC_SIZE); \ buf_p += SRC_SIZE; \ saved_p += SRC_SIZE; \ } \ { \ - HDmemcpy(buf_p, &value2, SRC_SIZE); \ - HDmemcpy(saved_p, &value2, SRC_SIZE); \ + memcpy(buf_p, &value2, SRC_SIZE); \ + memcpy(saved_p, &value2, SRC_SIZE); \ buf_p += SRC_SIZE; \ saved_p += SRC_SIZE; \ } \ @@ -149,8 +149,8 @@ static int without_hardware_g = 0; /* VALUE2 descends from 11111111 to 11111110, 11111100, ..., until 10000000. */ \ for (n = 0; n < SRC_PREC - 1; n++) { \ { \ - HDmemcpy(buf_p, &value2, SRC_SIZE); \ - HDmemcpy(saved_p, &value2, SRC_SIZE); \ + memcpy(buf_p, &value2, SRC_SIZE); \ + memcpy(saved_p, &value2, SRC_SIZE); \ buf_p += SRC_SIZE; \ saved_p += SRC_SIZE; \ } \ @@ -230,8 +230,8 @@ static int without_hardware_g = 0; /* Allocate buffers */ \ BUF = (unsigned char *)aligned_malloc(NELMTS * MAX(SRC_SIZE, DST_SIZE)); \ SAVED = (unsigned char *)aligned_malloc(NELMTS * MAX(SRC_SIZE, DST_SIZE)); \ - HDmemset(BUF, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ - HDmemset(SAVED, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ + memset(BUF, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ + memset(SAVED, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ \ buf_p = BUF; \ saved_p = SAVED; \ @@ -241,15 +241,15 @@ static int without_hardware_g = 0; value2 = -SRC_MIN; \ for (n = 0; n < num_norm; n++) { \ if (value1 < SRC_MAX) { /*positive*/ \ - HDmemcpy(buf_p, &value1, SRC_SIZE); \ - HDmemcpy(saved_p, &value1, SRC_SIZE); \ + memcpy(buf_p, &value1, SRC_SIZE); \ + memcpy(saved_p, &value1, SRC_SIZE); \ value1 *= multiply; \ buf_p += SRC_SIZE; \ saved_p += SRC_SIZE; \ } \ if (value2 > -SRC_MAX) { /*negative*/ \ - HDmemcpy(buf_p, &value2, SRC_SIZE); \ - HDmemcpy(saved_p, &value2, SRC_SIZE); \ + memcpy(buf_p, &value2, SRC_SIZE); \ + memcpy(saved_p, &value2, SRC_SIZE); \ value2 *= multiply; \ buf_p += SRC_SIZE; \ saved_p += SRC_SIZE; \ @@ -257,14 +257,14 @@ static int without_hardware_g = 0; } \ \ value1 = SRC_MAX; /*maximal value*/ \ - HDmemcpy(buf_p, &value1, SRC_SIZE); \ - HDmemcpy(saved_p, &value1, SRC_SIZE); \ + memcpy(buf_p, &value1, SRC_SIZE); \ + memcpy(saved_p, &value1, SRC_SIZE); \ buf_p += SRC_SIZE; \ saved_p += SRC_SIZE; \ \ value2 = -SRC_MAX; /*negative value*/ \ - HDmemcpy(buf_p, &value2, SRC_SIZE); \ - HDmemcpy(saved_p, &value2, SRC_SIZE); \ + memcpy(buf_p, &value2, SRC_SIZE); \ + memcpy(saved_p, &value2, SRC_SIZE); \ buf_p += SRC_SIZE; \ saved_p += SRC_SIZE; \ } while (0) @@ -285,8 +285,8 @@ static int without_hardware_g = 0; /* Allocate buffers */ \ BUF = (unsigned char *)aligned_malloc(NELMTS * MAX(SRC_SIZE, DST_SIZE)); \ SAVED = (unsigned char *)aligned_malloc(NELMTS * MAX(SRC_SIZE, DST_SIZE)); \ - HDmemset(BUF, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ - HDmemset(SAVED, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ + memset(BUF, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ + memset(SAVED, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ \ tmp1 = (unsigned char *)calloc((size_t)1, (size_t)SRC_SIZE); \ tmp2 = (unsigned char *)calloc((size_t)1, (size_t)SRC_SIZE); \ @@ -296,14 +296,14 @@ static int without_hardware_g = 0; \ /*Denormalized values. Exponent is 0. Let mantissa starts from 00000001, 00000011, \ *00000111,..., until 11111111.*/ \ - HDmemset(tmp1, 0, SRC_SIZE); \ - HDmemset(tmp2, 0, SRC_SIZE); \ + memset(tmp1, 0, SRC_SIZE); \ + memset(tmp2, 0, SRC_SIZE); \ H5T__bit_set(tmp2, SRC_PREC - 1, (size_t)1, TRUE); /*the negative value*/ \ for (n = 0; n < SRC_MANT_DIG - 1; n++) { \ H5T__bit_set(tmp1, n, (size_t)1, TRUE); /*turn on 1 bit each time*/ \ CHANGE_ORDER(tmp1, SRC_ORDR, SRC_SIZE); /*change order for big endian*/ \ - HDmemcpy(buf_p, tmp1, SRC_SIZE); \ - HDmemcpy(saved_p, tmp1, SRC_SIZE); \ + memcpy(buf_p, tmp1, SRC_SIZE); \ + memcpy(saved_p, tmp1, SRC_SIZE); \ CHANGE_ORDER(tmp1, SRC_ORDR, SRC_SIZE); /*change back the order for bit operation*/ \ buf_p += SRC_SIZE; \ saved_p += SRC_SIZE; \ @@ -311,8 +311,8 @@ static int without_hardware_g = 0; /*negative values*/ \ H5T__bit_set(tmp2, n, (size_t)1, TRUE); \ CHANGE_ORDER(tmp2, SRC_ORDR, SRC_SIZE); \ - HDmemcpy(buf_p, tmp2, SRC_SIZE); \ - HDmemcpy(saved_p, tmp2, SRC_SIZE); \ + memcpy(buf_p, tmp2, SRC_SIZE); \ + memcpy(saved_p, tmp2, SRC_SIZE); \ CHANGE_ORDER(tmp2, SRC_ORDR, SRC_SIZE); \ buf_p += SRC_SIZE; \ saved_p += SRC_SIZE; \ @@ -337,24 +337,24 @@ static int without_hardware_g = 0; /* Allocate buffers */ \ BUF = (unsigned char *)aligned_malloc(NELMTS * MAX(SRC_SIZE, DST_SIZE)); \ SAVED = (unsigned char *)aligned_malloc(NELMTS * MAX(SRC_SIZE, DST_SIZE)); \ - HDmemset(BUF, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ - HDmemset(SAVED, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ + memset(BUF, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ + memset(SAVED, 0, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ value = (unsigned char *)calloc(SRC_SIZE, sizeof(unsigned char)); \ \ buf_p = BUF; \ \ /* +0 */ \ H5T__bit_set(value, (size_t)0, SRC_PREC, FALSE); \ - HDmemcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ + memcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ buf_p += SRC_SIZE; \ \ for (n = 0; n < 2; n++) { \ if (n == 1) { \ - HDmemset(value, 0, SRC_SIZE * sizeof(unsigned char)); \ + memset(value, 0, SRC_SIZE * sizeof(unsigned char)); \ /* -0 */ \ H5T__bit_set(value, (size_t)(SRC_PREC - 1), (size_t)1, TRUE); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change order for big endian*/ \ - HDmemcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ + memcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change back the order for bit operation*/ \ buf_p += SRC_SIZE; \ } \ @@ -362,26 +362,26 @@ static int without_hardware_g = 0; /* +/-infinity */ \ H5T__bit_set(value, (size_t)(SRC_MANT_DIG - 1), SRC_PREC - SRC_MANT_DIG, TRUE); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change order for big endian*/ \ - HDmemcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ + memcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change back the order for bit operation*/ \ buf_p += SRC_SIZE; \ \ /* +/-SNaN */ \ H5T__bit_set(value, (size_t)0, (size_t)1, TRUE); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change order for big endian*/ \ - HDmemcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ + memcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change back the order for bit operation*/ \ buf_p += SRC_SIZE; \ \ /* +/-QNaN */ \ H5T__bit_set(value, (size_t)(SRC_MANT_DIG - 2), (size_t)1, TRUE); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change order for big endian*/ \ - HDmemcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ + memcpy(buf_p, value, SRC_SIZE * sizeof(unsigned char)); \ CHANGE_ORDER(value, SRC_ORDR, SRC_SIZE); /*change back the order for bit operation*/ \ buf_p += SRC_SIZE; \ } \ \ - HDmemcpy(SAVED, BUF, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ + memcpy(SAVED, BUF, NELMTS *MAX(SRC_SIZE, DST_SIZE)); \ free(value); \ } while (0) @@ -630,8 +630,8 @@ test_particular_fp_integer(void) buf1 = (unsigned char *)calloc((size_t)1, (size_t)MAX(src_size1, dst_size1)); saved_buf1 = (unsigned char *)calloc((size_t)1, (size_t)MAX(src_size1, dst_size1)); - HDmemcpy(buf1, &src_d, src_size1); - HDmemcpy(saved_buf1, &src_d, src_size1); + memcpy(buf1, &src_d, src_size1); + memcpy(saved_buf1, &src_d, src_size1); /* Register exception handling function and signal the destination is "signed char". */ flag = 1; @@ -648,7 +648,7 @@ test_particular_fp_integer(void) goto error; } - HDmemcpy(&dst_c, buf1, dst_size1); + memcpy(&dst_c, buf1, dst_size1); /* Print errors */ if (dst_c != SCHAR_MAX) { @@ -663,14 +663,14 @@ test_particular_fp_integer(void) for (j = 0; j < src_size1; j++) printf(" %02x", saved_buf1[ENDIAN(src_size1, j, endian)]); - HDmemcpy(&x, saved_buf1, src_size1); + memcpy(&x, saved_buf1, src_size1); printf(" %29.20e\n", x); printf(" dst = "); for (j = 0; j < dst_size1; j++) printf(" %02x", buf1[ENDIAN(dst_size1, j, endian)]); - HDmemcpy(&y, buf1, dst_size1); + memcpy(&y, buf1, dst_size1); printf(" %29d\n", y); } @@ -679,8 +679,8 @@ test_particular_fp_integer(void) dst_size2 = H5Tget_size(H5T_NATIVE_INT); buf2 = (unsigned char *)calloc((size_t)1, (size_t)MAX(src_size2, dst_size2)); saved_buf2 = (unsigned char *)calloc((size_t)1, (size_t)MAX(src_size2, dst_size2)); - HDmemcpy(buf2, &src_f, src_size2); - HDmemcpy(saved_buf2, &src_f, src_size2); + memcpy(buf2, &src_f, src_size2); + memcpy(saved_buf2, &src_f, src_size2); /* signal exception handling function that the destination is "int". */ flag = 0; @@ -692,7 +692,7 @@ test_particular_fp_integer(void) goto error; } - HDmemcpy(&dst_i, buf2, dst_size2); + memcpy(&dst_i, buf2, dst_size2); /* Print errors */ if (dst_i != fill_value) { @@ -707,14 +707,14 @@ test_particular_fp_integer(void) for (j = 0; j < src_size2; j++) printf(" %02x", saved_buf2[ENDIAN(src_size2, j, endian)]); - HDmemcpy(&x, saved_buf2, src_size2); + memcpy(&x, saved_buf2, src_size2); printf(" %29.20e\n", (double)x); printf(" dst = "); for (j = 0; j < dst_size2; j++) printf(" %02x", buf2[ENDIAN(dst_size2, j, endian)]); - HDmemcpy(&y, buf2, dst_size2); + memcpy(&y, buf2, dst_size2); printf(" %29d\n", y); } @@ -922,8 +922,8 @@ test_derived_flt(void) endian = H5Tget_order(H5T_NATIVE_INT); buf = (unsigned char *)malloc(nelmts * (MAX(src_size, size))); saved_buf = (unsigned char *)malloc(nelmts * src_size); - HDmemset(buf, 0, nelmts * MAX(src_size, size)); - HDmemset(saved_buf, 0, nelmts * src_size); + memset(buf, 0, nelmts * MAX(src_size, size)); + memset(saved_buf, 0, nelmts * src_size); aligned = (int *)calloc((size_t)1, src_size); for (i = 0; i < nelmts * src_size; i++) @@ -965,14 +965,14 @@ test_derived_flt(void) for (j = 0; j < src_size; j++) printf(" %02x", saved_buf[i * src_size + ENDIAN(src_size, j, endian)]); - HDmemcpy(aligned, saved_buf + i * sizeof(int), sizeof(int)); + memcpy(aligned, saved_buf + i * sizeof(int), sizeof(int)); printf(" %29d\n", *aligned); printf(" dst = "); for (j = 0; j < src_size; j++) printf(" %02x", buf[i * src_size + ENDIAN(src_size, j, endian)]); - HDmemcpy(aligned, buf + i * sizeof(int), sizeof(int)); + memcpy(aligned, buf + i * sizeof(int), sizeof(int)); printf(" %29d\n", *aligned); if (fails_this_test >= max_fails) { @@ -1083,8 +1083,8 @@ test_derived_flt(void) endian = H5Tget_order(tid2); buf = (unsigned char *)malloc(nelmts * (MAX(src_size, dst_size))); saved_buf = (unsigned char *)malloc(nelmts * src_size); - HDmemset(buf, 0, nelmts * MAX(src_size, dst_size)); - HDmemset(saved_buf, 0, nelmts * src_size); + memset(buf, 0, nelmts * MAX(src_size, dst_size)); + memset(saved_buf, 0, nelmts * src_size); for (i = 0; i < nelmts * src_size; i++) buf[i] = saved_buf[i] = (unsigned char)HDrand(); @@ -1404,8 +1404,8 @@ test_derived_integer(void) endian = H5Tget_order(tid1); buf = (unsigned char *)malloc(nelmts * (MAX(src_size, dst_size))); saved_buf = (unsigned char *)malloc(nelmts * src_size); - HDmemset(buf, 0, nelmts * MAX(src_size, dst_size)); - HDmemset(saved_buf, 0, nelmts * src_size); + memset(buf, 0, nelmts * MAX(src_size, dst_size)); + memset(saved_buf, 0, nelmts * src_size); for (i = 0; i < nelmts * src_size; i++) buf[i] = saved_buf[i] = (unsigned char)HDrand(); @@ -1734,43 +1734,43 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) hw = (unsigned char *)&hw_char; switch (src_type) { case INT_SCHAR: - HDmemcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); + memcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); hw_char = (signed char)(*((signed char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); + memcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); hw_char = (signed char)(*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short)); + memcpy(aligned, saved + j * sizeof(short), sizeof(short)); hw_char = (signed char)(*((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); + memcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); hw_char = (signed char)(*((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int)); + memcpy(aligned, saved + j * sizeof(int), sizeof(int)); hw_char = (signed char)(*((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); + memcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); hw_char = (signed char)(*((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long)); + memcpy(aligned, saved + j * sizeof(long), sizeof(long)); hw_char = (signed char)(*((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); + memcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); hw_char = (signed char)(*((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); + memcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); hw_char = (signed char)(*((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); + memcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); hw_char = (signed char)(*((unsigned long long *)aligned)); break; case FLT_FLOAT: @@ -1786,43 +1786,43 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) hw = (unsigned char *)&hw_uchar; switch (src_type) { case INT_SCHAR: - HDmemcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); + memcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); hw_uchar = (unsigned char)(*((signed char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); + memcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); hw_uchar = (unsigned char)(*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short)); + memcpy(aligned, saved + j * sizeof(short), sizeof(short)); hw_uchar = (unsigned char)(*((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); + memcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); hw_uchar = (unsigned char)(*((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int)); + memcpy(aligned, saved + j * sizeof(int), sizeof(int)); hw_uchar = (unsigned char)(*((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); + memcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); hw_uchar = (unsigned char)(*((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long)); + memcpy(aligned, saved + j * sizeof(long), sizeof(long)); hw_uchar = (unsigned char)(*((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); + memcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); hw_uchar = (unsigned char)(*((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); + memcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); hw_uchar = (unsigned char)(*((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); + memcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); hw_uchar = (unsigned char)(*((unsigned long long *)aligned)); break; case FLT_FLOAT: @@ -1838,43 +1838,43 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) hw = (unsigned char *)&hw_short; switch (src_type) { case INT_SCHAR: - HDmemcpy(aligned, saved + j * sizeof(char), sizeof(char)); + memcpy(aligned, saved + j * sizeof(char), sizeof(char)); hw_short = (short)(*((char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); + memcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); hw_short = (short)(*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short)); + memcpy(aligned, saved + j * sizeof(short), sizeof(short)); hw_short = (short)(*((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); + memcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); hw_short = (short)(*((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int)); + memcpy(aligned, saved + j * sizeof(int), sizeof(int)); hw_short = (short)(*((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); + memcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); hw_short = (short)(*((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long)); + memcpy(aligned, saved + j * sizeof(long), sizeof(long)); hw_short = (short)(*((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); + memcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); hw_short = (short)(*((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); + memcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); hw_short = (short)(*((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); + memcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); hw_short = (short)(*((unsigned long long *)aligned)); break; @@ -1891,43 +1891,43 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) hw = (unsigned char *)&hw_ushort; switch (src_type) { case INT_SCHAR: - HDmemcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); + memcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); hw_ushort = (unsigned short)(*((signed char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); + memcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); hw_ushort = (unsigned short)(*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short)); + memcpy(aligned, saved + j * sizeof(short), sizeof(short)); hw_ushort = (unsigned short)(*((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); + memcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); hw_ushort = (unsigned short)(*((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int)); + memcpy(aligned, saved + j * sizeof(int), sizeof(int)); hw_ushort = (unsigned short)(*((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); + memcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); hw_ushort = (unsigned short)(*((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long)); + memcpy(aligned, saved + j * sizeof(long), sizeof(long)); hw_ushort = (unsigned short)(*((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); + memcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); hw_ushort = (unsigned short)(*((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); + memcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); hw_ushort = (unsigned short)(*((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); + memcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); hw_ushort = (unsigned short)(*((unsigned long long *)aligned)); break; case FLT_FLOAT: @@ -1943,43 +1943,43 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) hw = (unsigned char *)&hw_int; switch (src_type) { case INT_SCHAR: - HDmemcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); + memcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); hw_int = (int)(*((signed char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); + memcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); hw_int = (int)(*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short)); + memcpy(aligned, saved + j * sizeof(short), sizeof(short)); hw_int = (int)(*((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); + memcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); hw_int = (int)(*((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int)); + memcpy(aligned, saved + j * sizeof(int), sizeof(int)); hw_int = (int)(*((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); + memcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); hw_int = (int)(*((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long)); + memcpy(aligned, saved + j * sizeof(long), sizeof(long)); hw_int = (int)(*((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); + memcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); hw_int = (int)(*((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); + memcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); hw_int = (int)(*((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); + memcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); hw_int = (int)(*((unsigned long long *)aligned)); break; case FLT_FLOAT: @@ -1995,43 +1995,43 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) hw = (unsigned char *)&hw_uint; switch (src_type) { case INT_SCHAR: - HDmemcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); + memcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); hw_uint = (unsigned int)(*((signed char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); + memcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); hw_uint = (unsigned int)(*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short)); + memcpy(aligned, saved + j * sizeof(short), sizeof(short)); hw_uint = (unsigned int)(*((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); + memcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); hw_uint = (unsigned int)(*((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int)); + memcpy(aligned, saved + j * sizeof(int), sizeof(int)); hw_uint = (unsigned int)(*((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); + memcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); hw_uint = (unsigned int)(*((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long)); + memcpy(aligned, saved + j * sizeof(long), sizeof(long)); hw_uint = (unsigned int)(*((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); + memcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); hw_uint = (unsigned int)(*((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); + memcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); hw_uint = (unsigned int)(*((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); + memcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); hw_uint = (unsigned int)(*((unsigned long long *)aligned)); break; case FLT_FLOAT: @@ -2047,43 +2047,43 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) hw = (unsigned char *)&hw_long; switch (src_type) { case INT_SCHAR: - HDmemcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); + memcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); hw_long = (long int)(*((signed char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); + memcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); hw_long = (long int)(*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short)); + memcpy(aligned, saved + j * sizeof(short), sizeof(short)); hw_long = (long int)(*((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); + memcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); hw_long = (long int)(*((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int)); + memcpy(aligned, saved + j * sizeof(int), sizeof(int)); hw_long = (long int)(*((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); + memcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); hw_long = (long int)(*((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long)); + memcpy(aligned, saved + j * sizeof(long), sizeof(long)); hw_long = (long int)(*((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); + memcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); hw_long = (long int)(*((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); + memcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); hw_long = (long int)(*((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); + memcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); hw_long = (long int)(*((unsigned long long *)aligned)); break; case FLT_FLOAT: @@ -2099,43 +2099,43 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) hw = (unsigned char *)&hw_ulong; switch (src_type) { case INT_SCHAR: - HDmemcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); + memcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); hw_ulong = (unsigned long)(*((signed char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); + memcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); hw_ulong = (unsigned long)(*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short)); + memcpy(aligned, saved + j * sizeof(short), sizeof(short)); hw_ulong = (unsigned long)(*((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); + memcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); hw_ulong = (unsigned long)(*((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int)); + memcpy(aligned, saved + j * sizeof(int), sizeof(int)); hw_ulong = (unsigned long)(*((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); + memcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); hw_ulong = (unsigned long)(*((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long)); + memcpy(aligned, saved + j * sizeof(long), sizeof(long)); hw_ulong = (unsigned long)(*((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); + memcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); hw_ulong = (unsigned long)(*((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); + memcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); hw_ulong = (unsigned long)(*((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); + memcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); hw_ulong = (unsigned long)(*((unsigned long long *)aligned)); break; case FLT_FLOAT: @@ -2151,43 +2151,43 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) hw = (unsigned char *)&hw_llong; switch (src_type) { case INT_SCHAR: - HDmemcpy(aligned, saved + j * sizeof(char), sizeof(char)); + memcpy(aligned, saved + j * sizeof(char), sizeof(char)); hw_llong = (long long)(*((char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); + memcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); hw_llong = (long long)(*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short)); + memcpy(aligned, saved + j * sizeof(short), sizeof(short)); hw_llong = (long long)(*((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); + memcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); hw_llong = (long long)(*((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int)); + memcpy(aligned, saved + j * sizeof(int), sizeof(int)); hw_llong = (long long)(*((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); + memcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); hw_llong = (long long)(*((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long)); + memcpy(aligned, saved + j * sizeof(long), sizeof(long)); hw_llong = (long long)(*((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); + memcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); hw_llong = (long long)(*((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); + memcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); hw_llong = (long long)(*((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); + memcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); hw_llong = (long long)(*((unsigned long long *)aligned)); break; case FLT_FLOAT: @@ -2203,43 +2203,43 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) hw = (unsigned char *)&hw_ullong; switch (src_type) { case INT_SCHAR: - HDmemcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); + memcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); hw_ullong = (unsigned long long)(*((signed char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); + memcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); hw_ullong = (unsigned long long)(*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short)); + memcpy(aligned, saved + j * sizeof(short), sizeof(short)); hw_ullong = (unsigned long long)(*((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); + memcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); hw_ullong = (unsigned long long)(*((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int)); + memcpy(aligned, saved + j * sizeof(int), sizeof(int)); hw_ullong = (unsigned long long)(*((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); + memcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); hw_ullong = (unsigned long long)(*((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long)); + memcpy(aligned, saved + j * sizeof(long), sizeof(long)); hw_ullong = (unsigned long long)(*((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); + memcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); hw_ullong = (unsigned long long)(*((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); + memcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); hw_ullong = (unsigned long long)(*((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); + memcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); hw_ullong = (unsigned long long)(*((unsigned long long *)aligned)); break; case FLT_FLOAT: @@ -2385,43 +2385,43 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) printf("%*s", (int)(3 * MAX(0, (ssize_t)dst_size - (ssize_t)src_size)), ""); switch (src_type) { case INT_SCHAR: - HDmemcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); + memcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); printf(" %29d\n", (int)*((signed char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); + memcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); printf(" %29u\n", (unsigned)*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short)); + memcpy(aligned, saved + j * sizeof(short), sizeof(short)); printf(" %29hd\n", *((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); + memcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); printf(" %29hu\n", *((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int)); + memcpy(aligned, saved + j * sizeof(int), sizeof(int)); printf(" %29d\n", *((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); + memcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); printf(" %29u\n", *((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long)); + memcpy(aligned, saved + j * sizeof(long), sizeof(long)); printf(" %29ld\n", *((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); + memcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); printf(" %29lu\n", *((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); + memcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); fprintf(stdout, " %29lld\n", *((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); + memcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); fprintf(stdout, " %29llu\n", *((unsigned long long *)aligned)); break; case FLT_FLOAT: @@ -2439,43 +2439,43 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) printf("%*s", (int)(3 * MAX(0, (ssize_t)src_size - (ssize_t)dst_size)), ""); switch (dst_type) { case INT_SCHAR: - HDmemcpy(aligned, buf + j * sizeof(signed char), sizeof(signed char)); + memcpy(aligned, buf + j * sizeof(signed char), sizeof(signed char)); printf(" %29d\n", (int)*((signed char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, buf + j * sizeof(unsigned char), sizeof(unsigned char)); + memcpy(aligned, buf + j * sizeof(unsigned char), sizeof(unsigned char)); printf(" %29u\n", (unsigned)*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, buf + j * sizeof(short), sizeof(short)); + memcpy(aligned, buf + j * sizeof(short), sizeof(short)); printf(" %29hd\n", *((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, buf + j * sizeof(unsigned short), sizeof(unsigned short)); + memcpy(aligned, buf + j * sizeof(unsigned short), sizeof(unsigned short)); printf(" %29hu\n", *((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, buf + j * sizeof(int), sizeof(int)); + memcpy(aligned, buf + j * sizeof(int), sizeof(int)); printf(" %29d\n", *((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, buf + j * sizeof(unsigned), sizeof(unsigned)); + memcpy(aligned, buf + j * sizeof(unsigned), sizeof(unsigned)); printf(" %29u\n", *((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, buf + j * sizeof(long), sizeof(long)); + memcpy(aligned, buf + j * sizeof(long), sizeof(long)); printf(" %29ld\n", *((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, buf + j * sizeof(unsigned long), sizeof(unsigned long)); + memcpy(aligned, buf + j * sizeof(unsigned long), sizeof(unsigned long)); printf(" %29lu\n", *((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, buf + j * sizeof(long long), sizeof(long long)); + memcpy(aligned, buf + j * sizeof(long long), sizeof(long long)); fprintf(stdout, " %29lld\n", *((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, buf + j * sizeof(long long), sizeof(unsigned long long)); + memcpy(aligned, buf + j * sizeof(long long), sizeof(unsigned long long)); fprintf(stdout, " %29llu\n", *((unsigned long long *)aligned)); break; case FLT_FLOAT: @@ -2639,18 +2639,18 @@ my_isnan(dtype_t type, void *val) if (FLT_FLOAT == type) { float x = 0.0; - HDmemcpy(&x, val, sizeof(float)); + memcpy(&x, val, sizeof(float)); retval = isnan(x); } else if (FLT_DOUBLE == type) { double x = 0.0; - HDmemcpy(&x, val, sizeof(double)); + memcpy(&x, val, sizeof(double)); retval = isnan(x); #if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE } else if (FLT_LDOUBLE == type) { long double x = 0.0L; - HDmemcpy(&x, val, sizeof(long double)); + memcpy(&x, val, sizeof(long double)); retval = isnan(x); #endif } @@ -2666,20 +2666,20 @@ my_isnan(dtype_t type, void *val) if (FLT_FLOAT == type) { float x = 0.0; - HDmemcpy(&x, val, sizeof(float)); + memcpy(&x, val, sizeof(float)); HDsnprintf(s, sizeof(s), "%g", (double)x); } else if (FLT_DOUBLE == type) { double x = 0.0; - HDmemcpy(&x, val, sizeof(double)); + memcpy(&x, val, sizeof(double)); HDsnprintf(s, sizeof(s), "%g", x); #if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE } else if (FLT_LDOUBLE == type) { long double x = 0.0L; - HDmemcpy(&x, val, sizeof(long double)); + memcpy(&x, val, sizeof(long double)); HDsnprintf(s, sizeof(s), "%Lg", x); #endif } @@ -2993,7 +2993,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst) /* The hardware conversion */ /* Check for underflow when src is a "larger" float than dst.*/ if (FLT_FLOAT == src_type) { - HDmemcpy(aligned, saved + j * sizeof(float), sizeof(float)); + memcpy(aligned, saved + j * sizeof(float), sizeof(float)); if (FLT_FLOAT == dst_type) { hw_f = *((float *)aligned); hw = (unsigned char *)&hw_f; @@ -3010,7 +3010,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst) } } else if (FLT_DOUBLE == src_type) { - HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double)); + memcpy(aligned, saved + j * sizeof(double), sizeof(double)); if (FLT_FLOAT == dst_type) { hw_f = (float)(*((double *)aligned)); hw = (unsigned char *)&hw_f; @@ -3030,7 +3030,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst) #if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE } else { - HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); + memcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); if (FLT_FLOAT == dst_type) { hw_f = (float)*((long double *)aligned); hw = (unsigned char *)&hw_f; @@ -3119,7 +3119,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst) if (FLT_FLOAT == dst_type) { float x = 0.0; - HDmemcpy(&x, &buf[j * dst_size], sizeof(float)); + memcpy(&x, &buf[j * dst_size], sizeof(float)); if (underflow && HDfabsf(x) <= FLT_MIN && HDfabsf(hw_f) <= FLT_MIN) continue; /* all underflowed, no error */ if (overflow && my_isinf(dendian, buf + j * sizeof(float), dst_size, dst_mpos, dst_msize, @@ -3130,7 +3130,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst) } else if (FLT_DOUBLE == dst_type) { double x = 0.0; - HDmemcpy(&x, &buf[j * dst_size], sizeof(double)); + memcpy(&x, &buf[j * dst_size], sizeof(double)); if (underflow && HDfabs(x) <= DBL_MIN && HDfabs(hw_d) <= DBL_MIN) continue; /* all underflowed, no error */ if (overflow && my_isinf(dendian, buf + j * sizeof(double), dst_size, dst_mpos, dst_msize, @@ -3142,7 +3142,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst) } else { long double x = 0.0L; - HDmemcpy(&x, &buf[j * dst_size], sizeof(long double)); + memcpy(&x, &buf[j * dst_size], sizeof(long double)); /* dst is largest float, no need to check underflow. */ check_mant[0] = (double)HDfrexpl(x, check_expo + 0); check_mant[1] = (double)HDfrexpl(hw_ld, check_expo + 1); @@ -3189,18 +3189,18 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst) printf("%*s", (int)(3 * MAX(0, (ssize_t)dst_size - (ssize_t)src_size)), ""); if (FLT_FLOAT == src_type) { float x = 0.0; - HDmemcpy(&x, &saved[j * src_size], sizeof(float)); + memcpy(&x, &saved[j * src_size], sizeof(float)); printf(" %29.20e\n", (double)x); } else if (FLT_DOUBLE == src_type) { double x = 0.0; - HDmemcpy(&x, &saved[j * src_size], sizeof(double)); + memcpy(&x, &saved[j * src_size], sizeof(double)); printf(" %29.20e\n", x); #if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE } else { long double x = 0.0L; - HDmemcpy(&x, &saved[j * src_size], sizeof(long double)); + memcpy(&x, &saved[j * src_size], sizeof(long double)); fprintf(stdout, " %29.20Le\n", x); #endif } @@ -3211,18 +3211,18 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst) printf("%*s", (int)(3 * MAX(0, (ssize_t)src_size - (ssize_t)dst_size)), ""); if (FLT_FLOAT == dst_type) { float x = 0.0; - HDmemcpy(&x, &buf[j * dst_size], sizeof(float)); + memcpy(&x, &buf[j * dst_size], sizeof(float)); printf(" %29.20e\n", (double)x); } else if (FLT_DOUBLE == dst_type) { double x = 0.0; - HDmemcpy(&x, &buf[j * dst_size], sizeof(double)); + memcpy(&x, &buf[j * dst_size], sizeof(double)); printf(" %29.20e\n", x); #if H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE } else { long double x = 0.0L; - HDmemcpy(&x, &buf[j * dst_size], sizeof(long double)); + memcpy(&x, &buf[j * dst_size], sizeof(long double)); fprintf(stdout, " %29.20Le\n", x); #endif } @@ -3564,7 +3564,7 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) * 12 bytes but precision is 10 bytes. The 2 unused bytes may * have garbage causing wrong value comparison. */ - HDmemset(&hw_ldouble, 0, sizeof(long double)); + memset(&hw_ldouble, 0, sizeof(long double)); /* Create a dataset transfer property list and datatype conversion * exception handler function and pass in fill value. This is mainly @@ -3679,43 +3679,43 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) hw = (unsigned char *)&hw_float; switch (src_type) { case INT_SCHAR: - HDmemcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); + memcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); hw_float = (float)(*((signed char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); + memcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); hw_float = (float)(*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short)); + memcpy(aligned, saved + j * sizeof(short), sizeof(short)); hw_float = (float)(*((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); + memcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); hw_float = (float)(*((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int)); + memcpy(aligned, saved + j * sizeof(int), sizeof(int)); hw_float = (float)(*((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); + memcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); hw_float = (float)(*((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long)); + memcpy(aligned, saved + j * sizeof(long), sizeof(long)); hw_float = (float)(*((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); + memcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); hw_float = (float)(*((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); + memcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); hw_float = (float)(*((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); + memcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); hw_float = (float)(*((unsigned long long *)aligned)); break; case FLT_FLOAT: @@ -3731,43 +3731,43 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) hw = (unsigned char *)&hw_double; switch (src_type) { case INT_SCHAR: - HDmemcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); + memcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); hw_double = (double)(*((signed char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); + memcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); hw_double = (double)(*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short)); + memcpy(aligned, saved + j * sizeof(short), sizeof(short)); hw_double = (double)(*((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); + memcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); hw_double = (double)(*((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int)); + memcpy(aligned, saved + j * sizeof(int), sizeof(int)); hw_double = (double)(*((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); + memcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); hw_double = (double)(*((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long)); + memcpy(aligned, saved + j * sizeof(long), sizeof(long)); hw_double = (double)(*((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); + memcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); hw_double = (double)(*((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); + memcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); hw_double = (double)(*((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); + memcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); hw_double = (double)(*((unsigned long long *)aligned)); break; case FLT_FLOAT: @@ -3783,43 +3783,43 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) hw = (unsigned char *)&hw_ldouble; switch (src_type) { case INT_SCHAR: - HDmemcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); + memcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); hw_ldouble = (long double)(*((signed char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); + memcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); hw_ldouble = (long double)(*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short)); + memcpy(aligned, saved + j * sizeof(short), sizeof(short)); hw_ldouble = (long double)(*((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); + memcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); hw_ldouble = (long double)(*((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int)); + memcpy(aligned, saved + j * sizeof(int), sizeof(int)); hw_ldouble = (long double)(*((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); + memcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); hw_ldouble = (long double)(*((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long)); + memcpy(aligned, saved + j * sizeof(long), sizeof(long)); hw_ldouble = (long double)(*((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); + memcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); hw_ldouble = (long double)(*((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); + memcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); hw_ldouble = (long double)(*((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); + memcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); hw_ldouble = (long double)(*((unsigned long long *)aligned)); break; case FLT_FLOAT: @@ -3835,15 +3835,15 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) hw = (unsigned char *)&hw_schar; switch (src_type) { case FLT_FLOAT: - HDmemcpy(aligned, saved + j * sizeof(float), sizeof(float)); + memcpy(aligned, saved + j * sizeof(float), sizeof(float)); hw_schar = (signed char)(*((float *)aligned)); break; case FLT_DOUBLE: - HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double)); + memcpy(aligned, saved + j * sizeof(double), sizeof(double)); hw_schar = (signed char)(*((double *)aligned)); break; case FLT_LDOUBLE: - HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); + memcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); hw_schar = (signed char)(*((long double *)aligned)); break; case INT_SCHAR: @@ -3866,15 +3866,15 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) hw = (unsigned char *)&hw_uchar; switch (src_type) { case FLT_FLOAT: - HDmemcpy(aligned, saved + j * sizeof(float), sizeof(float)); + memcpy(aligned, saved + j * sizeof(float), sizeof(float)); hw_uchar = (unsigned char)(*((float *)aligned)); break; case FLT_DOUBLE: - HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double)); + memcpy(aligned, saved + j * sizeof(double), sizeof(double)); hw_uchar = (unsigned char)(*((double *)aligned)); break; case FLT_LDOUBLE: - HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); + memcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); hw_uchar = (unsigned char)(*((long double *)aligned)); break; case INT_SCHAR: @@ -3897,15 +3897,15 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) hw = (unsigned char *)&hw_short; switch (src_type) { case FLT_FLOAT: - HDmemcpy(aligned, saved + j * sizeof(float), sizeof(float)); + memcpy(aligned, saved + j * sizeof(float), sizeof(float)); hw_short = (short)(*((float *)aligned)); break; case FLT_DOUBLE: - HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double)); + memcpy(aligned, saved + j * sizeof(double), sizeof(double)); hw_short = (short)(*((double *)aligned)); break; case FLT_LDOUBLE: - HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); + memcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); hw_short = (short)(*((long double *)aligned)); break; case INT_SCHAR: @@ -3928,15 +3928,15 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) hw = (unsigned char *)&hw_ushort; switch (src_type) { case FLT_FLOAT: - HDmemcpy(aligned, saved + j * sizeof(float), sizeof(float)); + memcpy(aligned, saved + j * sizeof(float), sizeof(float)); hw_ushort = (unsigned short)(*((float *)aligned)); break; case FLT_DOUBLE: - HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double)); + memcpy(aligned, saved + j * sizeof(double), sizeof(double)); hw_ushort = (unsigned short)(*((double *)aligned)); break; case FLT_LDOUBLE: - HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); + memcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); hw_ushort = (unsigned short)(*((long double *)aligned)); break; case INT_SCHAR: @@ -3959,15 +3959,15 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) hw = (unsigned char *)&hw_int; switch (src_type) { case FLT_FLOAT: - HDmemcpy(aligned, saved + j * sizeof(float), sizeof(float)); + memcpy(aligned, saved + j * sizeof(float), sizeof(float)); hw_int = (int)(*((float *)aligned)); break; case FLT_DOUBLE: - HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double)); + memcpy(aligned, saved + j * sizeof(double), sizeof(double)); hw_int = (int)(*((double *)aligned)); break; case FLT_LDOUBLE: - HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); + memcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); hw_int = (int)(*((long double *)aligned)); break; case INT_SCHAR: @@ -3990,15 +3990,15 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) hw = (unsigned char *)&hw_uint; switch (src_type) { case FLT_FLOAT: - HDmemcpy(aligned, saved + j * sizeof(float), sizeof(float)); + memcpy(aligned, saved + j * sizeof(float), sizeof(float)); hw_uint = (unsigned int)(*((float *)aligned)); break; case FLT_DOUBLE: - HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double)); + memcpy(aligned, saved + j * sizeof(double), sizeof(double)); hw_uint = (unsigned int)(*((double *)aligned)); break; case FLT_LDOUBLE: - HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); + memcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); hw_uint = (unsigned int)(*((long double *)aligned)); break; case INT_SCHAR: @@ -4021,15 +4021,15 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) hw = (unsigned char *)&hw_long; switch (src_type) { case FLT_FLOAT: - HDmemcpy(aligned, saved + j * sizeof(float), sizeof(float)); + memcpy(aligned, saved + j * sizeof(float), sizeof(float)); hw_long = (long)(*((float *)aligned)); break; case FLT_DOUBLE: - HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double)); + memcpy(aligned, saved + j * sizeof(double), sizeof(double)); hw_long = (long)(*((double *)aligned)); break; case FLT_LDOUBLE: - HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); + memcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); hw_long = (long)(*((long double *)aligned)); break; case INT_SCHAR: @@ -4052,15 +4052,15 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) hw = (unsigned char *)&hw_ulong; switch (src_type) { case FLT_FLOAT: - HDmemcpy(aligned, saved + j * sizeof(float), sizeof(float)); + memcpy(aligned, saved + j * sizeof(float), sizeof(float)); hw_ulong = (unsigned long)(*((float *)aligned)); break; case FLT_DOUBLE: - HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double)); + memcpy(aligned, saved + j * sizeof(double), sizeof(double)); hw_ulong = (unsigned long)(*((double *)aligned)); break; case FLT_LDOUBLE: - HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); + memcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); hw_ulong = (unsigned long)(*((long double *)aligned)); break; case INT_SCHAR: @@ -4083,15 +4083,15 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) hw = (unsigned char *)&hw_llong; switch (src_type) { case FLT_FLOAT: - HDmemcpy(aligned, saved + j * sizeof(float), sizeof(float)); + memcpy(aligned, saved + j * sizeof(float), sizeof(float)); hw_llong = (long long)(*((float *)aligned)); break; case FLT_DOUBLE: - HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double)); + memcpy(aligned, saved + j * sizeof(double), sizeof(double)); hw_llong = (long long)(*((double *)aligned)); break; case FLT_LDOUBLE: - HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); + memcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); hw_llong = (long long)(*((long double *)aligned)); break; case INT_SCHAR: @@ -4114,15 +4114,15 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) hw = (unsigned char *)&hw_ullong; switch (src_type) { case FLT_FLOAT: - HDmemcpy(aligned, saved + j * sizeof(float), sizeof(float)); + memcpy(aligned, saved + j * sizeof(float), sizeof(float)); hw_ullong = (unsigned long long)(*((float *)aligned)); break; case FLT_DOUBLE: - HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double)); + memcpy(aligned, saved + j * sizeof(double), sizeof(double)); hw_ullong = (unsigned long long)(*((double *)aligned)); break; case FLT_LDOUBLE: - HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); + memcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); hw_ullong = (unsigned long long)(*((long double *)aligned)); break; case INT_SCHAR: @@ -4287,55 +4287,55 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) printf("%*s", (int)(3 * MAX(0, (ssize_t)dst_size - (ssize_t)src_size)), ""); switch (src_type) { case INT_SCHAR: - HDmemcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); + memcpy(aligned, saved + j * sizeof(signed char), sizeof(signed char)); printf(" %29d\n", (int)*((signed char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); + memcpy(aligned, saved + j * sizeof(unsigned char), sizeof(unsigned char)); printf(" %29u\n", (unsigned)*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, saved + j * sizeof(short), sizeof(short)); + memcpy(aligned, saved + j * sizeof(short), sizeof(short)); printf(" %29hd\n", *((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); + memcpy(aligned, saved + j * sizeof(unsigned short), sizeof(unsigned short)); printf(" %29hu\n", *((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, saved + j * sizeof(int), sizeof(int)); + memcpy(aligned, saved + j * sizeof(int), sizeof(int)); printf(" %29d\n", *((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); + memcpy(aligned, saved + j * sizeof(unsigned), sizeof(unsigned)); printf(" %29u\n", *((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, saved + j * sizeof(long), sizeof(long)); + memcpy(aligned, saved + j * sizeof(long), sizeof(long)); printf(" %29ld\n", *((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); + memcpy(aligned, saved + j * sizeof(unsigned long), sizeof(unsigned long)); printf(" %29lu\n", *((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); + memcpy(aligned, saved + j * sizeof(long long), sizeof(long long)); fprintf(stdout, " %29lld\n", *((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); + memcpy(aligned, saved + j * sizeof(unsigned long long), sizeof(unsigned long long)); fprintf(stdout, " %29llu\n", *((unsigned long long *)aligned)); break; case FLT_FLOAT: - HDmemcpy(aligned, saved + j * sizeof(float), sizeof(float)); + memcpy(aligned, saved + j * sizeof(float), sizeof(float)); printf(" %29f\n", (double)*((float *)aligned)); break; case FLT_DOUBLE: - HDmemcpy(aligned, saved + j * sizeof(double), sizeof(double)); + memcpy(aligned, saved + j * sizeof(double), sizeof(double)); printf(" %29f\n", *((double *)aligned)); break; case FLT_LDOUBLE: - HDmemcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); + memcpy(aligned, saved + j * sizeof(long double), sizeof(long double)); printf(" %29Lf\n", *((long double *)aligned)); break; case OTHER: @@ -4350,55 +4350,55 @@ test_conv_int_fp(const char *name, int run_test, hid_t src, hid_t dst) printf("%*s", (int)(3 * MAX(0, (ssize_t)src_size - (ssize_t)dst_size)), ""); switch (dst_type) { case INT_SCHAR: - HDmemcpy(aligned, buf + j * sizeof(signed char), sizeof(signed char)); + memcpy(aligned, buf + j * sizeof(signed char), sizeof(signed char)); printf(" %29d\n", (int)*((signed char *)aligned)); break; case INT_UCHAR: - HDmemcpy(aligned, buf + j * sizeof(unsigned char), sizeof(unsigned char)); + memcpy(aligned, buf + j * sizeof(unsigned char), sizeof(unsigned char)); printf(" %29u\n", (unsigned)*((unsigned char *)aligned)); break; case INT_SHORT: - HDmemcpy(aligned, buf + j * sizeof(short), sizeof(short)); + memcpy(aligned, buf + j * sizeof(short), sizeof(short)); printf(" %29hd\n", *((short *)aligned)); break; case INT_USHORT: - HDmemcpy(aligned, buf + j * sizeof(unsigned short), sizeof(unsigned short)); + memcpy(aligned, buf + j * sizeof(unsigned short), sizeof(unsigned short)); printf(" %29hu\n", *((unsigned short *)aligned)); break; case INT_INT: - HDmemcpy(aligned, buf + j * sizeof(int), sizeof(int)); + memcpy(aligned, buf + j * sizeof(int), sizeof(int)); printf(" %29d\n", *((int *)aligned)); break; case INT_UINT: - HDmemcpy(aligned, buf + j * sizeof(unsigned), sizeof(unsigned)); + memcpy(aligned, buf + j * sizeof(unsigned), sizeof(unsigned)); printf(" %29u\n", *((unsigned *)aligned)); break; case INT_LONG: - HDmemcpy(aligned, buf + j * sizeof(long), sizeof(long)); + memcpy(aligned, buf + j * sizeof(long), sizeof(long)); printf(" %29ld\n", *((long *)aligned)); break; case INT_ULONG: - HDmemcpy(aligned, buf + j * sizeof(unsigned long), sizeof(unsigned long)); + memcpy(aligned, buf + j * sizeof(unsigned long), sizeof(unsigned long)); printf(" %29lu\n", *((unsigned long *)aligned)); break; case INT_LLONG: - HDmemcpy(aligned, buf + j * sizeof(long long), sizeof(long long)); + memcpy(aligned, buf + j * sizeof(long long), sizeof(long long)); fprintf(stdout, " %29lld\n", *((long long *)aligned)); break; case INT_ULLONG: - HDmemcpy(aligned, buf + j * sizeof(unsigned long long), sizeof(unsigned long long)); + memcpy(aligned, buf + j * sizeof(unsigned long long), sizeof(unsigned long long)); fprintf(stdout, " %29llu\n", *((unsigned long long *)aligned)); break; case FLT_FLOAT: - HDmemcpy(aligned, buf + j * sizeof(float), sizeof(float)); + memcpy(aligned, buf + j * sizeof(float), sizeof(float)); printf(" %29f\n", (double)*((float *)aligned)); break; case FLT_DOUBLE: - HDmemcpy(aligned, buf + j * sizeof(double), sizeof(double)); + memcpy(aligned, buf + j * sizeof(double), sizeof(double)); printf(" %29f\n", *((double *)aligned)); break; case FLT_LDOUBLE: - HDmemcpy(aligned, buf + j * sizeof(long double), sizeof(long double)); + memcpy(aligned, buf + j * sizeof(long double), sizeof(long double)); printf(" %29Lf\n", *((long double *)aligned)); break; case OTHER: @@ -4540,8 +4540,8 @@ overflows(unsigned char *origin_bits, hid_t src_id, size_t dst_num_bits) ssize_t indx; unsigned char bits[32], mant_bits[32]; - HDmemset(bits, 0, (size_t)32); - HDmemset(mant_bits, 0, (size_t)32); + memset(bits, 0, (size_t)32); + memset(mant_bits, 0, (size_t)32); /* * Sometimes, type size isn't equal to the precision like Linux's "long @@ -4553,7 +4553,7 @@ overflows(unsigned char *origin_bits, hid_t src_id, size_t dst_num_bits) bias = H5Tget_ebias(src_id); norm = H5Tget_norm(src_id); - HDmemcpy(bits, origin_bits, src_prec / 8 + 1); + memcpy(bits, origin_bits, src_prec / 8 + 1); /*Check for special cases: +Inf, -Inf*/ if (H5T__bit_find(bits, mpos, mant_digits, H5T_BIT_LSB, TRUE) < 0) { diff --git a/test/dtypes.c b/test/dtypes.c index 77a9ecd..21a79a1 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -778,7 +778,7 @@ test_compound_2(void) s_ptr->d = i * 8 + 6; s_ptr->e = i * 8 + 7; } - HDmemcpy(buf, orig, nelmts * sizeof(struct st)); + memcpy(buf, orig, nelmts * sizeof(struct st)); /* Build hdf5 datatypes */ array_dt = H5Tarray_create2(H5T_NATIVE_INT, 1, &four); @@ -903,7 +903,7 @@ test_compound_3(void) s_ptr->d = i * 8 + 6; s_ptr->e = i * 8 + 7; } - HDmemcpy(buf, orig, nelmts * sizeof(struct st)); + memcpy(buf, orig, nelmts * sizeof(struct st)); /* Build hdf5 datatypes */ array_dt = H5Tarray_create2(H5T_NATIVE_INT, 1, &four); @@ -1028,7 +1028,7 @@ test_compound_4(void) s_ptr->d = (i * 8 + 6) & 0x7fff; s_ptr->e = i * 8 + 7; } - HDmemcpy(buf, orig, nelmts * sizeof(struct st)); + memcpy(buf, orig, nelmts * sizeof(struct st)); /* Build hdf5 datatypes */ array_dt = H5Tarray_create2(H5T_NATIVE_INT, 1, &four); @@ -1170,7 +1170,7 @@ test_compound_5(void) H5Tinsert(dst_type, "coll_ids", HOFFSET(dst_type_t, coll_ids), int_array); /* Convert data */ - HDmemcpy(buf, src, sizeof(src)); + memcpy(buf, src, sizeof(src)); H5Tconvert(src_type, dst_type, (size_t)2, buf, bkg, H5P_DEFAULT); dst = (dst_type_t *)buf; @@ -1182,7 +1182,7 @@ test_compound_5(void) H5Tclose(int_array); /* Check results */ - if (HDmemcmp(src[1].name, dst[1].name, sizeof(src[1].name)) != 0 || src[1].tdim != dst[1].tdim || + if (memcmp(src[1].name, dst[1].name, sizeof(src[1].name)) != 0 || src[1].tdim != dst[1].tdim || src[1].coll_ids[0] != dst[1].coll_ids[0] || src[1].coll_ids[1] != dst[1].coll_ids[1] || src[1].coll_ids[2] != dst[1].coll_ids[2] || src[1].coll_ids[3] != dst[1].coll_ids[3]) { H5_FAILED(); @@ -1246,7 +1246,7 @@ test_compound_6(void) s_ptr->b = (int16_t)((i * 8 + 1) & 0x7fff); s_ptr->d = (int16_t)((i * 8 + 6) & 0x7fff); } - HDmemcpy(buf, orig, nelmts * sizeof(struct st)); + memcpy(buf, orig, nelmts * sizeof(struct st)); /* Build hdf5 datatypes */ if ((st = H5Tcreate(H5T_COMPOUND, sizeof(struct st))) < 0 || @@ -2268,7 +2268,7 @@ test_compound_11(void) } /* end for */ /* Make copy of buffer before conversion */ - HDmemcpy(buf_orig, buf, sizeof(big_t) * NTESTELEM); + memcpy(buf_orig, buf, sizeof(big_t) * NTESTELEM); dim[0] = NTESTELEM; if ((space_id = H5Screate_simple(1, dim, NULL)) < 0) { @@ -2335,7 +2335,7 @@ test_compound_11(void) TEST_ERROR; /* Recover the original buffer information */ - HDmemcpy(buf, buf_orig, sizeof(big_t) * NTESTELEM); + memcpy(buf, buf_orig, sizeof(big_t) * NTESTELEM); /* Convert buffer from 'big' to 'little' struct */ if (H5Tconvert(big_tid, little_tid, (size_t)NTESTELEM, buf, bkg, H5P_DEFAULT) < 0) @@ -2376,7 +2376,7 @@ test_compound_11(void) TEST_ERROR; /* Recover the original buffer information */ - HDmemcpy(buf, buf_orig, sizeof(big_t) * NTESTELEM); + memcpy(buf, buf_orig, sizeof(big_t) * NTESTELEM); /* Convert buffer from 'big' to 'little' struct */ if (H5Tconvert(big_tid, little_tid, (size_t)NTESTELEM, buf, bkg, H5P_DEFAULT) < 0) @@ -2568,7 +2568,7 @@ test_compound_13(void) TESTING("compound datatypes of boundary size with latest format"); /* Create some phony data. */ - HDmemset(&data_out, 0, sizeof(data_out)); + memset(&data_out, 0, sizeof(data_out)); for (u = 0; u < COMPOUND13_ARRAY_SIZE + 1; u++) data_out.x[u] = (unsigned char)u; data_out.y = 99.99F; @@ -4646,17 +4646,17 @@ test_conv_str_1(void) goto error; if (NULL == (buf = (char *)calloc((size_t)2, (size_t)10))) goto error; - HDmemcpy(buf, "abcdefghi\0abcdefghi\0", (size_t)20); + memcpy(buf, "abcdefghi\0abcdefghi\0", (size_t)20); if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcd\0abcd\0abcdefghi\0", (size_t)20) != 0) { + if (memcmp(buf, "abcd\0abcd\0abcdefghi\0", (size_t)20) != 0) { H5_FAILED(); HDputs(" Truncated C-string test failed"); goto error; } if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcd\0\0\0\0\0\0abcd\0\0\0\0\0\0", (size_t)20) != 0) { + if (memcmp(buf, "abcd\0\0\0\0\0\0abcd\0\0\0\0\0\0", (size_t)20) != 0) { H5_FAILED(); HDputs(" Extended C-string test failed"); goto error; @@ -4677,17 +4677,17 @@ test_conv_str_1(void) goto error; if (NULL == (buf = (char *)calloc((size_t)2, (size_t)10))) goto error; - HDmemcpy(buf, "abcdefghijabcdefghij", (size_t)20); + memcpy(buf, "abcdefghijabcdefghij", (size_t)20); if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcdeabcdeabcdefghij", (size_t)20) != 0) { + if (memcmp(buf, "abcdeabcdeabcdefghij", (size_t)20) != 0) { H5_FAILED(); HDputs(" Truncated C buffer test failed"); goto error; } if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcde\0\0\0\0\0abcde\0\0\0\0\0", (size_t)20) != 0) { + if (memcmp(buf, "abcde\0\0\0\0\0abcde\0\0\0\0\0", (size_t)20) != 0) { H5_FAILED(); HDputs(" Extended C buffer test failed"); goto error; @@ -4708,17 +4708,17 @@ test_conv_str_1(void) goto error; if (NULL == (buf = (char *)calloc((size_t)2, (size_t)10))) goto error; - HDmemcpy(buf, "abcdefghijabcdefghij", (size_t)20); + memcpy(buf, "abcdefghijabcdefghij", (size_t)20); if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcdeabcdeabcdefghij", (size_t)20) != 0) { + if (memcmp(buf, "abcdeabcdeabcdefghij", (size_t)20) != 0) { H5_FAILED(); HDputs(" Truncated Fortran-string test failed"); goto error; } if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcde abcde ", (size_t)20) != 0) { + if (memcmp(buf, "abcde abcde ", (size_t)20) != 0) { H5_FAILED(); HDputs(" Extended Fortran-string test failed"); goto error; @@ -4742,10 +4742,10 @@ test_conv_str_1(void) goto error; if (NULL == (buf = (char *)calloc((size_t)2, (size_t)10))) goto error; - HDmemcpy(buf, "abcdefghijabcdefghij", (size_t)20); + memcpy(buf, "abcdefghijabcdefghij", (size_t)20); if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcdefghijabcdefghij", (size_t)20) != 0) { + if (memcmp(buf, "abcdefghijabcdefghij", (size_t)20) != 0) { H5_FAILED(); HDputs(" Non-terminated string test 1"); goto error; @@ -4753,18 +4753,18 @@ test_conv_str_1(void) H5Tclose(dst_type); if ((dst_type = mkstr((size_t)5, H5T_STR_NULLTERM)) < 0) goto error; - HDmemcpy(buf, "abcdefghijabcdefghij", (size_t)20); + memcpy(buf, "abcdefghijabcdefghij", (size_t)20); if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcd\0abcd\0abcdefghij", (size_t)20) != 0) { + if (memcmp(buf, "abcd\0abcd\0abcdefghij", (size_t)20) != 0) { H5_FAILED(); HDputs(" Non-terminated string test 2"); goto error; } - HDmemcpy(buf, "abcdeabcdexxxxxxxxxx", (size_t)20); + memcpy(buf, "abcdeabcdexxxxxxxxxx", (size_t)20); if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcde\0\0\0\0\0abcde\0\0\0\0\0", (size_t)20) != 0) { + if (memcmp(buf, "abcde\0\0\0\0\0abcde\0\0\0\0\0", (size_t)20) != 0) { H5_FAILED(); HDputs(" Non-terminated string test 2"); goto error; @@ -4785,17 +4785,17 @@ test_conv_str_1(void) goto error; if (NULL == (buf = (char *)calloc((size_t)2, (size_t)10))) goto error; - HDmemcpy(buf, "abcdefghi\0abcdefghi\0", (size_t)20); + memcpy(buf, "abcdefghi\0abcdefghi\0", (size_t)20); if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcdefghi abcdefghi ", (size_t)20) != 0) { + if (memcmp(buf, "abcdefghi abcdefghi ", (size_t)20) != 0) { H5_FAILED(); HDputs(" C string to Fortran test 1"); goto error; } if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcdefghi\0abcdefghi\0", (size_t)20) != 0) { + if (memcmp(buf, "abcdefghi\0abcdefghi\0", (size_t)20) != 0) { H5_FAILED(); HDputs(" Fortran to C string test 1"); goto error; @@ -4804,17 +4804,17 @@ test_conv_str_1(void) goto error; if ((dst_type = mkstr((size_t)5, H5T_STR_SPACEPAD)) < 0) goto error; - HDmemcpy(buf, "abcdefgh\0\0abcdefgh\0\0", (size_t)20); + memcpy(buf, "abcdefgh\0\0abcdefgh\0\0", (size_t)20); if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcdeabcdeabcdefgh\0\0", (size_t)20) != 0) { + if (memcmp(buf, "abcdeabcdeabcdefgh\0\0", (size_t)20) != 0) { H5_FAILED(); HDputs(" C string to Fortran test 2"); goto error; } if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcde\0\0\0\0\0abcde\0\0\0\0\0", (size_t)20) != 0) { + if (memcmp(buf, "abcde\0\0\0\0\0abcde\0\0\0\0\0", (size_t)20) != 0) { H5_FAILED(); HDputs(" Fortran to C string test 2"); goto error; @@ -4827,17 +4827,17 @@ test_conv_str_1(void) goto error; if ((dst_type = mkstr((size_t)10, H5T_STR_SPACEPAD)) < 0) goto error; - HDmemcpy(buf, "abcd\0abcd\0xxxxxxxxxx", (size_t)20); + memcpy(buf, "abcd\0abcd\0xxxxxxxxxx", (size_t)20); if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcd abcd ", (size_t)20) != 0) { + if (memcmp(buf, "abcd abcd ", (size_t)20) != 0) { H5_FAILED(); HDputs(" C string to Fortran test 3"); goto error; } if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcd\0abcd\0abcd ", (size_t)20) != 0) { + if (memcmp(buf, "abcd\0abcd\0abcd ", (size_t)20) != 0) { H5_FAILED(); HDputs(" Fortran to C string test 3"); goto error; @@ -4858,17 +4858,17 @@ test_conv_str_1(void) goto error; if (NULL == (buf = (char *)calloc((size_t)2, (size_t)10))) goto error; - HDmemcpy(buf, "abcdefghijabcdefghij", (size_t)20); + memcpy(buf, "abcdefghijabcdefghij", (size_t)20); if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcdefghijabcdefghij", (size_t)20) != 0) { + if (memcmp(buf, "abcdefghijabcdefghij", (size_t)20) != 0) { H5_FAILED(); HDputs(" C buffer to Fortran test 1"); goto error; } if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcdefghijabcdefghij", (size_t)20) != 0) { + if (memcmp(buf, "abcdefghijabcdefghij", (size_t)20) != 0) { H5_FAILED(); HDputs(" Fortran to C buffer test 1"); goto error; @@ -4877,17 +4877,17 @@ test_conv_str_1(void) goto error; if ((dst_type = mkstr((size_t)5, H5T_STR_SPACEPAD)) < 0) goto error; - HDmemcpy(buf, "abcdefgh\0\0abcdefgh\0\0", (size_t)20); + memcpy(buf, "abcdefgh\0\0abcdefgh\0\0", (size_t)20); if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcdeabcdeabcdefgh\0\0", (size_t)20) != 0) { + if (memcmp(buf, "abcdeabcdeabcdefgh\0\0", (size_t)20) != 0) { H5_FAILED(); HDputs(" C buffer to Fortran test 2"); goto error; } if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcde\0\0\0\0\0abcde\0\0\0\0\0", (size_t)20) != 0) { + if (memcmp(buf, "abcde\0\0\0\0\0abcde\0\0\0\0\0", (size_t)20) != 0) { H5_FAILED(); HDputs(" Fortran to C buffer test 2"); goto error; @@ -4900,17 +4900,17 @@ test_conv_str_1(void) goto error; if ((dst_type = mkstr((size_t)10, H5T_STR_SPACEPAD)) < 0) goto error; - HDmemcpy(buf, "abcd\0abcd\0xxxxxxxxxx", (size_t)20); + memcpy(buf, "abcd\0abcd\0xxxxxxxxxx", (size_t)20); if (H5Tconvert(src_type, dst_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcd abcd ", (size_t)20) != 0) { + if (memcmp(buf, "abcd abcd ", (size_t)20) != 0) { H5_FAILED(); HDputs(" C buffer to Fortran test 3"); goto error; } if (H5Tconvert(dst_type, src_type, (size_t)2, buf, NULL, H5P_DEFAULT) < 0) goto error; - if (HDmemcmp(buf, "abcd\0abcd\0abcd ", (size_t)20) != 0) { + if (memcmp(buf, "abcd\0abcd\0abcd ", (size_t)20) != 0) { H5_FAILED(); HDputs(" Fortran to C buffer test 3"); goto error; @@ -5699,7 +5699,7 @@ opaque_long(void) /* Create long tag */ if (NULL == (long_tag = (char *)malloc((size_t)(16384 + 1)))) TEST_ERROR; - HDmemset(long_tag, 'a', (size_t)16384); + memset(long_tag, 'a', (size_t)16384); long_tag[16384] = '\0'; /* Set opaque type's tag */ @@ -6696,7 +6696,7 @@ test_int_float_except(void) TEST_ERROR; /* Convert buffer */ - HDmemset(&e, 0, sizeof(except_info_t)); + memset(&e, 0, sizeof(except_info_t)); if (H5Tconvert(H5T_NATIVE_FLOAT, H5T_NATIVE_INT, (size_t)CONVERT_SIZE, buf, NULL, dxpl) < 0) TEST_ERROR; @@ -6720,7 +6720,7 @@ test_int_float_except(void) TEST_ERROR; /* Convert buffer */ - HDmemset(&e, 0, sizeof(except_info_t)); + memset(&e, 0, sizeof(except_info_t)); if (H5Tconvert(H5T_NATIVE_INT, H5T_NATIVE_FLOAT, (size_t)CONVERT_SIZE, buf, NULL, dxpl) < 0) TEST_ERROR; @@ -6746,7 +6746,7 @@ test_int_float_except(void) /* Work on second buffer */ /* Convert second buffer */ - HDmemset(&e, 0, sizeof(except_info_t)); + memset(&e, 0, sizeof(except_info_t)); if (H5Tconvert(H5T_NATIVE_INT, H5T_NATIVE_FLOAT, (size_t)CONVERT_SIZE, buf2, NULL, dxpl) < 0) TEST_ERROR; @@ -6770,7 +6770,7 @@ test_int_float_except(void) TEST_ERROR; /* Convert buffer */ - HDmemset(&e, 0, sizeof(except_info_t)); + memset(&e, 0, sizeof(except_info_t)); if (H5Tconvert(H5T_NATIVE_FLOAT, H5T_NATIVE_INT, (size_t)CONVERT_SIZE, buf2, NULL, dxpl) < 0) TEST_ERROR; diff --git a/test/earray.c b/test/earray.c index 9fca6cd..8f5b2be 100644 --- a/test/earray.c +++ b/test/earray.c @@ -180,7 +180,7 @@ static int init_cparam(H5EA_create_t *cparam) { /* Wipe out background */ - HDmemset(cparam, 0, sizeof(*cparam)); + memset(cparam, 0, sizeof(*cparam)); /* General parameters */ cparam->cls = H5EA_CLS_TEST; @@ -214,7 +214,7 @@ init_tparam(earray_test_param_t *tparam, const H5EA_create_t *cparam) size_t u; /* Local index variable */ /* Wipe out background */ - HDmemset(tparam, 0, sizeof(*tparam)); + memset(tparam, 0, sizeof(*tparam)); /* Compute general information */ tparam->nsblks = 1 + (cparam->max_nelmts_bits - H5VM_log2_of2(cparam->data_blk_min_elmts)); @@ -467,7 +467,7 @@ create_array(H5F_t *f, const H5EA_create_t *cparam, H5EA_t **ea, haddr_t *ea_add FAIL_STACK_ERROR; if (!H5_addr_defined(*ea_addr)) TEST_ERROR; - HDmemset(&state, 0, sizeof(state)); + memset(&state, 0, sizeof(state)); state.hdr_size = EA_HDR_SIZE; if (check_stats(*ea, &state)) TEST_ERROR; @@ -495,7 +495,7 @@ verify_cparam(const H5EA_t *ea, const H5EA_create_t *cparam) H5EA_create_t test_cparam; /* Creation parameters for array */ /* Retrieve creation parameters */ - HDmemset(&test_cparam, 0, sizeof(H5EA_create_t)); + memset(&test_cparam, 0, sizeof(H5EA_create_t)); if (H5EA__get_cparam_test(ea, &test_cparam) < 0) FAIL_STACK_ERROR; @@ -585,7 +585,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE H5EA_create_t test_cparam; /* Creation parameters for array */ /* Set invalid element size */ - HDmemcpy(&test_cparam, cparam, sizeof(test_cparam)); + memcpy(&test_cparam, cparam, sizeof(test_cparam)); test_cparam.raw_elmt_size = 0; H5E_BEGIN_TRY { @@ -602,7 +602,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE } /* end if */ /* Set invalid max. # of elements bits */ - HDmemcpy(&test_cparam, cparam, sizeof(test_cparam)); + memcpy(&test_cparam, cparam, sizeof(test_cparam)); test_cparam.max_nelmts_bits = 0; H5E_BEGIN_TRY { @@ -618,7 +618,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE TEST_ERROR; } /* end if */ - HDmemcpy(&test_cparam, cparam, sizeof(test_cparam)); + memcpy(&test_cparam, cparam, sizeof(test_cparam)); test_cparam.max_nelmts_bits = 65; H5E_BEGIN_TRY { @@ -635,7 +635,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE } /* end if */ /* Set invalid min. # of data block pointers in super blocks */ - HDmemcpy(&test_cparam, cparam, sizeof(test_cparam)); + memcpy(&test_cparam, cparam, sizeof(test_cparam)); test_cparam.sup_blk_min_data_ptrs = 0; H5E_BEGIN_TRY { @@ -650,7 +650,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE /* Indicate error */ TEST_ERROR; } /* end if */ - HDmemcpy(&test_cparam, cparam, sizeof(test_cparam)); + memcpy(&test_cparam, cparam, sizeof(test_cparam)); test_cparam.sup_blk_min_data_ptrs = 1; H5E_BEGIN_TRY { @@ -665,7 +665,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE /* Indicate error */ TEST_ERROR; } /* end if */ - HDmemcpy(&test_cparam, cparam, sizeof(test_cparam)); + memcpy(&test_cparam, cparam, sizeof(test_cparam)); test_cparam.sup_blk_min_data_ptrs = 6; H5E_BEGIN_TRY { @@ -682,7 +682,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE } /* end if */ /* Set invalid min. # of elements per data block */ - HDmemcpy(&test_cparam, cparam, sizeof(test_cparam)); + memcpy(&test_cparam, cparam, sizeof(test_cparam)); test_cparam.data_blk_min_elmts = 0; H5E_BEGIN_TRY { @@ -700,7 +700,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE /* Set invalid max. # of elements per data block page bits */ if (test_cparam.idx_blk_elmts > 0) { - HDmemcpy(&test_cparam, cparam, sizeof(test_cparam)); + memcpy(&test_cparam, cparam, sizeof(test_cparam)); test_cparam.max_dblk_page_nelmts_bits = (uint8_t)(H5VM_log2_gen((uint64_t)test_cparam.idx_blk_elmts) - 1); H5E_BEGIN_TRY @@ -717,7 +717,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE TEST_ERROR; } /* end if */ } /* end if */ - HDmemcpy(&test_cparam, cparam, sizeof(test_cparam)); + memcpy(&test_cparam, cparam, sizeof(test_cparam)); test_cparam.max_dblk_page_nelmts_bits = 4; /* corresponds to 16 elements in data block page, which is less than the 64 elements for the default settings */ H5E_BEGIN_TRY @@ -733,7 +733,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t H5_ATTR_UNUSE /* Indicate error */ TEST_ERROR; } /* end if */ - HDmemcpy(&test_cparam, cparam, sizeof(test_cparam)); + memcpy(&test_cparam, cparam, sizeof(test_cparam)); test_cparam.max_dblk_page_nelmts_bits = (uint8_t)(test_cparam.max_nelmts_bits + 1); H5E_BEGIN_TRY { @@ -2005,7 +2005,7 @@ test_set_elmts(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam, h TEST_ERROR; /* Verify array state */ - HDmemset(&state, 0, sizeof(state)); + memset(&state, 0, sizeof(state)); state.hdr_size = EA_HDR_SIZE; if (check_stats(ea, &state)) TEST_ERROR; @@ -2176,7 +2176,7 @@ test_skip_elmts(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam, TEST_ERROR; /* Verify array state */ - HDmemset(&state, 0, sizeof(state)); + memset(&state, 0, sizeof(state)); state.hdr_size = EA_HDR_SIZE; if (check_stats(ea, &state)) TEST_ERROR; @@ -2206,7 +2206,7 @@ test_skip_elmts(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam, TEST_ERROR; /* Set array state */ - HDmemset(&state, 0, sizeof(state)); + memset(&state, 0, sizeof(state)); state.hdr_size = EA_HDR_SIZE; state.nindex_blks = 1; state.index_blk_size = EA_IBLOCK_SIZE; diff --git a/test/evict_on_close.c b/test/evict_on_close.c index 20ce3d1..feebb08 100644 --- a/test/evict_on_close.c +++ b/test/evict_on_close.c @@ -183,7 +183,7 @@ generate_eoc_test_file(hid_t fapl_id) char subgroup_name[SUBGROUP_NAME_SIZE]; /* Create the group name */ - HDmemset(subgroup_name, '\0', SUBGROUP_NAME_SIZE); + memset(subgroup_name, '\0', SUBGROUP_NAME_SIZE); if (HDsnprintf(subgroup_name, (size_t)(SUBGROUP_NAME_SIZE - 1), "%d", i) < 0) TEST_ERROR; @@ -278,7 +278,7 @@ generate_eoc_test_file(hid_t fapl_id) char subgroup_name[SUBGROUP_NAME_SIZE]; /* Create the group name */ - HDmemset(subgroup_name, '\0', SUBGROUP_NAME_SIZE); + memset(subgroup_name, '\0', SUBGROUP_NAME_SIZE); if (HDsnprintf(subgroup_name, (size_t)(SUBGROUP_NAME_SIZE - 1), "%d", i) < 0) TEST_ERROR; @@ -619,7 +619,7 @@ check_group_layout(hid_t fid, const char *group_name) char subgroup_name[SUBGROUP_NAME_SIZE]; /* Create the group name */ - HDmemset(subgroup_name, '\0', SUBGROUP_NAME_SIZE); + memset(subgroup_name, '\0', SUBGROUP_NAME_SIZE); if (HDsnprintf(subgroup_name, (size_t)(SUBGROUP_NAME_SIZE - 1), "%d", i) < 0) TEST_ERROR; diff --git a/test/external.c b/test/external.c index 9bb2da3..cc0d262 100644 --- a/test/external.c +++ b/test/external.c @@ -47,8 +47,8 @@ files_have_same_contents(const char *name1, const char *name2) /* Loop until files are empty or we encounter a problem */ while (1) { - HDmemset(buf1, 0, sizeof(buf1)); - HDmemset(buf2, 0, sizeof(buf2)); + memset(buf1, 0, sizeof(buf1)); + memset(buf2, 0, sizeof(buf2)); n1 = HDread(fd1, buf1, sizeof(buf1)); if (n1 < 0 || (size_t)n1 > sizeof(buf1)) @@ -65,7 +65,7 @@ files_have_same_contents(const char *name1, const char *name2) break; } - if (HDmemcmp(buf1, buf2, (size_t)n1) != 0) + if (memcmp(buf1, buf2, (size_t)n1) != 0) break; } /* end while */ @@ -720,7 +720,7 @@ test_read_file_set(hid_t fapl) FAIL_STACK_ERROR; /* Read the entire dataset */ - HDmemset(whole, 0, sizeof(whole)); + memset(whole, 0, sizeof(whole)); if (H5Dread(dset, H5T_NATIVE_INT, space, space, H5P_DEFAULT, whole) < 0) FAIL_STACK_ERROR; @@ -738,7 +738,7 @@ test_read_file_set(hid_t fapl) FAIL_STACK_ERROR; /* Read */ - HDmemset(whole, 0, sizeof(whole)); + memset(whole, 0, sizeof(whole)); if (H5Dread(dset, H5T_NATIVE_INT, hs_space, hs_space, H5P_DEFAULT, whole) < 0) FAIL_STACK_ERROR; @@ -962,7 +962,7 @@ test_path_absolute(hid_t fapl) FAIL_STACK_ERROR; /* Read the entire dataset and compare with the original */ - HDmemset(whole, 0, sizeof(whole)); + memset(whole, 0, sizeof(whole)); if (H5Dread(dset, H5T_NATIVE_INT, space, space, H5P_DEFAULT, whole) < 0) FAIL_STACK_ERROR; for (i = 0; i < TOTAL_SIZE; i++) @@ -1049,7 +1049,7 @@ test_path_relative(hid_t fapl) FAIL_STACK_ERROR; /* Read the entire dataset and compare with the original */ - HDmemset(whole, 0, sizeof(whole)); + memset(whole, 0, sizeof(whole)); if (H5Dread(dset, H5T_NATIVE_INT, space, space, H5P_DEFAULT, whole) < 0) FAIL_STACK_ERROR; for (i = 0; i < TOTAL_SIZE; i++) @@ -1170,7 +1170,7 @@ test_path_relative_cwd(hid_t fapl) FAIL_PUTS_ERROR("reopening the dataset with a different efile_prefix succeeded"); /* Read the entire dataset and compare with the original */ - HDmemset(whole, 0, sizeof(whole)); + memset(whole, 0, sizeof(whole)); if (H5Dread(dset, H5T_NATIVE_INT, space, space, H5P_DEFAULT, whole) < 0) FAIL_STACK_ERROR; for (i = 0; i < TOTAL_SIZE; i++) @@ -1207,7 +1207,7 @@ test_path_relative_cwd(hid_t fapl) FAIL_PUTS_ERROR("reopening the dataset with a different efile_prefix succeeded"); /* Read the entire dataset and compare with the original */ - HDmemset(whole, 0, sizeof(whole)); + memset(whole, 0, sizeof(whole)); if (H5Dread(dset, H5T_NATIVE_INT, space, space, H5P_DEFAULT, whole) < 0) FAIL_STACK_ERROR; for (i = 0; i < TOTAL_SIZE; i++) diff --git a/test/external_env.c b/test/external_env.c index 07322a1..1a91c2a 100644 --- a/test/external_env.c +++ b/test/external_env.c @@ -91,7 +91,7 @@ test_path_env(hid_t fapl) FAIL_STACK_ERROR; /* Read the entire dataset and compare with the original */ - HDmemset(whole, 0, sizeof(whole)); + memset(whole, 0, sizeof(whole)); if (H5Dread(dset, H5T_NATIVE_INT, space, space, H5P_DEFAULT, whole) < 0) FAIL_STACK_ERROR; for (i = 0; i < TOTAL_SIZE; i++) diff --git a/test/farray.c b/test/farray.c index 60571cd..a7a4125 100644 --- a/test/farray.c +++ b/test/farray.c @@ -116,7 +116,7 @@ static herr_t init_cparam(H5FA_create_t *cparam, farray_test_param_t *tparam) { /* Wipe out background */ - HDmemset(cparam, 0, sizeof(*cparam)); + memset(cparam, 0, sizeof(*cparam)); cparam->cls = H5FA_CLS_TEST; cparam->raw_elmt_size = ELMT_SIZE; @@ -320,7 +320,7 @@ create_array(H5F_t *f, const H5FA_create_t *cparam, H5FA_t **fa, haddr_t *fa_add TEST_ERROR; /* Check array stats */ - HDmemset(&state, 0, sizeof(state)); + memset(&state, 0, sizeof(state)); state.hdr_size = FA_HDR_SIZE; state.nelmts = cparam->nelmts; if (check_stats(*fa, &state)) @@ -348,7 +348,7 @@ verify_cparam(const H5FA_t *fa, const H5FA_create_t *cparam) H5FA_create_t test_cparam; /* Creation parameters for array */ /* Retrieve creation parameters */ - HDmemset(&test_cparam, 0, sizeof(H5FA_create_t)); + memset(&test_cparam, 0, sizeof(H5FA_create_t)); if (H5FA__get_cparam_test(fa, &test_cparam) < 0) FAIL_STACK_ERROR; @@ -437,7 +437,7 @@ test_create(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t H5_ATTR_UNUSE H5FA_create_t test_cparam; /* Creation parameters for array */ /* Set invalid element size */ - HDmemcpy(&test_cparam, cparam, sizeof(test_cparam)); + memcpy(&test_cparam, cparam, sizeof(test_cparam)); test_cparam.raw_elmt_size = 0; H5E_BEGIN_TRY { @@ -454,7 +454,7 @@ test_create(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t H5_ATTR_UNUSE } /* end if */ /* Set invalid max. # of elements bits */ - HDmemcpy(&test_cparam, cparam, sizeof(test_cparam)); + memcpy(&test_cparam, cparam, sizeof(test_cparam)); test_cparam.max_dblk_page_nelmts_bits = 0; H5E_BEGIN_TRY { @@ -471,7 +471,7 @@ test_create(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t H5_ATTR_UNUSE } /* end if */ /* Set invalid max. # of elements */ - HDmemcpy(&test_cparam, cparam, sizeof(test_cparam)); + memcpy(&test_cparam, cparam, sizeof(test_cparam)); test_cparam.nelmts = 0; H5E_BEGIN_TRY { @@ -1380,7 +1380,7 @@ test_set_elmts(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam, h TEST_ERROR; /* Verify array state */ - HDmemset(&state, 0, sizeof(state)); + memset(&state, 0, sizeof(state)); state.hdr_size = FA_HDR_SIZE; state.nelmts = cparam->nelmts; state.dblk_size = 0; @@ -1451,7 +1451,7 @@ test_set_elmts(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam, h } /* end for */ /* Verify array state */ - HDmemset(&state, 0, sizeof(state)); + memset(&state, 0, sizeof(state)); set_fa_state(cparam, &state); if (check_stats(fa, &state)) TEST_ERROR; @@ -1535,7 +1535,7 @@ test_skip_elmts(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam, TEST_ERROR; /* Verify array state */ - HDmemset(&state, 0, sizeof(state)); + memset(&state, 0, sizeof(state)); state.hdr_size = FA_HDR_SIZE; state.nelmts = cparam->nelmts; state.dblk_size = 0; @@ -1560,7 +1560,7 @@ test_skip_elmts(hid_t fapl, H5FA_create_t *cparam, farray_test_param_t *tparam, FAIL_STACK_ERROR; /* Verify array state */ - HDmemset(&state, 0, sizeof(state)); + memset(&state, 0, sizeof(state)); set_fa_state(cparam, &state); if (check_stats(fa, &state)) TEST_ERROR; @@ -1671,7 +1671,7 @@ main(void) for (curr_test = FARRAY_TEST_NORMAL; curr_test < FARRAY_TEST_NTESTS; curr_test++) { /* Initialize the testing parameters */ - HDmemset(&tparam, 0, sizeof(tparam)); + memset(&tparam, 0, sizeof(tparam)); tparam.nelmts = TEST_NELMTS; /* Set appropriate testing parameters for each test */ diff --git a/test/fheap.c b/test/fheap.c index ac99c77..b8c78da 100644 --- a/test/fheap.c +++ b/test/fheap.c @@ -189,7 +189,7 @@ static int init_small_cparam(H5HF_create_t *cparam) { /* Wipe out background */ - HDmemset(cparam, 0, sizeof(H5HF_create_t)); + memset(cparam, 0, sizeof(H5HF_create_t)); /* General parameters */ cparam->id_len = SMALL_ID_LEN; @@ -222,7 +222,7 @@ static int init_large_cparam(H5HF_create_t *cparam) { /* Wipe out background */ - HDmemset(cparam, 0, sizeof(H5HF_create_t)); + memset(cparam, 0, sizeof(H5HF_create_t)); /* General parameters */ cparam->id_len = LARGE_ID_LEN; @@ -323,7 +323,7 @@ static herr_t op_memcpy(const void *obj, size_t obj_len, void *op_data) { /* Make copy of the object */ - HDmemcpy(op_data, obj, obj_len); + memcpy(op_data, obj, obj_len); return (SUCCEED); } /* op_memcpy() */ @@ -370,7 +370,7 @@ add_obj(H5HF_t *fh, size_t obj_off, size_t obj_size, fheap_heap_state_t *state, TEST_ERROR; /* Insert object */ - HDmemset(heap_id, 0, id_len); + memset(heap_id, 0, id_len); if (H5HF_insert(fh, obj_size, obj, heap_id) < 0) FAIL_STACK_ERROR; @@ -405,7 +405,7 @@ add_obj(H5HF_t *fh, size_t obj_off, size_t obj_size, fheap_heap_state_t *state, TEST_ERROR; if (H5HF_read(fh, heap_id, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(obj, shared_robj_g, obj_size) != 0) + if (memcmp(obj, shared_robj_g, obj_size) != 0) TEST_ERROR; /* If the heap IDs are to be retained, append them to the list */ @@ -432,7 +432,7 @@ add_obj(H5HF_t *fh, size_t obj_off, size_t obj_size, fheap_heap_state_t *state, } /* end if */ /* Append the object info onto the array */ - HDmemcpy(&keep_ids->ids[keep_ids->num_ids * id_len], heap_id, id_len); + memcpy(&keep_ids->ids[keep_ids->num_ids * id_len], heap_id, id_len); keep_ids->lens[keep_ids->num_ids] = obj_size; keep_ids->offs[keep_ids->num_ids] = obj_off; @@ -523,7 +523,7 @@ begin_test(fheap_test_param_t *tparam, const char *base_desc, fheap_heap_ids_t * H5MM_xfree(test_desc); /* Initialize the heap ID structure */ - HDmemset(keep_ids, 0, sizeof(fheap_heap_ids_t)); + memset(keep_ids, 0, sizeof(fheap_heap_ids_t)); /* Retrieve "bulk" filling object size */ if (fill_size) @@ -631,7 +631,7 @@ open_heap(char *filename, hid_t fapl, const H5HF_create_t *cparam, const fheap_t FAIL_STACK_ERROR; if (!H5_addr_defined(*fh_addr)) TEST_ERROR; - HDmemset(state, 0, sizeof(fheap_heap_state_t)); + memset(state, 0, sizeof(fheap_heap_state_t)); if (check_stats(*fh, state)) TEST_ERROR; @@ -676,7 +676,7 @@ open_heap(char *filename, hid_t fapl, const H5HF_create_t *cparam, const fheap_t FAIL_STACK_ERROR; if (!H5_addr_defined(*fh_addr)) TEST_ERROR; - HDmemset(state, 0, sizeof(fheap_heap_state_t)); + memset(state, 0, sizeof(fheap_heap_state_t)); if (check_stats(*fh, state)) TEST_ERROR; } /* end if */ @@ -942,7 +942,7 @@ del_objs(H5F_t *f, H5HF_t **fh, fheap_test_param_t *tparam, fheap_heap_state_t * } /* end for */ /* Heap should be completely empty now, reset our state */ - HDmemset(state, 0, sizeof(fheap_heap_state_t)); + memset(state, 0, sizeof(fheap_heap_state_t)); /* Check up on heap... */ if (check_stats(*fh, state)) @@ -1121,7 +1121,7 @@ fill_heap(H5HF_t *fh, unsigned block_row, size_t obj_size, fheap_heap_state_t *s /* Check that object is correct */ wobj = &shared_wobj_g[*curr_off_ptr]; - if (HDmemcmp(wobj, shared_robj_g, *curr_len_ptr) != 0) + if (memcmp(wobj, shared_robj_g, *curr_len_ptr) != 0) TEST_ERROR; /* Adjust object & ID pointers */ @@ -1147,9 +1147,9 @@ fill_heap(H5HF_t *fh, unsigned block_row, size_t obj_size, fheap_heap_state_t *s } /* end if */ /* Append the IDs onto the array */ - HDmemcpy(&keep_ids->ids[keep_ids->num_ids * id_len], shared_ids_g, (num_ids * id_len)); - HDmemcpy(&keep_ids->lens[keep_ids->num_ids], shared_lens_g, (num_ids * sizeof(size_t))); - HDmemcpy(&keep_ids->offs[keep_ids->num_ids], shared_offs_g, (num_ids * sizeof(size_t))); + memcpy(&keep_ids->ids[keep_ids->num_ids * id_len], shared_ids_g, (num_ids * id_len)); + memcpy(&keep_ids->lens[keep_ids->num_ids], shared_lens_g, (num_ids * sizeof(size_t))); + memcpy(&keep_ids->offs[keep_ids->num_ids], shared_offs_g, (num_ids * sizeof(size_t))); /* Increment the number of IDs kept */ keep_ids->num_ids += num_ids; @@ -1772,14 +1772,14 @@ test_create(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) TEST_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) TEST_ERROR; PASSED(); /* Query the type of address mapping */ TESTING("query heap creation parameters"); - HDmemset(&test_cparam, 0, sizeof(H5HF_create_t)); + memset(&test_cparam, 0, sizeof(H5HF_create_t)); if (H5HF_get_cparam_test(fh, &test_cparam) < 0) FAIL_STACK_ERROR; if (H5HF_cmp_cparam_test(cparam, &test_cparam)) @@ -1894,7 +1894,7 @@ test_reopen(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) TEST_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) TEST_ERROR; @@ -1928,7 +1928,7 @@ test_reopen(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) FAIL_STACK_ERROR; /* Query the creation parameters */ - HDmemset(&test_cparam, 0, sizeof(H5HF_create_t)); + memset(&test_cparam, 0, sizeof(H5HF_create_t)); if (H5HF_get_cparam_test(fh, &test_cparam) < 0) FAIL_STACK_ERROR; if (H5HF_cmp_cparam_test(cparam, &test_cparam)) @@ -2046,7 +2046,7 @@ test_open_twice(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) TEST_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) TEST_ERROR; @@ -2055,7 +2055,7 @@ test_open_twice(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) FAIL_STACK_ERROR; /* Verify the creation parameters */ - HDmemset(&test_cparam, 0, sizeof(H5HF_create_t)); + memset(&test_cparam, 0, sizeof(H5HF_create_t)); if (H5HF_get_cparam_test(fh2, &test_cparam) < 0) FAIL_STACK_ERROR; if (H5HF_cmp_cparam_test(cparam, &test_cparam)) @@ -2087,7 +2087,7 @@ test_open_twice(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) FAIL_STACK_ERROR; /* Verify the creation parameters */ - HDmemset(&test_cparam, 0, sizeof(H5HF_create_t)); + memset(&test_cparam, 0, sizeof(H5HF_create_t)); if (H5HF_get_cparam_test(fh2, &test_cparam) < 0) FAIL_STACK_ERROR; if (H5HF_cmp_cparam_test(cparam, &test_cparam)) @@ -2213,7 +2213,7 @@ test_delete_open(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) TEST_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) TEST_ERROR; @@ -2226,7 +2226,7 @@ test_delete_open(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) FAIL_STACK_ERROR; /* Verify the creation parameters */ - HDmemset(&test_cparam, 0, sizeof(H5HF_create_t)); + memset(&test_cparam, 0, sizeof(H5HF_create_t)); if (H5HF_get_cparam_test(fh2, &test_cparam) < 0) FAIL_STACK_ERROR; if (H5HF_cmp_cparam_test(cparam, &test_cparam)) @@ -2365,7 +2365,7 @@ test_id_limits(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl) TESTING("limits of heap ID lengths"); /* Copy heap creation properties */ - HDmemcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); + memcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); /* Set the 'default' heap ID length */ tmp_cparam.id_len = 0; @@ -2698,7 +2698,7 @@ test_filtered_create(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl) TESTING("creating heaps with I/O filters"); /* Copy heap creation properties */ - HDmemcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); + memcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); /* Set an I/O filter for heap data */ deflate_level = 6; @@ -2741,7 +2741,7 @@ test_filtered_create(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl) FAIL_STACK_ERROR; /* Query the heap creation parameters */ - HDmemset(&test_cparam, 0, sizeof(H5HF_create_t)); + memset(&test_cparam, 0, sizeof(H5HF_create_t)); if (H5HF_get_cparam_test(fh, &test_cparam) < 0) FAIL_STACK_ERROR; if (H5HF_cmp_cparam_test(&tmp_cparam, &test_cparam)) @@ -3093,7 +3093,7 @@ test_man_insert_weird(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpa FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) TEST_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) TEST_ERROR; @@ -3203,7 +3203,7 @@ test_man_insert_first(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpa FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) TEST_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) TEST_ERROR; @@ -3301,7 +3301,7 @@ test_man_insert_second(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tp FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting first (small) object into absolute heap @@ -3395,7 +3395,7 @@ test_man_insert_root_mult(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) object into absolute heap @@ -3491,7 +3491,7 @@ test_man_insert_force_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_par FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test forcing creation of indirect root block & second direct block @@ -3594,7 +3594,7 @@ test_man_insert_fill_second(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_ FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill second direct block @@ -3698,7 +3698,7 @@ test_man_insert_third_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to create third direct block @@ -3806,7 +3806,7 @@ test_man_fill_first_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *t FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill first row in root indirect block @@ -3899,7 +3899,7 @@ test_man_start_second_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to start second row in root indirect block @@ -3999,7 +3999,7 @@ test_man_fill_second_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t * FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to start second row in root indirect block @@ -4097,7 +4097,7 @@ test_man_start_third_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t * FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to start third row in root indirect block @@ -4205,7 +4205,7 @@ test_man_fill_fourth_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t * FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill four rows in root indirect block @@ -4299,7 +4299,7 @@ test_man_fill_all_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_para FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct rows in root indirect block @@ -4392,7 +4392,7 @@ test_man_first_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_ FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to force creation of first recursive indirect block @@ -4491,7 +4491,7 @@ test_man_second_direct_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fhe FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to force creation of second direct @@ -4598,7 +4598,7 @@ test_man_fill_first_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_ FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct @@ -4698,7 +4698,7 @@ test_man_second_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct @@ -4806,7 +4806,7 @@ test_man_fill_second_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct @@ -4907,7 +4907,7 @@ test_man_fill_recursive_indirect_row(hid_t fapl, H5HF_create_t *cparam, fheap_te FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct @@ -5006,7 +5006,7 @@ test_man_start_2nd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct @@ -5112,7 +5112,7 @@ test_man_recursive_indirect_two_deep(hid_t fapl, H5HF_create_t *cparam, fheap_te FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct @@ -5212,7 +5212,7 @@ test_man_start_3rd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct @@ -5319,7 +5319,7 @@ test_man_fill_first_3rd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fh FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct @@ -5427,7 +5427,7 @@ test_man_fill_3rd_recursive_indirect_row(hid_t fapl, H5HF_create_t *cparam, fhea FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct @@ -5532,7 +5532,7 @@ test_man_fill_all_3rd_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fhea FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct @@ -5638,7 +5638,7 @@ test_man_start_4th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct @@ -5750,7 +5750,7 @@ test_man_fill_first_4th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fh FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct @@ -5868,7 +5868,7 @@ test_man_fill_4th_recursive_indirect_row(hid_t fapl, H5HF_create_t *cparam, fhea FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct @@ -5977,7 +5977,7 @@ test_man_fill_all_4th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fhea FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct @@ -6088,7 +6088,7 @@ test_man_start_5th_recursive_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_t FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); /* * Test inserting mult. (small) objects to fill all direct @@ -6217,7 +6217,7 @@ test_man_remove_bogus(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpa FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) FAIL_STACK_ERROR; @@ -6373,7 +6373,7 @@ test_man_remove_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpara FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) FAIL_STACK_ERROR; @@ -6535,7 +6535,7 @@ test_man_remove_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpara FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) FAIL_STACK_ERROR; @@ -6726,7 +6726,7 @@ test_man_remove_one_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) FAIL_STACK_ERROR; @@ -6893,7 +6893,7 @@ test_man_remove_two_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) FAIL_STACK_ERROR; @@ -7131,7 +7131,7 @@ test_man_remove_three_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) FAIL_STACK_ERROR; @@ -7433,7 +7433,7 @@ test_man_incr_insert_remove(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_ FAIL_STACK_ERROR; if (!H5_addr_defined(fh_addr)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) FAIL_STACK_ERROR; @@ -7442,8 +7442,8 @@ test_man_incr_insert_remove(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_ */ TESTING("incremental object insertion and removal"); - HDmemset(&obj1, 0, sizeof(obj1)); - HDmemset(&obj2, 0, sizeof(obj2)); + memset(&obj1, 0, sizeof(obj1)); + memset(&obj2, 0, sizeof(obj2)); for (i = 0; i < 100; i++) { for (j = 0; j < i; j++) { if (H5HF_remove(fh, heap_id[j]) < 0) @@ -7459,7 +7459,7 @@ test_man_incr_insert_remove(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_ TEST_ERROR; /* Insert object */ - HDmemset(heap_id[i], 0, id_len); + memset(heap_id[i], 0, id_len); HDsnprintf(obj1.b, sizeof(obj1.b), "%s%2d", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", i); if (H5HF_insert(fh, (sizeof(obj1)), &obj1, heap_id[i]) < 0) FAIL_STACK_ERROR; @@ -12359,10 +12359,10 @@ test_huge_insert_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Delete individual objects, if we won't be deleting the entire heap later */ @@ -12509,10 +12509,10 @@ test_huge_insert_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Insert second object too large for managed heap blocks */ @@ -12539,10 +12539,10 @@ test_huge_insert_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id2, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Delete individual objects, if we won't be deleting the entire heap later */ @@ -12739,10 +12739,10 @@ test_huge_insert_three(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tp FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Insert second object too large for managed heap blocks */ @@ -12769,10 +12769,10 @@ test_huge_insert_three(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tp FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id2, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Insert third object too large for managed heap blocks */ @@ -12799,10 +12799,10 @@ test_huge_insert_three(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tp FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id3, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Delete individual objects, if we won't be deleting the entire heap later */ @@ -13047,10 +13047,10 @@ test_huge_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Insert second object too large for managed heap blocks */ @@ -13077,10 +13077,10 @@ test_huge_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id2, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Insert third object too large for managed heap blocks */ @@ -13107,10 +13107,10 @@ test_huge_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id3, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Insert fourth object small enough to fit into 'normal' heap blocks */ @@ -13144,10 +13144,10 @@ test_huge_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id4, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Insert fifth object small enough to fit into 'normal' heap blocks */ @@ -13182,10 +13182,10 @@ test_huge_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id5, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Delete individual objects, if we won't be deleting the entire heap later */ @@ -13320,7 +13320,7 @@ test_huge_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar } /* end else */ /* Check up on heap... */ - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) TEST_ERROR; } /* end if */ @@ -13419,7 +13419,7 @@ test_filtered_huge(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam const char *base_desc = "insert 'huge' object into heap with I/O filters, then remove"; /* Copy heap creation properties */ - HDmemcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); + memcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); /* Set an I/O filter for heap data */ deflate_level = 6; @@ -13517,10 +13517,10 @@ test_filtered_huge(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Delete individual objects, if we won't be deleting the entire heap later */ @@ -13665,10 +13665,10 @@ test_tiny_insert_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Delete individual objects, if we won't be deleting the entire heap later */ @@ -13815,10 +13815,10 @@ test_tiny_insert_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Insert second object small enough to encode in heap ID */ @@ -13845,10 +13845,10 @@ test_tiny_insert_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id2, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Delete individual objects, if we won't be deleting the entire heap later */ @@ -14058,17 +14058,17 @@ test_tiny_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Check 'op' functionality on first huge object */ - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_op(fh, heap_id, op_memcpy, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Insert second object too large for managed heap blocks */ @@ -14095,17 +14095,17 @@ test_tiny_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id2, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Check 'op' functionality on second huge object */ - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_op(fh, heap_id2, op_memcpy, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Insert third object too large for managed heap blocks */ @@ -14132,17 +14132,17 @@ test_tiny_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id3, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Check 'op' functionality on third huge object */ - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_op(fh, heap_id3, op_memcpy, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Insert fourth object small enough to fit into 'normal' heap blocks */ @@ -14176,17 +14176,17 @@ test_tiny_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id4, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Check 'op' functionality on fourth ('normal') object */ - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_op(fh, heap_id4, op_memcpy, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Insert fifth object small enough to fit into 'normal' heap blocks */ @@ -14221,17 +14221,17 @@ test_tiny_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id5, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Check 'op' functionality on fifth ('normal') object */ - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_op(fh, heap_id5, op_memcpy, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Insert sixth object small enough to encode in heap ID */ @@ -14258,17 +14258,17 @@ test_tiny_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id6, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Check 'op' functionality on sixth ('tiny') object */ - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_op(fh, heap_id6, op_memcpy, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Insert seventh object small enough to encode in heap ID */ @@ -14295,17 +14295,17 @@ test_tiny_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id7, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Check 'op' functionality on seventh ('tiny') object */ - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_op(fh, heap_id7, op_memcpy, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Delete individual objects, if we won't be deleting the entire heap later */ @@ -14502,7 +14502,7 @@ test_tiny_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar } /* end else */ /* Check up on heap... */ - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) TEST_ERROR; } /* end if */ @@ -14603,7 +14603,7 @@ test_filtered_man_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_para const char *base_desc = "insert one 'managed' object into heap with I/O filters, then remove"; /* Copy heap creation properties */ - HDmemcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); + memcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); /* Set an I/O filter for heap data */ deflate_level = 6; @@ -14669,10 +14669,10 @@ test_filtered_man_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_para FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Delete individual objects, if we won't be deleting the entire heap later */ @@ -14688,7 +14688,7 @@ test_filtered_man_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_para TEST_ERROR; /* Check up on heap... */ - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) TEST_ERROR; } /* end if */ @@ -14774,7 +14774,7 @@ test_filtered_man_root_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa const char *base_desc = "insert two 'managed' objects into heap with I/O filters, then remove"; /* Copy heap creation properties */ - HDmemcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); + memcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); /* Set an I/O filter for heap data */ deflate_level = 6; @@ -14849,10 +14849,10 @@ test_filtered_man_root_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id1, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Read in ('normal') object #2 */ @@ -14860,10 +14860,10 @@ test_filtered_man_root_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa FAIL_STACK_ERROR; if (obj_size != robj_size) TEST_ERROR; - HDmemset(shared_robj_g, 0, obj_size); + memset(shared_robj_g, 0, obj_size); if (H5HF_read(fh, heap_id2, shared_robj_g) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) + if (memcmp(shared_wobj_g, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Delete individual objects, if we won't be deleting the entire heap later */ @@ -14907,7 +14907,7 @@ test_filtered_man_root_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa FAIL_STACK_ERROR; /* Check up on heap... */ - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) TEST_ERROR; @@ -14937,7 +14937,7 @@ test_filtered_man_root_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa FAIL_STACK_ERROR; /* Check up on heap... */ - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) TEST_ERROR; } /* end if */ @@ -14980,7 +14980,7 @@ test_filtered_man_root_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa FAIL_STACK_ERROR; /* Check up on heap... */ - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) TEST_ERROR; @@ -15010,7 +15010,7 @@ test_filtered_man_root_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa FAIL_STACK_ERROR; /* Check up on heap... */ - HDmemset(&state, 0, sizeof(fheap_heap_state_t)); + memset(&state, 0, sizeof(fheap_heap_state_t)); if (check_stats(fh, &state)) TEST_ERROR; } /* end else */ @@ -15097,10 +15097,10 @@ test_random(hsize_t size_limit, hid_t fapl, H5HF_create_t *cparam, fheap_test_pa size_t u; /* Local index variable */ /* Initialize the heap ID structure */ - HDmemset(&keep_ids, 0, sizeof(fheap_heap_ids_t)); + memset(&keep_ids, 0, sizeof(fheap_heap_ids_t)); /* Copy heap creation properties */ - HDmemcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); + memcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); /* Check if we are compressing the blocks */ if (tparam->comp == FHEAP_TEST_COMPRESS) { @@ -15182,9 +15182,9 @@ fprintf(stderr, "Random # seed was: %lu\n", seed); /* Swap current position with future position */ /* (just swap the heap ID, the len & offset isn't used */ - HDmemcpy(temp_id, &keep_ids.ids[u * id_len], id_len); - HDmemcpy(&keep_ids.ids[u * id_len], &keep_ids.ids[(u + pos) * id_len], id_len); - HDmemcpy(&keep_ids.ids[(u + pos) * id_len], temp_id, id_len); + memcpy(temp_id, &keep_ids.ids[u * id_len], id_len); + memcpy(&keep_ids.ids[u * id_len], &keep_ids.ids[(u + pos) * id_len], id_len); + memcpy(&keep_ids.ids[(u + pos) * id_len], temp_id, id_len); } /* end if */ } /* end for */ @@ -15298,10 +15298,10 @@ test_random_pow2(hsize_t size_limit, hid_t fapl, H5HF_create_t *cparam, fheap_te size_t u; /* Local index variable */ /* Initialize the heap ID structure */ - HDmemset(&keep_ids, 0, sizeof(fheap_heap_ids_t)); + memset(&keep_ids, 0, sizeof(fheap_heap_ids_t)); /* Copy heap creation properties */ - HDmemcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); + memcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); /* Check if we are compressing the blocks */ if (tparam->comp == FHEAP_TEST_COMPRESS) { @@ -15397,9 +15397,9 @@ fprintf(stderr, "Random # seed was: %lu\n", seed); /* Swap current position with future position */ /* (just swap the heap ID, the len & offset isn't used */ - HDmemcpy(temp_id, &keep_ids.ids[u * id_len], id_len); - HDmemcpy(&keep_ids.ids[u * id_len], &keep_ids.ids[(u + pos) * id_len], id_len); - HDmemcpy(&keep_ids.ids[(u + pos) * id_len], temp_id, id_len); + memcpy(temp_id, &keep_ids.ids[u * id_len], id_len); + memcpy(&keep_ids.ids[u * id_len], &keep_ids.ids[(u + pos) * id_len], id_len); + memcpy(&keep_ids.ids[(u + pos) * id_len], temp_id, id_len); } /* end if */ } /* end for */ @@ -15530,10 +15530,10 @@ test_write(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) TESTING("writing objects in heap"); /* Initialize the heap ID structure */ - HDmemset(&keep_ids, 0, sizeof(fheap_heap_ids_t)); + memset(&keep_ids, 0, sizeof(fheap_heap_ids_t)); /* Copy heap creation properties */ - HDmemcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); + memcpy(&tmp_cparam, cparam, sizeof(H5HF_create_t)); /* Check if we are compressing the blocks */ if (tparam->comp == FHEAP_TEST_COMPRESS) { @@ -15666,7 +15666,7 @@ test_write(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) FAIL_STACK_ERROR; /* Compare data read in */ - if (HDmemcmp(rewrite_obj, shared_robj_g, obj_size) != 0) + if (memcmp(rewrite_obj, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Change size of data to write */ @@ -15715,7 +15715,7 @@ test_write(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) FAIL_STACK_ERROR; /* Compare data read in */ - if (HDmemcmp(rewrite_obj, shared_robj_g, obj_size) != 0) + if (memcmp(rewrite_obj, shared_robj_g, obj_size) != 0) TEST_ERROR; /* Change size of data to write */ @@ -15797,7 +15797,7 @@ test_bug1(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam) TESTING("bug1: inserting several objects & removing one, then re-inserting"); /* Initialize the heap ID structure */ - HDmemset(&keep_ids, 0, sizeof(fheap_heap_ids_t)); + memset(&keep_ids, 0, sizeof(fheap_heap_ids_t)); /* Perform common file & heap open operations */ if (open_heap(filename, fapl, cparam, tparam, &file, &f, &fh, &fh_addr, &state, &empty_size) < 0) @@ -16102,7 +16102,7 @@ main(void) /* Iterate over the testing parameters */ for (curr_test = FHEAP_TEST_NORMAL; curr_test < FHEAP_TEST_NTESTS; curr_test++) { /* Clear the testing parameters */ - HDmemset(&tparam, 0, sizeof(fheap_test_param_t)); + memset(&tparam, 0, sizeof(fheap_test_param_t)); tparam.actual_id_len = HEAP_ID_LEN; /* Set to run with different file space setting */ diff --git a/test/file_image.c b/test/file_image.c index 0f76630..2b4e481 100644 --- a/test/file_image.c +++ b/test/file_image.c @@ -129,7 +129,7 @@ test_properties(void) VERIFY(temp != NULL, "temp is null!"); VERIFY(temp_size == size, "Sizes of buffers don't match"); VERIFY(temp != buffer, "Retrieved buffer is the same as original"); - VERIFY(0 == HDmemcmp(temp, buffer, size), "Buffers contain different data"); + VERIFY(0 == memcmp(temp, buffer, size), "Buffers contain different data"); /* Copy the fapl */ if ((fapl_2 = H5Pcopy(fapl_1)) < 0) @@ -144,7 +144,7 @@ test_properties(void) VERIFY(temp2 != NULL, "Received buffer not set"); VERIFY(temp2 != buffer, "Retrieved buffer is the same as original"); VERIFY(temp2 != temp, "Retrieved buffer is the same as previously retrieved buffer"); - VERIFY(0 == HDmemcmp(temp2, buffer, size), "Buffers contain different data"); + VERIFY(0 == memcmp(temp2, buffer, size), "Buffers contain different data"); retval = 0; @@ -200,7 +200,7 @@ memcpy_cb(void *dest, const void *src, size_t size, H5FD_file_image_op_t op, voi u->used_callbacks |= MEMCPY; u->memcpy_src = op; - return HDmemcpy(dest, src, size); + return memcpy(dest, src, size); } /****************************************************************************** diff --git a/test/fillval.c b/test/fillval.c index a34e7f7..81f7b36 100644 --- a/test/fillval.c +++ b/test/fillval.c @@ -1011,7 +1011,7 @@ test_rdwr_cases(hid_t file, hid_t dcpl, const char *dname, void *_fillval, H5D_f } /* case for compound datatype */ else if (datatype == H5T_COMPOUND) { - HDmemset(buf_c, 0, ((size_t)nelmts * sizeof(comp_datatype))); + memset(buf_c, 0, ((size_t)nelmts * sizeof(comp_datatype))); for (u = 0; u < nelmts; u++) { buf_c[u].a = 1111.11F; buf_c[u].x = 2222; @@ -1261,7 +1261,7 @@ test_rdwr(hid_t fapl, const char *base_name, H5D_layout_t layout) * as compound type */ if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0) goto error; - HDmemset(&fill_ctype, 0, sizeof(fill_ctype)); + memset(&fill_ctype, 0, sizeof(fill_ctype)); fill_ctype.y = 4444.4444; if (H5Pset_fill_value(dcpl, ctype_id, &fill_ctype) < 0) goto error; @@ -1327,7 +1327,7 @@ test_rdwr(hid_t fapl, const char *base_name, H5D_layout_t layout) * as compound type */ if (H5Pset_fill_time(dcpl, H5D_FILL_TIME_ALLOC) < 0) goto error; - HDmemset(&fill_ctype, 0, sizeof(fill_ctype)); + memset(&fill_ctype, 0, sizeof(fill_ctype)); fill_ctype.y = 4444.4444; if (H5Pset_fill_value(dcpl, ctype_id, &fill_ctype) < 0) goto error; @@ -1632,7 +1632,7 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name, const hsize_t TEST_ERROR; /* Clear the read buffer */ - HDmemset(val_rd, 0, val_size); + memset(val_rd, 0, val_size); } /* end for */ if (H5Sclose(mspace) < 0) TEST_ERROR; @@ -1696,7 +1696,7 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name, const hsize_t TEST_ERROR; /* Clear the read buffer */ - HDmemset(val_rd, 0, val_size); + memset(val_rd, 0, val_size); } /* end for */ if (H5Sclose(mspace) < 0) TEST_ERROR; @@ -1744,7 +1744,7 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name, const hsize_t TEST_ERROR; /* Clear the read buffer */ - HDmemset(val_rd, 0, val_size); + memset(val_rd, 0, val_size); } /* end for */ if (H5Sclose(mspace) < 0) TEST_ERROR; @@ -1790,7 +1790,7 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name, const hsize_t TEST_ERROR; /* Clear the read buffer */ - HDmemset(val_rd, 0, val_size); + memset(val_rd, 0, val_size); } /* end for */ if (H5Sclose(mspace) < 0) TEST_ERROR; @@ -1838,7 +1838,7 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name, const hsize_t TEST_ERROR; /* Clear the read buffer */ - HDmemset(val_rd, 0, val_size); + memset(val_rd, 0, val_size); } /* end for */ if (H5Sclose(mspace) < 0) TEST_ERROR; @@ -1893,7 +1893,7 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name, const hsize_t TEST_ERROR; /* Clear the read buffer */ - HDmemset(val_rd, 0, val_size); + memset(val_rd, 0, val_size); /* Set location for another element initialized by H5Dset_extent() */ hs_offset[3] -= 1; @@ -1915,7 +1915,7 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name, const hsize_t TEST_ERROR; /* Clear the read buffer */ - HDmemset(val_rd, 0, val_size); + memset(val_rd, 0, val_size); /* Read some data and make sure it's the right value */ for (i = 0; i < 1000; i++) { @@ -1946,7 +1946,7 @@ test_extend_cases(hid_t file, hid_t _dcpl, const char *dset_name, const hsize_t TEST_ERROR; /* Clear the read buffer */ - HDmemset(val_rd, 0, val_size); + memset(val_rd, 0, val_size); } /* end for */ if (H5Sclose(mspace) < 0) TEST_ERROR; diff --git a/test/filter_fail.c b/test/filter_fail.c index 4215342..0044cf9 100644 --- a/test/filter_fail.c +++ b/test/filter_fail.c @@ -257,7 +257,7 @@ test_filter_read(char *file_name, hid_t my_fapl) TEST_ERROR; /* Read the chunks */ - HDmemset(rbuf, 0, DIM * sizeof(int)); + memset(rbuf, 0, DIM * sizeof(int)); if (H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0) TEST_ERROR; @@ -284,8 +284,8 @@ test_filter_read(char *file_name, hid_t my_fapl) if ((sid = H5Dget_space(dataset)) < 0) TEST_ERROR; - HDmemset(hs_offset, 0, sizeof(hs_offset)); - HDmemset(hs_size, 0, sizeof(hs_size)); + memset(hs_offset, 0, sizeof(hs_offset)); + memset(hs_size, 0, sizeof(hs_size)); hs_size[0] = DIM / 2; if (H5Sselect_hyperslab(sid, H5S_SELECT_SET, hs_offset, stride, hs_size, NULL) < 0) @@ -295,12 +295,12 @@ test_filter_read(char *file_name, hid_t my_fapl) if ((mspace = H5Screate_simple(1, dims, NULL)) < 0) TEST_ERROR; - HDmemset(zero, 0, sizeof zero); + memset(zero, 0, sizeof zero); if (H5Sselect_hyperslab(mspace, H5S_SELECT_SET, zero, stride, &nelmts, NULL) < 0) TEST_ERROR; - HDmemset(rbuf, 0, DIM * sizeof(int)); + memset(rbuf, 0, DIM * sizeof(int)); if (H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, sid, H5P_DEFAULT, rbuf) < 0) TEST_ERROR; diff --git a/test/filter_plugin.c b/test/filter_plugin.c index d7a21e6..64230e5 100644 --- a/test/filter_plugin.c +++ b/test/filter_plugin.c @@ -124,7 +124,7 @@ allocate_and_init_2D_array(int ***arr, const hsize_t *sizes, int **initial_value /* Copy over the data elements */ if (initial_values) { n_bytes = r * c * sizeof(int); - HDmemcpy((*arr)[0], initial_values[0], n_bytes); + memcpy((*arr)[0], initial_values[0], n_bytes); } return SUCCEED; diff --git a/test/freespace.c b/test/freespace.c index 9578976..e1628b7 100644 --- a/test/freespace.c +++ b/test/freespace.c @@ -363,7 +363,7 @@ TEST_set_eoa(haddr_t val) static void init_cparam(H5FS_create_t *cparam) { - HDmemset(cparam, 0, sizeof(H5FS_create_t)); + memset(cparam, 0, sizeof(H5FS_create_t)); /* Set the free space creation parameters */ cparam->shrink_percent = TEST_FSPACE_SHRINK; @@ -492,11 +492,11 @@ test_fs_create(hid_t fapl) if (frsp->nclasses != nclasses) TEST_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); if (check_stats(f, frsp, &state)) TEST_ERROR; - HDmemset(&test_cparam, 0, sizeof(H5FS_create_t)); + memset(&test_cparam, 0, sizeof(H5FS_create_t)); if (H5FS__get_cparam_test(frsp, &test_cparam) < 0) FAIL_STACK_ERROR; if (H5FS__cmp_cparam_test(&cparam, &test_cparam)) @@ -641,7 +641,7 @@ test_fs_sect_add(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node, H5FS_ADD_RETURNED_SPACE, NULL) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += sect_node->sect_info.size; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -707,7 +707,7 @@ test_fs_sect_add(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node, 0, NULL) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += sect_node->sect_info.size; state.tot_sect_count += 1; state.ghost_sect_count += 1; @@ -785,7 +785,7 @@ test_fs_sect_add(hid_t fapl) FAIL_STACK_ERROR; /* nothing in free-space */ - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); if (check_stats(f, frsp, &state)) TEST_ERROR; @@ -854,7 +854,7 @@ test_fs_sect_add(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node, H5FS_ADD_DESERIALIZING, &can_shrink) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += sect_node->sect_info.size; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -965,7 +965,7 @@ test_fs_sect_find(hid_t fapl) if (!H5_addr_defined(fs_addr)) TEST_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); if (check_stats(f, frsp, &state)) TEST_ERROR; @@ -1010,7 +1010,7 @@ test_fs_sect_find(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node1, H5FS_ADD_RETURNED_SPACE, NULL) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += sect_node1->sect_info.size; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -1137,7 +1137,7 @@ test_fs_sect_find(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node1, H5FS_ADD_RETURNED_SPACE, NULL) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += sect_node1->sect_info.size; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -1216,7 +1216,7 @@ test_fs_sect_find(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node1, H5FS_ADD_RETURNED_SPACE, NULL) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += sect_node1->sect_info.size; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -1364,7 +1364,7 @@ test_fs_sect_merge(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node1, H5FS_ADD_RETURNED_SPACE, NULL) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += TEST_SECT_SIZE50; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -1493,7 +1493,7 @@ test_fs_sect_merge(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node1, H5FS_ADD_RETURNED_SPACE, NULL) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += TEST_SECT_SIZE30; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -1596,7 +1596,7 @@ test_fs_sect_merge(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node1, H5FS_ADD_RETURNED_SPACE, NULL) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += TEST_SECT_SIZE10; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -1843,7 +1843,7 @@ test_fs_sect_shrink(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node1, H5FS_ADD_RETURNED_SPACE, &can_shrink) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += sect_node1->sect_info.size; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -1879,7 +1879,7 @@ test_fs_sect_shrink(hid_t fapl) FAIL_STACK_ERROR; /* should have nothing in free-space */ - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); if (check_stats(f, frsp, &state)) TEST_ERROR; @@ -1944,7 +1944,7 @@ test_fs_sect_shrink(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node1, H5FS_ADD_RETURNED_SPACE, &can_shrink) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += sect_node1->sect_info.size; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -2044,7 +2044,7 @@ test_fs_sect_shrink(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node1, H5FS_ADD_RETURNED_SPACE, &can_shrink) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += sect_node1->sect_info.size; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -2065,7 +2065,7 @@ test_fs_sect_shrink(hid_t fapl) FAIL_STACK_ERROR; /* section A & B are merged and then strunk, so there is nothing in free-space */ - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); if (check_stats(f, frsp, &state)) TEST_ERROR; @@ -2186,7 +2186,7 @@ test_fs_sect_change_class(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node1, H5FS_ADD_RETURNED_SPACE, NULL) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += TEST_SECT_SIZE30; state.tot_sect_count += 1; state.ghost_sect_count += 1; @@ -2474,7 +2474,7 @@ test_fs_sect_extend(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node1, H5FS_ADD_RETURNED_SPACE, NULL) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += sect_node1->sect_info.size; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -2551,7 +2551,7 @@ test_fs_sect_extend(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node1, H5FS_ADD_RETURNED_SPACE, NULL) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += sect_node1->sect_info.size; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -2625,7 +2625,7 @@ test_fs_sect_extend(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node1, H5FS_ADD_RETURNED_SPACE, NULL) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += sect_node1->sect_info.size; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -2700,7 +2700,7 @@ test_fs_sect_extend(hid_t fapl) if (H5FS_sect_add(f, frsp, (H5FS_section_info_t *)sect_node1, H5FS_ADD_RETURNED_SPACE, NULL) < 0) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(frspace_state_t)); + memset(&state, 0, sizeof(frspace_state_t)); state.tot_space += sect_node1->sect_info.size; state.tot_sect_count += 1; state.serial_sect_count += 1; diff --git a/test/genall5.c b/test/genall5.c index 84541d2..005e944 100644 --- a/test/genall5.c +++ b/test/genall5.c @@ -170,7 +170,7 @@ vrfy_ns_grp_0(hid_t fid, const char *group_name) } if (pass) { - HDmemset(&grp_info, 0, sizeof(grp_info)); + memset(&grp_info, 0, sizeof(grp_info)); ret = H5Gget_info(gid, &grp_info); if (ret < 0) { @@ -422,7 +422,7 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) } if (pass) { - HDmemset(&grp_info, 0, sizeof(grp_info)); + memset(&grp_info, 0, sizeof(grp_info)); ret = H5Gget_info(gid, &grp_info); if (ret < 0) { @@ -468,7 +468,7 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) } assert(link_exists >= 0); - HDmemset(&lnk_info, 0, sizeof(grp_info)); + memset(&lnk_info, 0, sizeof(grp_info)); ret = H5Lget_info2(gid, linkname, &lnk_info, H5P_DEFAULT); if (ret < 0) { @@ -538,7 +538,7 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks) } assert(H5L_TYPE_HARD == lnk_info.type); - HDmemset(&root_oinfo, 0, sizeof(root_oinfo)); + memset(&root_oinfo, 0, sizeof(root_oinfo)); ret = H5Oget_info3(fid, &root_oinfo, H5O_INFO_BASIC); if (ret < 0) { @@ -826,7 +826,7 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) } if (pass) { - HDmemset(&grp_info, 0, sizeof(grp_info)); + memset(&grp_info, 0, sizeof(grp_info)); ret = H5Gget_info(gid, &grp_info); if (ret < 0) { @@ -871,7 +871,7 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) } assert(link_exists >= 0); - HDmemset(&lnk_info, 0, sizeof(grp_info)); + memset(&lnk_info, 0, sizeof(grp_info)); ret = H5Lget_info2(gid, linkname, &lnk_info, H5P_DEFAULT); if (ret < 0) { @@ -941,7 +941,7 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks) } assert(H5L_TYPE_HARD == lnk_info.type); - HDmemset(&root_oinfo, 0, sizeof(root_oinfo)); + memset(&root_oinfo, 0, sizeof(root_oinfo)); ret = H5Oget_info3(fid, &root_oinfo, H5O_INFO_BASIC); if (ret < 0) { pass = FALSE; @@ -1180,7 +1180,7 @@ vrfy_os_grp_0(hid_t fid, const char *group_name) } if (pass) { - HDmemset(&grp_info, 0, sizeof(grp_info)); + memset(&grp_info, 0, sizeof(grp_info)); ret = H5Gget_info(gid, &grp_info); if (ret < 0) { @@ -1409,7 +1409,7 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) } if (pass) { - HDmemset(&grp_info, 0, sizeof(grp_info)); + memset(&grp_info, 0, sizeof(grp_info)); ret = H5Gget_info(gid, &grp_info); @@ -1455,7 +1455,7 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) } assert(link_exists >= 0); - HDmemset(&lnk_info, 0, sizeof(grp_info)); + memset(&lnk_info, 0, sizeof(grp_info)); ret = H5Lget_info2(gid, linkname, &lnk_info, H5P_DEFAULT); if (ret < 0) { @@ -1523,7 +1523,7 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks) } assert(H5L_TYPE_HARD == lnk_info.type); - HDmemset(&root_oinfo, 0, sizeof(root_oinfo)); + memset(&root_oinfo, 0, sizeof(root_oinfo)); ret = H5Oget_info3(fid, &root_oinfo, H5O_INFO_BASIC); if (ret < 0) { diff --git a/test/getname.c b/test/getname.c index 3ae0563..12f85d0 100644 --- a/test/getname.c +++ b/test/getname.c @@ -3324,7 +3324,7 @@ test_obj_ref(hid_t fapl) TEST_ERROR; PASSED(); - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); TESTING("getting path to dataset in /Group1"); if ((dataset2 = H5Rdereference2(dataset, H5P_DEFAULT, H5R_OBJECT, &wbuf[1])) < 0) FAIL_STACK_ERROR; @@ -3340,7 +3340,7 @@ test_obj_ref(hid_t fapl) TEST_ERROR; PASSED(); - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); TESTING("getting path to /Group1"); if ((group = H5Rdereference2(dataset, H5P_DEFAULT, H5R_OBJECT, &wbuf[2])) < 0) FAIL_STACK_ERROR; @@ -3356,7 +3356,7 @@ test_obj_ref(hid_t fapl) TEST_ERROR; PASSED(); - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); TESTING("getting path to datatype in /Group1"); if ((tid1 = H5Rdereference2(dataset, H5P_DEFAULT, H5R_OBJECT, &wbuf[3])) < 0) FAIL_STACK_ERROR; @@ -3372,7 +3372,7 @@ test_obj_ref(hid_t fapl) TEST_ERROR; PASSED(); - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); TESTING("getting path to dataset in nested group"); if ((dataset2 = H5Rdereference2(dataset, H5P_DEFAULT, H5R_OBJECT, &wbuf[4])) < 0) FAIL_STACK_ERROR; @@ -3388,7 +3388,7 @@ test_obj_ref(hid_t fapl) TEST_ERROR; PASSED(); - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); TESTING("getting path to nested group"); if ((group = H5Rdereference2(dataset, H5P_DEFAULT, H5R_OBJECT, &wbuf[5])) < 0) FAIL_STACK_ERROR; @@ -3404,7 +3404,7 @@ test_obj_ref(hid_t fapl) TEST_ERROR; PASSED(); - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); TESTING("getting path to dataset created via hard link"); if ((dataset2 = H5Rdereference2(dataset, H5P_DEFAULT, H5R_OBJECT, &wbuf[6])) < 0) FAIL_STACK_ERROR; @@ -3420,7 +3420,7 @@ test_obj_ref(hid_t fapl) TEST_ERROR; PASSED(); - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); TESTING("getting path to root group"); if ((group = H5Rdereference2(dataset, H5P_DEFAULT, H5R_OBJECT, &wbuf[7])) < 0) FAIL_STACK_ERROR; diff --git a/test/gheap.c b/test/gheap.c index ce38dc3..714ba27 100644 --- a/test/gheap.c +++ b/test/gheap.c @@ -95,7 +95,7 @@ test_1(hid_t fapl) */ for (u = 0; u < GHEAP_TEST_NOBJS; u++) { size = u + 1; - HDmemset(out, (int)('A' + u % 26), size); + memset(out, (int)('A' + u % 26), size); H5Eclear2(H5E_DEFAULT); status = H5HG_insert(f, size, out, obj + u); if (status < 0) { @@ -115,14 +115,14 @@ test_1(hid_t fapl) */ for (u = 0; u < GHEAP_TEST_NOBJS; u++) { size = u + 1; - HDmemset(out, (int)('A' + u % 26), size); + memset(out, (int)('A' + u % 26), size); H5Eclear2(H5E_DEFAULT); if (NULL == H5HG_read(f, obj + u, in, NULL)) { H5_FAILED(); HDputs(" Unable to read object"); nerrors++; } - else if (HDmemcmp(in, out, size) != 0) { + else if (memcmp(in, out, size) != 0) { H5_FAILED(); HDputs(" Value read doesn't match value written"); nerrors++; @@ -198,7 +198,7 @@ test_2(hid_t fapl) */ for (u = 0; u < GHEAP_TEST_NOBJS; u++) { size = GHEAP_TEST_NOBJS - u; - HDmemset(out, (int)('A' + u % 26), size); + memset(out, (int)('A' + u % 26), size); H5Eclear2(H5E_DEFAULT); if (H5HG_insert(f, size, out, obj + u) < 0) { H5_FAILED(); @@ -212,14 +212,14 @@ test_2(hid_t fapl) */ for (u = 0; u < GHEAP_TEST_NOBJS; u++) { size = GHEAP_TEST_NOBJS - u; - HDmemset(out, (int)('A' + u % 26), size); + memset(out, (int)('A' + u % 26), size); H5Eclear2(H5E_DEFAULT); if (NULL == H5HG_read(f, obj + u, in, NULL)) { H5_FAILED(); HDputs(" Unable to read object"); nerrors++; } - else if (HDmemcmp(in, out, size) != 0) { + else if (memcmp(in, out, size) != 0) { H5_FAILED(); HDputs(" Value read doesn't match value written"); nerrors++; @@ -293,7 +293,7 @@ test_3(hid_t fapl) /* Create some stuff */ for (u = 0; u < GHEAP_TEST_NOBJS; u++) { size = u % 30 + 100; - HDmemset(out, (int)('A' + u % 26), size); + memset(out, (int)('A' + u % 26), size); H5Eclear2(H5E_DEFAULT); status = H5HG_insert(f, size, out, obj + u); if (status < 0) { @@ -381,7 +381,7 @@ test_4(hid_t fapl) for (u = 0; u < GHEAP_TEST_NOBJS; u++) { /* Insert */ size = u % 30 + 100; - HDmemset(out, (int)('A' + u % 26), size); + memset(out, (int)('A' + u % 26), size); H5Eclear2(H5E_DEFAULT); status = H5HG_insert(f, size, out, obj + u); if (status < 0) { @@ -402,7 +402,7 @@ test_4(hid_t fapl) HDputs(" Unable to remove object"); nerrors++; } - HDmemset(obj + u - 1, 0, sizeof *obj); + memset(obj + u - 1, 0, sizeof *obj); } } diff --git a/test/h5test.c b/test/h5test.c index 9725259..7d5ba66 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -465,7 +465,7 @@ h5_fixname_real(const char *base_name, hid_t fapl, const char *_suffix, char *fu if (!base_name || !fullname || size < 1) return NULL; - HDmemset(fullname, 0, size); + memset(fullname, 0, size); /* Determine if driver is set by environment variable. If it is, * only generate a suffix if fixing the filename for the superblock @@ -1731,7 +1731,7 @@ h5_get_dummy_vfd_class(void) TEST_ERROR; /* Copy the dummy VFD */ - HDmemcpy(vfd_class, &H5FD_dummy_g, sizeof(H5FD_class_t)); + memcpy(vfd_class, &H5FD_dummy_g, sizeof(H5FD_class_t)); return vfd_class; diff --git a/test/hyperslab.c b/test/hyperslab.c index 5b9ff1d..e2ca4f1 100644 --- a/test/hyperslab.c +++ b/test/hyperslab.c @@ -1003,7 +1003,7 @@ test_array_fill(size_t lo, size_t hi) if (dst[(u * ARRAY_FILL_SIZE) + v] != src[v]) TEST_ERROR; - HDmemset(dst, 0, sizeof(int) * ARRAY_FILL_SIZE * w); + memset(dst, 0, sizeof(int) * ARRAY_FILL_SIZE * w); } /* end for */ PASSED(); diff --git a/test/istore.c b/test/istore.c index 4c328e8..8dcc205 100644 --- a/test/istore.c +++ b/test/istore.c @@ -303,7 +303,7 @@ test_extend(hid_t f, const char *prefix, size_t nx, size_t ny, size_t nz) /* Fill the source array */ if (0 == nelmts) continue; - HDmemset(buf, (signed)(128 + ctr), (size_t)nelmts); + memset(buf, (signed)(128 + ctr), (size_t)nelmts); /* Create dataspace for selection in memory */ if ((mspace = H5Screate_simple(1, &nelmts, NULL)) < 0) @@ -321,13 +321,13 @@ test_extend(hid_t f, const char *prefix, size_t nx, size_t ny, size_t nz) } /* Read from disk */ - HDmemset(check, 0xff, (size_t)nelmts); + memset(check, 0xff, (size_t)nelmts); if (H5Dread(dataset, TEST_DATATYPE, mspace, fspace, H5P_DEFAULT, check) < 0) { H5_FAILED(); fprintf(stderr, " Read failed: ctr=%lu\n", (unsigned long)ctr); goto error; } - if (HDmemcmp(buf, check, (size_t)nelmts) != 0) { + if (memcmp(buf, check, (size_t)nelmts) != 0) { H5_FAILED(); fprintf(stderr, " Read check failed: ctr=%lu\n", (unsigned long)ctr); fprintf(stderr, " Wrote:\n"); @@ -351,7 +351,7 @@ test_extend(hid_t f, const char *prefix, size_t nx, size_t ny, size_t nz) } /* Now read the entire array back out and check it */ - HDmemset(buf, 0xff, nx * ny * nz); + memset(buf, 0xff, nx * ny * nz); if (H5Dread(dataset, TEST_DATATYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf) < 0) { H5_FAILED(); fprintf(stderr, " Read failed for whole array.\n"); @@ -454,7 +454,7 @@ test_sparse(hid_t f, const char *prefix, size_t nblocks, size_t nx, size_t ny, s return SUCCEED; } buf = (uint8_t *)malloc(nx * ny * nz); - HDmemset(buf, 128, nx * ny * nz); + memset(buf, 128, nx * ny * nz); /* Set dimensions of dataset */ for (u = 0; u < (size_t)ndims; u++) diff --git a/test/links.c b/test/links.c index 585be40..1c46fb7 100644 --- a/test/links.c +++ b/test/links.c @@ -2019,7 +2019,7 @@ test_deprec(hid_t fapl, hbool_t new_format) if (H5Gget_objinfo(file_id, "/group1/link_to_group2", TRUE, &sb_hard2) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(&sb_hard1.objno, sb_hard2.objno, sizeof(sb_hard1.objno)) != 0) { + if (memcmp(&sb_hard1.objno, sb_hard2.objno, sizeof(sb_hard1.objno)) != 0) { H5_FAILED(); HDputs(" Hard link test failed. Link seems not to point to the "); HDputs(" expected file location."); @@ -2032,7 +2032,7 @@ test_deprec(hid_t fapl, hbool_t new_format) if (H5Gget_objinfo(file_id, "/group2/link_to_group1", TRUE, &sb_hard2) < 0) FAIL_STACK_ERROR; - if (HDmemcmp(&sb_hard1.objno, sb_hard2.objno, sizeof(sb_hard1.objno)) != 0) { + if (memcmp(&sb_hard1.objno, sb_hard2.objno, sizeof(sb_hard1.objno)) != 0) { H5_FAILED(); HDputs(" Hard link test failed. Link seems not to point to the "); HDputs(" expected file location."); @@ -4867,7 +4867,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h HDsnprintf(valname, sizeof(valname), "value %02u", (unsigned)n); /* Verify the link information for first link, in increasing creation order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -4875,7 +4875,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h TEST_ERROR; /* Verify the link information for new link, in increasing creation order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, n, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (linfo.corder != (int64_t)n) @@ -4883,7 +4883,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h /* Verify value for new soft link, in increasing creation order */ if (!hard_link) { - HDmemset(tmpval, 0, (size_t)NAME_BUF_SIZE); + memset(tmpval, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_val_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, n, tmpval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -4892,7 +4892,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h } /* end if */ /* Verify the name for new link, in increasing creation order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, n, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -4905,7 +4905,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h */ if (use_index) { /* Verify the link information for first link, in native creation order (which is increasing) */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_NATIVE, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -4913,7 +4913,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h TEST_ERROR; /* Verify the link information for new link, in native creation order (which is increasing) */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_NATIVE, n, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -4922,7 +4922,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h /* Verify value for new soft link, in native creation order (which is increasing) */ if (!hard_link) { - HDmemset(tmpval, 0, (size_t)NAME_BUF_SIZE); + memset(tmpval, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_val_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_NATIVE, n, tmpval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -4931,7 +4931,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h } /* end if */ /* Verify the name for new link, in native creation order (which is increasing) */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_NATIVE, n, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -4940,14 +4940,14 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h } /* end if */ /* Verify the link information for first link, in decreasing creation order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, n, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (linfo.corder != 0) TEST_ERROR; /* Verify the link information for new link, in decreasing creation order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -4956,7 +4956,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h /* Verify value for new soft link, in decreasing creation order */ if (!hard_link) { - HDmemset(tmpval, 0, (size_t)NAME_BUF_SIZE); + memset(tmpval, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_val_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)0, tmpval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -4965,7 +4965,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h } /* end if */ /* Verify the name for new link, in decreasing creation order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -4973,14 +4973,14 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h TEST_ERROR; /* Verify the link information for first link, in increasing link name order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (linfo.corder != 0) TEST_ERROR; /* Verify the link information for new link, in increasing link name order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, n, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (linfo.corder != (int64_t)n) @@ -4988,7 +4988,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h /* Verify value for new soft link, in increasing link name order */ if (!hard_link) { - HDmemset(tmpval, 0, (size_t)NAME_BUF_SIZE); + memset(tmpval, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_val_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, n, tmpval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -4997,7 +4997,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h } /* end if */ /* Verify the name for new link, in increasing link name order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, n, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -5009,14 +5009,14 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h */ /* Verify the link information for first link, in decreasing link name order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, n, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (linfo.corder != 0) TEST_ERROR; /* Verify the link information for new link, in decreasing link name order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (linfo.corder != (int64_t)n) @@ -5024,7 +5024,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h /* Verify value for new soft link, in decreasing link name order */ if (!hard_link) { - HDmemset(tmpval, 0, (size_t)NAME_BUF_SIZE); + memset(tmpval, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_val_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, (hsize_t)0, tmpval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -5033,7 +5033,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h } /* end if */ /* Verify the name for new link, in decreasing link name order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -5648,7 +5648,7 @@ delete_by_idx_deprec(hid_t fapl) TEST_ERROR; /* Verify the link information for first link in appropriate order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", idx_type, order, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -5662,7 +5662,7 @@ delete_by_idx_deprec(hid_t fapl) } /* end else */ /* Verify the name for first link in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", idx_type, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -5722,7 +5722,7 @@ delete_by_idx_deprec(hid_t fapl) TEST_ERROR; /* Verify the link information for first link in appropriate order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", idx_type, order, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -5736,7 +5736,7 @@ delete_by_idx_deprec(hid_t fapl) } /* end else */ /* Verify the name for first link in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", idx_type, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -5800,7 +5800,7 @@ delete_by_idx_deprec(hid_t fapl) TEST_ERROR; /* Verify the link information for current link in appropriate order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", idx_type, order, (hsize_t)u, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -5814,7 +5814,7 @@ delete_by_idx_deprec(hid_t fapl) } /* end else */ /* Verify the name for current link in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", idx_type, order, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -5834,7 +5834,7 @@ delete_by_idx_deprec(hid_t fapl) TEST_ERROR; /* Verify the link information for first link in appropriate order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", idx_type, order, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -5848,7 +5848,7 @@ delete_by_idx_deprec(hid_t fapl) } /* end else */ /* Verify the name for first link in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", idx_type, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -6003,7 +6003,7 @@ delete_by_idx_old_deprec(hid_t fapl) TEST_ERROR; /* Verify the link information for first link in appropriate order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (order == H5_ITER_INC) { @@ -6016,7 +6016,7 @@ delete_by_idx_old_deprec(hid_t fapl) } /* end else */ /* Verify the name for first link in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -6077,7 +6077,7 @@ delete_by_idx_old_deprec(hid_t fapl) TEST_ERROR; /* Verify the link information for current link in appropriate order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (order == H5_ITER_INC) { @@ -6090,7 +6090,7 @@ delete_by_idx_old_deprec(hid_t fapl) } /* end else */ /* Verify the name for current link in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -6111,7 +6111,7 @@ delete_by_idx_old_deprec(hid_t fapl) TEST_ERROR; /* Verify the link information for first link in appropriate order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx1(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (order == H5_ITER_INC) { @@ -6124,7 +6124,7 @@ delete_by_idx_old_deprec(hid_t fapl) } /* end else */ /* Verify the name for first link in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -6295,7 +6295,7 @@ link_iterate_check_deprec(hid_t group_id, H5_index_t idx_type, H5_iter_order_t o iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Literate1(group_id, idx_type, order, &skip, link_iterate_deprec_cb, iter_info) < 0) TEST_ERROR; @@ -6312,7 +6312,7 @@ link_iterate_check_deprec(hid_t group_id, H5_index_t idx_type, H5_iter_order_t o iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Giterate(group_id, ".", &gskip, group_iterate_deprec_cb, iter_info) < 0) TEST_ERROR; @@ -6329,7 +6329,7 @@ link_iterate_check_deprec(hid_t group_id, H5_index_t idx_type, H5_iter_order_t o iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = (int64_t)(order != H5_ITER_DEC ? skip : ((max_links - 1) - skip)); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Literate1(group_id, idx_type, order, &skip, link_iterate_deprec_cb, iter_info) < 0) TEST_ERROR; @@ -6364,7 +6364,7 @@ link_iterate_check_deprec(hid_t group_id, H5_index_t idx_type, H5_iter_order_t o iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? (unsigned)gskip : ((max_links - 1) - (unsigned)gskip); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Giterate(group_id, ".", &gskip, group_iterate_deprec_cb, iter_info) < 0) TEST_ERROR; @@ -6399,7 +6399,7 @@ link_iterate_check_deprec(hid_t group_id, H5_index_t idx_type, H5_iter_order_t o iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if ((ret = H5Literate1(group_id, idx_type, order, &skip, link_iterate_deprec_cb, iter_info)) < 0) TEST_ERROR; if (ret != CORDER_ITER_STOP) @@ -6413,7 +6413,7 @@ link_iterate_check_deprec(hid_t group_id, H5_index_t idx_type, H5_iter_order_t o iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if ((ret = H5Giterate(group_id, ".", &gskip, group_iterate_deprec_cb, iter_info)) < 0) TEST_ERROR; if (ret != CORDER_ITER_STOP) @@ -6775,7 +6775,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Literate1(group_id, H5_INDEX_NAME, order, &skip, link_iterate_old_deprec_cb, iter_info) < 0) TEST_ERROR; @@ -6792,7 +6792,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Giterate(group_id, ".", &gskip, group_iterate_old_deprec_cb, iter_info) < 0) TEST_ERROR; @@ -6809,7 +6809,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = (int64_t)(order != H5_ITER_DEC ? skip : ((max_links - 1) - skip)); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Literate1(group_id, H5_INDEX_NAME, order, &skip, link_iterate_old_deprec_cb, iter_info) < 0) TEST_ERROR; @@ -6844,7 +6844,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? (unsigned)gskip : ((max_links - 1) - (unsigned)gskip); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Giterate(group_id, ".", &gskip, group_iterate_old_deprec_cb, iter_info) < 0) TEST_ERROR; @@ -6879,7 +6879,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if ((ret = H5Literate1(group_id, H5_INDEX_NAME, order, &skip, link_iterate_old_deprec_cb, iter_info)) < 0) TEST_ERROR; if (ret != CORDER_ITER_STOP) @@ -6893,7 +6893,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if ((ret = H5Giterate(group_id, ".", &gskip, group_iterate_old_deprec_cb, iter_info)) < 0) TEST_ERROR; if (ret != CORDER_ITER_STOP) @@ -9035,11 +9035,11 @@ external_set_elink_fapl1(hid_t fapl, hbool_t new_format) h5_fixname(FILENAME[37], fam_fapl, filename2A, sizeof filename2A); /* settings for multi file */ - 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); - HDmemset(sv, 0, sizeof sv); + 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); + memset(sv, 0, sizeof sv); for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt++) { memb_map[mt] = H5FD_MEM_SUPER; @@ -13654,7 +13654,7 @@ external_link_with_committed_datatype(hid_t fapl, hbool_t new_format) FAIL_STACK_ERROR; /* Compare the data read should be the same as wbuf */ - if (HDmemcmp(wbuf, rbuf, sizeof(wbuf)) != 0) + if (memcmp(wbuf, rbuf, sizeof(wbuf)) != 0) FAIL_STACK_ERROR; /* Close the dataset */ @@ -17995,7 +17995,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t HDsnprintf(valname, sizeof(valname), "value %02u", (unsigned)n); /* Verify the link information for first link, in increasing creation order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18003,7 +18003,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t TEST_ERROR; /* Verify the link information for new link, in increasing creation order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, n, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (linfo.corder != (int64_t)n) @@ -18011,7 +18011,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t /* Verify value for new soft link, in increasing creation order */ if (!hard_link) { - HDmemset(tmpval, 0, (size_t)NAME_BUF_SIZE); + memset(tmpval, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_val_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, n, tmpval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18020,7 +18020,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t } /* end if */ /* Verify the name for new link, in increasing creation order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, n, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18033,7 +18033,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t */ if (use_index) { /* Verify the link information for first link, in native creation order (which is increasing) */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_NATIVE, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18041,7 +18041,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t TEST_ERROR; /* Verify the link information for new link, in native creation order (which is increasing) */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_NATIVE, n, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18050,7 +18050,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t /* Verify value for new soft link, in native creation order (which is increasing) */ if (!hard_link) { - HDmemset(tmpval, 0, (size_t)NAME_BUF_SIZE); + memset(tmpval, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_val_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_NATIVE, n, tmpval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18059,7 +18059,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t } /* end if */ /* Verify the name for new link, in native creation order (which is increasing) */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_NATIVE, n, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18068,14 +18068,14 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t } /* end if */ /* Verify the link information for first link, in decreasing creation order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, n, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (linfo.corder != 0) TEST_ERROR; /* Verify the link information for new link, in decreasing creation order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18084,7 +18084,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t /* Verify value for new soft link, in decreasing creation order */ if (!hard_link) { - HDmemset(tmpval, 0, (size_t)NAME_BUF_SIZE); + memset(tmpval, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_val_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)0, tmpval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18093,7 +18093,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t } /* end if */ /* Verify the name for new link, in decreasing creation order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18101,14 +18101,14 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t TEST_ERROR; /* Verify the link information for first link, in increasing link name order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (linfo.corder != 0) TEST_ERROR; /* Verify the link information for new link, in increasing link name order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, n, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (linfo.corder != (int64_t)n) @@ -18116,7 +18116,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t /* Verify value for new soft link, in increasing link name order */ if (!hard_link) { - HDmemset(tmpval, 0, (size_t)NAME_BUF_SIZE); + memset(tmpval, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_val_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, n, tmpval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18125,7 +18125,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t } /* end if */ /* Verify the name for new link, in increasing link name order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, n, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18137,14 +18137,14 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t */ /* Verify the link information for first link, in decreasing link name order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, n, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (linfo.corder != 0) TEST_ERROR; /* Verify the link information for new link, in decreasing link name order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (linfo.corder != (int64_t)n) @@ -18152,7 +18152,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t /* Verify value for new soft link, in decreasing link name order */ if (!hard_link) { - HDmemset(tmpval, 0, (size_t)NAME_BUF_SIZE); + memset(tmpval, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_val_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, (hsize_t)0, tmpval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18161,7 +18161,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t } /* end if */ /* Verify the name for new link, in decreasing link name order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18482,7 +18482,7 @@ link_info_by_idx_old(hid_t fapl) if (H5Oget_info3(group_id2, &oi, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&objtoken[u], &oi.token, sizeof(H5O_token_t)); + memcpy(&objtoken[u], &oi.token, sizeof(H5O_token_t)); /* Close group */ if (H5Gclose(group_id2) < 0) @@ -18790,7 +18790,7 @@ delete_by_idx(hid_t fapl) TEST_ERROR; /* Verify the link information for first link in appropriate order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", idx_type, order, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18804,7 +18804,7 @@ delete_by_idx(hid_t fapl) } /* end else */ /* Verify the name for first link in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", idx_type, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18864,7 +18864,7 @@ delete_by_idx(hid_t fapl) TEST_ERROR; /* Verify the link information for first link in appropriate order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", idx_type, order, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18878,7 +18878,7 @@ delete_by_idx(hid_t fapl) } /* end else */ /* Verify the name for first link in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", idx_type, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18942,7 +18942,7 @@ delete_by_idx(hid_t fapl) TEST_ERROR; /* Verify the link information for current link in appropriate order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", idx_type, order, (hsize_t)u, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18956,7 +18956,7 @@ delete_by_idx(hid_t fapl) } /* end else */ /* Verify the name for current link in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", idx_type, order, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18976,7 +18976,7 @@ delete_by_idx(hid_t fapl) TEST_ERROR; /* Verify the link information for first link in appropriate order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", idx_type, order, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -18990,7 +18990,7 @@ delete_by_idx(hid_t fapl) } /* end else */ /* Verify the name for first link in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", idx_type, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -19121,7 +19121,7 @@ delete_by_idx_old(hid_t fapl) if (H5Oget_info3(group_id2, &oi, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&objtoken[u], &oi.token, sizeof(H5O_token_t)); + memcpy(&objtoken[u], &oi.token, sizeof(H5O_token_t)); /* Close group */ if (H5Gclose(group_id2) < 0) @@ -19155,7 +19155,7 @@ delete_by_idx_old(hid_t fapl) TEST_ERROR; /* Verify the link information for first link in appropriate order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (order == H5_ITER_INC) { @@ -19172,7 +19172,7 @@ delete_by_idx_old(hid_t fapl) } /* end else */ /* Verify the name for first link in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -19218,7 +19218,7 @@ delete_by_idx_old(hid_t fapl) if (H5Oget_info3(group_id2, &oi, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&objtoken[u], &oi.token, sizeof(H5O_token_t)); + memcpy(&objtoken[u], &oi.token, sizeof(H5O_token_t)); /* Close group */ if (H5Gclose(group_id2) < 0) @@ -19234,7 +19234,7 @@ delete_by_idx_old(hid_t fapl) TEST_ERROR; /* Verify the link information for current link in appropriate order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (order == H5_ITER_INC) { @@ -19251,7 +19251,7 @@ delete_by_idx_old(hid_t fapl) } /* end else */ /* Verify the name for current link in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -19272,7 +19272,7 @@ delete_by_idx_old(hid_t fapl) TEST_ERROR; /* Verify the link information for first link in appropriate order */ - HDmemset(&linfo, 0, sizeof(linfo)); + memset(&linfo, 0, sizeof(linfo)); if (H5Lget_info_by_idx2(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; if (order == H5_ITER_INC) { @@ -19289,7 +19289,7 @@ delete_by_idx_old(hid_t fapl) } /* end else */ /* Verify the name for first link in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; @@ -19469,7 +19469,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Literate2(group_id, idx_type, order, &skip, link_iterate_cb, iter_info) < 0) TEST_ERROR; @@ -19487,7 +19487,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Giterate(group_id, ".", &gskip, group_iterate_cb, iter_info) < 0) TEST_ERROR; @@ -19505,7 +19505,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = (int64_t)(order != H5_ITER_DEC ? skip : ((max_links - 1) - skip)); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Literate2(group_id, idx_type, order, &skip, link_iterate_cb, iter_info) < 0) TEST_ERROR; @@ -19541,7 +19541,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? (unsigned)gskip : ((max_links - 1) - (unsigned)gskip); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Giterate(group_id, ".", &gskip, group_iterate_cb, iter_info) < 0) TEST_ERROR; @@ -19577,7 +19577,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if ((ret = H5Literate2(group_id, idx_type, order, &skip, link_iterate_cb, iter_info)) < 0) TEST_ERROR; if (ret != CORDER_ITER_STOP) @@ -19592,7 +19592,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if ((ret = H5Giterate(group_id, ".", &gskip, group_iterate_cb, iter_info)) < 0) TEST_ERROR; if (ret != CORDER_ITER_STOP) @@ -19963,7 +19963,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Literate2(group_id, H5_INDEX_NAME, order, &skip, link_iterate_old_cb, iter_info) < 0) TEST_ERROR; @@ -19981,7 +19981,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Giterate(group_id, ".", &gskip, group_iterate_old_cb, iter_info) < 0) TEST_ERROR; @@ -19999,7 +19999,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = (int64_t)(order != H5_ITER_DEC ? skip : ((max_links - 1) - skip)); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Literate2(group_id, H5_INDEX_NAME, order, &skip, link_iterate_old_cb, iter_info) < 0) TEST_ERROR; @@ -20035,7 +20035,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? (unsigned)gskip : ((max_links - 1) - (unsigned)gskip); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if (H5Giterate(group_id, ".", &gskip, group_iterate_old_cb, iter_info) < 0) TEST_ERROR; @@ -20071,7 +20071,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if ((ret = H5Literate2(group_id, H5_INDEX_NAME, order, &skip, link_iterate_old_cb, iter_info)) < 0) TEST_ERROR; if (ret != CORDER_ITER_STOP) @@ -20086,7 +20086,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_links - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); if ((ret = H5Giterate(group_id, ".", &gskip, group_iterate_old_cb, iter_info)) < 0) TEST_ERROR; if (ret != CORDER_ITER_STOP) @@ -20334,7 +20334,7 @@ open_by_idx_check(hid_t main_group_id, hid_t soft_group_id, hid_t mount_file_id, /* Get the address of the root group in the file to mount */ if (H5Oget_info3(mount_file_id, &oi, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&mnt_root_token, &oi.token, sizeof(mnt_root_token)); + memcpy(&mnt_root_token, &oi.token, sizeof(mnt_root_token)); /* Mount a file over a group in main group */ mnt_idx = 2; diff --git a/test/mdset.c b/test/mdset.c index b6a7fe0..6e736df 100644 --- a/test/mdset.c +++ b/test/mdset.c @@ -372,8 +372,8 @@ test_mdset(size_t niter, unsigned flags, hid_t fapl_id) } /* end for */ /* Initialize read buffer and expected read buffer */ - (void)HDmemset(rbuf, 0, buf_size); - (void)HDmemset(erbuf, 0, buf_size); + (void)memset(rbuf, 0, buf_size); + (void)memset(erbuf, 0, buf_size); /* Initialize write buffer */ for (j = 0; j < max_dsets; j++) @@ -382,7 +382,7 @@ test_mdset(size_t niter, unsigned flags, hid_t fapl_id) wbufi[j][k][l] = (unsigned)((j * MAX_DSET_X * MAX_DSET_Y) + (k * MAX_DSET_Y) + l); /* Initialize expected file buffer */ - (void)HDmemset(efbuf, 0, buf_size); + (void)memset(efbuf, 0, buf_size); /* Perform read/write operations */ for (j = 0; j < OPS_PER_FILE; j++) { @@ -1104,7 +1104,7 @@ test_mf_fs_start(hid_t fapl) if (f->shared->fs_man[H5FD_MEM_SUPER]->client != H5FS_CLIENT_FILE_ID) TEST_ERROR; - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); if (check_stats(f, f->shared->fs_man[H5FD_MEM_SUPER], &state)) TEST_ERROR; @@ -1225,7 +1225,7 @@ test_mf_fs_alloc_free(hid_t fapl) if (H5MF__add_sect(f, H5FD_MEM_SUPER, f->shared->fs_man[H5FD_MEM_SUPER], sect_node)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); state.tot_space += TBLOCK_SIZE30; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -1303,7 +1303,7 @@ test_mf_fs_alloc_free(hid_t fapl) if (H5MF__add_sect(f, H5FD_MEM_SUPER, f->shared->fs_man[H5FD_MEM_SUPER], sect_node)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); state.tot_space += TBLOCK_SIZE30; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -1379,7 +1379,7 @@ test_mf_fs_alloc_free(hid_t fapl) if (H5MF__add_sect(f, H5FD_MEM_SUPER, f->shared->fs_man[H5FD_MEM_SUPER], sect_node)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); state.tot_space += TBLOCK_SIZE30; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -1411,7 +1411,7 @@ test_mf_fs_alloc_free(hid_t fapl) if (tmp != TBLOCK_ADDR70) TEST_ERROR; - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); if (check_stats(f, f->shared->fs_man[H5FD_MEM_SUPER], &state)) TEST_ERROR; @@ -1555,7 +1555,7 @@ test_mf_fs_extend(hid_t fapl) if (H5MF__add_sect(f, H5FD_MEM_SUPER, f->shared->fs_man[H5FD_MEM_SUPER], sect_node1)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); state.tot_space += TBLOCK_SIZE30; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -1665,7 +1665,7 @@ test_mf_fs_extend(hid_t fapl) if (H5MF__add_sect(f, H5FD_MEM_SUPER, f->shared->fs_man[H5FD_MEM_SUPER], sect_node1)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); state.tot_space += TBLOCK_SIZE30; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -1770,7 +1770,7 @@ test_mf_fs_extend(hid_t fapl) if (H5MF__add_sect(f, H5FD_MEM_SUPER, f->shared->fs_man[H5FD_MEM_SUPER], sect_node1)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); state.tot_space += TBLOCK_SIZE30; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -1876,7 +1876,7 @@ test_mf_fs_extend(hid_t fapl) if (H5MF__add_sect(f, H5FD_MEM_SUPER, f->shared->fs_man[H5FD_MEM_SUPER], sect_node1)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); state.tot_space += (TBLOCK_SIZE30 - 10); state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -3028,7 +3028,7 @@ test_mf_aggr_alloc6(const char *env_h5_drvr, hid_t fapl) TEST_ERROR; /* Verify that meta_aggr's unused space of 1968 is freed to free-space */ - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); state.tot_space += (TBLOCK_SIZE2048 - (TBLOCK_SIZE30 + TBLOCK_SIZE50)); state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -3218,7 +3218,7 @@ test_mf_aggr_alloc7(const char *env_h5_drvr, hid_t fapl) TEST_ERROR; /* Verify that meta_aggr's unused space of 1968 is freed to free-space */ - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); state.tot_space += (TBLOCK_SIZE2048 - (TBLOCK_SIZE30 + TBLOCK_SIZE50)); state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -3913,7 +3913,7 @@ test_mf_align_eoa(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) if (ma_addr || ma_size) TEST_ERROR; - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); if (mis_align) { state.tot_space += mis_align; state.tot_sect_count += 1; @@ -4186,7 +4186,7 @@ test_mf_align_fs(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) if (H5MF__add_sect(f, H5FD_MEM_SUPER, f->shared->fs_man[H5FD_MEM_SUPER], sect_node)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); state.tot_space += TBLOCK_SIZE50; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -4250,7 +4250,7 @@ test_mf_align_fs(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) if (H5MF__add_sect(f, H5FD_MEM_SUPER, f->shared->fs_man[H5FD_MEM_SUPER], sect_node)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); state.tot_space += TBLOCK_SIZE8000; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -4337,7 +4337,7 @@ test_mf_align_fs(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) if (H5MF__add_sect(f, H5FD_MEM_SUPER, f->shared->fs_man[H5FD_MEM_SUPER], sect_node)) FAIL_STACK_ERROR; - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); state.tot_space += TBLOCK_SIZE700; state.tot_sect_count += 1; state.serial_sect_count += 1; @@ -4557,7 +4557,7 @@ test_mf_align_alloc1(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) TEST_ERROR; /* fragment for alignment of block 30 is freed to free-space */ - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); if (mis_align) { state.tot_space += mis_align; state.tot_sect_count += 1; @@ -4820,7 +4820,7 @@ test_mf_align_alloc2(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) TEST_ERROR; /* fragment for alignment of block 30 is freed to free-space */ - HDmemset(&state, 0, sizeof(H5FS_stat_t) * H5FD_MEM_NTYPES); + memset(&state, 0, sizeof(H5FS_stat_t) * H5FD_MEM_NTYPES); if (mis_align) { state[type].tot_space += mis_align; state[type].tot_sect_count += 1; @@ -5166,7 +5166,7 @@ test_mf_align_alloc3(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) TEST_ERROR; /* fragment for alignment of block 30 is freed to free-space */ - HDmemset(&state, 0, sizeof(H5FS_stat_t) * H5FD_MEM_NTYPES); + memset(&state, 0, sizeof(H5FS_stat_t) * H5FD_MEM_NTYPES); if (mis_align) { state[type].tot_space += mis_align; state[type].tot_sect_count += 1; @@ -5480,7 +5480,7 @@ test_mf_align_alloc4(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) TEST_ERROR; /* fragment for alignment of block 30 is freed to free-space */ - HDmemset(&state, 0, sizeof(H5FS_stat_t)); + memset(&state, 0, sizeof(H5FS_stat_t)); if (mis_align) { state.tot_space += mis_align; state.tot_sect_count += 1; @@ -5704,7 +5704,7 @@ test_mf_align_alloc5(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) TEST_ERROR; /* fragment for alignment of block 30 is freed to free-space */ - HDmemset(&state, 0, sizeof(H5FS_stat_t) * H5FD_MEM_NTYPES); + memset(&state, 0, sizeof(H5FS_stat_t) * H5FD_MEM_NTYPES); if (mis_align) { state[type].tot_space += mis_align; state[type].tot_sect_count += 1; @@ -5970,7 +5970,7 @@ test_mf_align_alloc6(const char *env_h5_drvr, hid_t fapl, hid_t new_fapl) TEST_ERROR; /* fragment for alignment of block 30 in meta_aggr is freed to free-space */ - HDmemset(&state, 0, sizeof(H5FS_stat_t) * H5FD_MEM_NTYPES); + memset(&state, 0, sizeof(H5FS_stat_t) * H5FD_MEM_NTYPES); if (mis_align) { state[type].tot_space += mis_align; state[type].tot_sect_count += 1; @@ -6182,7 +6182,7 @@ test_mf_bug1(const char *env_h5_drvr, hid_t fapl) H5FD_mem_t mt; /* Get current multi settings */ - HDmemset(memb_name, 0, sizeof memb_name); + memset(memb_name, 0, sizeof memb_name); if (H5Pget_fapl_multi(copied_fapl, memb_map, memb_fapl_arr, memb_name, memb_addr, &relax) < 0) TEST_ERROR; @@ -6570,11 +6570,11 @@ error: #define MULTI_SETUP(memb_map, memb_fapl, memb_name, memb_addr, sv) \ { \ H5FD_mem_t mt; \ - 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); \ - HDmemset(sv, 0, sizeof sv); \ + 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); \ + memset(sv, 0, sizeof sv); \ for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt++) { \ memb_map[mt] = H5FD_MEM_SUPER; \ memb_fapl[mt] = H5P_DEFAULT; \ @@ -7492,7 +7492,7 @@ test_mf_strat_thres_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format /* Set the filename to use for this test (dependent on fapl) */ h5_fixname(FILENAME[0], fapl, filename, sizeof(filename)); - HDmemset(&fs_state_zero, 0, sizeof(H5FS_stat_t)); + memset(&fs_state_zero, 0, sizeof(H5FS_stat_t)); /* Copy the file access property list */ if ((fapl2 = H5Pcopy(fapl)) < 0) @@ -7512,7 +7512,7 @@ test_mf_strat_thres_gone(const char *env_h5_drvr, hid_t fapl, hbool_t new_format continue; /* Clear out free-space statistics */ - HDmemset(&fs_state, 0, sizeof(H5FS_stat_t)); + memset(&fs_state, 0, sizeof(H5FS_stat_t)); /* Create file-creation template */ if ((fcpl = H5Pcreate(H5P_FILE_CREATE)) < 0) @@ -7757,7 +7757,7 @@ set_multi_split(hid_t fapl, hsize_t pagesize, hbool_t is_multi_or_split) assert(is_multi_or_split); - HDmemset(memb_name, 0, sizeof memb_name); + memset(memb_name, 0, sizeof memb_name); /* Get current split settings */ if (H5Pget_fapl_multi(fapl, memb_map, memb_fapl_arr, memb_name, memb_addr, &relax) < 0) @@ -8882,7 +8882,7 @@ test_page_alignment(const char *env_h5_drvr, hid_t fapl) if (H5Pset_alignment(memb_fapl, 0, (hsize_t)TEST_ALIGN16) < 0) TEST_ERROR; - HDmemset(memb_name, 0, sizeof memb_name); + memset(memb_name, 0, sizeof memb_name); if (split) { /* Set split driver with new FAPLs */ diff --git a/test/mirror_vfd.c b/test/mirror_vfd.c index e738364..e0068c0 100644 --- a/test/mirror_vfd.c +++ b/test/mirror_vfd.c @@ -303,13 +303,13 @@ test_encdec_uint8_t(void) TESTING("Mirror encode/decode of uint8_t data"); /* Start of buffer uint8_t */ - HDmemset(buf, 0, 8); - HDmemset(expected, 0, 8); + memset(buf, 0, 8); + memset(expected, 0, 8); expected[0] = 200; out = 0; if (H5FD__mirror_xmit_encode_uint8(buf, v) != 1) TEST_ERROR; - if (HDmemcmp(buf, expected, 8) != 0) { + if (memcmp(buf, expected, 8) != 0) { PRINT_BUFFER_DIFF(buf, expected, 8); TEST_ERROR; } @@ -319,13 +319,13 @@ test_encdec_uint8_t(void) TEST_ERROR; /* Middle of buffer uint8_t */ - HDmemset(buf, 0, 8); - HDmemset(expected, 0, 8); + memset(buf, 0, 8); + memset(expected, 0, 8); expected[3] = v; out = 0; if (H5FD__mirror_xmit_encode_uint8((buf + 3), v) != 1) TEST_ERROR; - if (HDmemcmp(buf, expected, 8) != 0) { + if (memcmp(buf, expected, 8) != 0) { PRINT_BUFFER_DIFF(buf, expected, 8); TEST_ERROR; } @@ -335,13 +335,13 @@ test_encdec_uint8_t(void) TEST_ERROR; /* End of buffer uint8_t */ - HDmemset(buf, 0, 8); - HDmemset(expected, 0, 8); + memset(buf, 0, 8); + memset(expected, 0, 8); expected[7] = v; out = 0; if (H5FD__mirror_xmit_encode_uint8((buf + 7), v) != 1) TEST_ERROR; - if (HDmemcmp(buf, expected, 8) != 0) { + if (memcmp(buf, expected, 8) != 0) { PRINT_BUFFER_DIFF(buf, expected, 8); TEST_ERROR; } @@ -369,14 +369,14 @@ test_encdec_uint16_t(void) TESTING("Mirror encode/decode of uint16_t data"); /* Start of buffer uint16_t */ - HDmemset(buf, 0, 8); - HDmemset(expected, 0, 8); + memset(buf, 0, 8); + memset(expected, 0, 8); expected[0] = 0x8F; expected[1] = 0x02; out = 0; if (H5FD__mirror_xmit_encode_uint16(buf, v) != 2) TEST_ERROR; - if (HDmemcmp(buf, expected, 8) != 0) { + if (memcmp(buf, expected, 8) != 0) { PRINT_BUFFER_DIFF(buf, expected, 8); TEST_ERROR; } @@ -386,14 +386,14 @@ test_encdec_uint16_t(void) TEST_ERROR; /* Middle of buffer uint16_t */ - HDmemset(buf, 0, 8); - HDmemset(expected, 0, 8); + memset(buf, 0, 8); + memset(expected, 0, 8); expected[3] = 0x8F; expected[4] = 0x02; out = 0; if (H5FD__mirror_xmit_encode_uint16((buf + 3), v) != 2) TEST_ERROR; - if (HDmemcmp(buf, expected, 8) != 0) { + if (memcmp(buf, expected, 8) != 0) { PRINT_BUFFER_DIFF(buf, expected, 8); TEST_ERROR; } @@ -409,14 +409,14 @@ test_encdec_uint16_t(void) TEST_ERROR; /* End of buffer uint16_t */ - HDmemset(buf, 0, 8); - HDmemset(expected, 0, 8); + memset(buf, 0, 8); + memset(expected, 0, 8); expected[6] = 0x8F; expected[7] = 0x02; out = 0; if (H5FD__mirror_xmit_encode_uint16((buf + 6), v) != 2) TEST_ERROR; - if (HDmemcmp(buf, expected, 8) != 0) { + if (memcmp(buf, expected, 8) != 0) { PRINT_BUFFER_DIFF(buf, expected, 8); TEST_ERROR; } @@ -444,8 +444,8 @@ test_encdec_uint32_t(void) TESTING("Mirror encode/decode of uint32_t data"); /* Start of buffer uint32_t */ - HDmemset(buf, 0, 8); - HDmemset(expected, 0, 8); + memset(buf, 0, 8); + memset(expected, 0, 8); expected[0] = 0x8F; expected[1] = 0x02; expected[2] = 0x00; @@ -453,7 +453,7 @@ test_encdec_uint32_t(void) out = 0; if (H5FD__mirror_xmit_encode_uint32(buf, v) != 4) TEST_ERROR; - if (HDmemcmp(buf, expected, 8) != 0) { + if (memcmp(buf, expected, 8) != 0) { PRINT_BUFFER_DIFF(buf, expected, 8); TEST_ERROR; } @@ -463,8 +463,8 @@ test_encdec_uint32_t(void) TEST_ERROR; /* Middle of buffer uint32_t */ - HDmemset(buf, 0, 8); - HDmemset(expected, 0, 8); + memset(buf, 0, 8); + memset(expected, 0, 8); expected[3] = 0x8F; expected[4] = 0x02; expected[5] = 0x00; @@ -472,7 +472,7 @@ test_encdec_uint32_t(void) out = 0; if (H5FD__mirror_xmit_encode_uint32((buf + 3), v) != 4) TEST_ERROR; - if (HDmemcmp(buf, expected, 8) != 0) { + if (memcmp(buf, expected, 8) != 0) { PRINT_BUFFER_DIFF(buf, expected, 8); TEST_ERROR; } @@ -487,8 +487,8 @@ test_encdec_uint32_t(void) TEST_ERROR; /* End of buffer uint32_t */ - HDmemset(buf, 0, 8); - HDmemset(expected, 0, 8); + memset(buf, 0, 8); + memset(expected, 0, 8); expected[4] = 0x8F; expected[5] = 0x02; expected[6] = 0x00; @@ -496,7 +496,7 @@ test_encdec_uint32_t(void) out = 0; if (H5FD__mirror_xmit_encode_uint32((buf + 4), v) != 4) TEST_ERROR; - if (HDmemcmp(buf, expected, 8) != 0) { + if (memcmp(buf, expected, 8) != 0) { PRINT_BUFFER_DIFF(buf, expected, 8); TEST_ERROR; } @@ -524,8 +524,8 @@ test_encdec_uint64_t(void) TESTING("Mirror encode/decode of uint64_t data"); /* Start of buffer uint64_t */ - HDmemset(buf, 0, 16); - HDmemset(expected, 0, 16); + memset(buf, 0, 16); + memset(expected, 0, 16); expected[0] = 0x90; expected[1] = 0xDC; expected[2] = 0xBE; @@ -537,7 +537,7 @@ test_encdec_uint64_t(void) out = 0; if (H5FD__mirror_xmit_encode_uint64(buf, v) != 8) TEST_ERROR; - if (HDmemcmp(buf, expected, 16) != 0) { + if (memcmp(buf, expected, 16) != 0) { PRINT_BUFFER_DIFF(buf, expected, 16); TEST_ERROR; } @@ -547,8 +547,8 @@ test_encdec_uint64_t(void) TEST_ERROR; /* Middle of buffer uint64_t */ - HDmemset(buf, 0, 16); - HDmemset(expected, 0, 16); + memset(buf, 0, 16); + memset(expected, 0, 16); expected[3] = 0x90; expected[4] = 0xDC; expected[5] = 0xBE; @@ -560,7 +560,7 @@ test_encdec_uint64_t(void) out = 0; if (H5FD__mirror_xmit_encode_uint64((buf + 3), v) != 8) TEST_ERROR; - if (HDmemcmp(buf, expected, 16) != 0) { + if (memcmp(buf, expected, 16) != 0) { PRINT_BUFFER_DIFF(buf, expected, 16); TEST_ERROR; } @@ -575,8 +575,8 @@ test_encdec_uint64_t(void) TEST_ERROR; /* End of buffer uint64_t */ - HDmemset(buf, 0, 16); - HDmemset(expected, 0, 16); + memset(buf, 0, 16); + memset(expected, 0, 16); expected[8] = 0x90; expected[9] = 0xDC; expected[10] = 0xBE; @@ -588,7 +588,7 @@ test_encdec_uint64_t(void) out = 0; if (H5FD__mirror_xmit_encode_uint64((buf + 8), v) != 8) TEST_ERROR; - if (HDmemcmp(buf, expected, 16) != 0) { + if (memcmp(buf, expected, 16) != 0) { PRINT_BUFFER_DIFF(buf, expected, 16); TEST_ERROR; } @@ -628,7 +628,7 @@ test_encdec_header(H5FD_mirror_xmit_t xmit_mock) FAIL_PUTS_ERROR("Header size definition does not match test\n"); /* Populate the expected buffer; expect end padding of 0xFF */ - HDmemset(expected, 0xFF, H5FD_MIRROR_XMIT_HEADER_SIZE + 8); + memset(expected, 0xFF, H5FD_MIRROR_XMIT_HEADER_SIZE + 8); for (i = 0; i < H5FD_MIRROR_XMIT_HEADER_SIZE; i++) { expected[i + 2] = (unsigned char)i; } @@ -636,10 +636,10 @@ test_encdec_header(H5FD_mirror_xmit_t xmit_mock) /* Encode, and compare buffer contents * Initial buffer is filled with 0xFF to match expected padding */ - HDmemset(buf, 0xFF, H5FD_MIRROR_XMIT_HEADER_SIZE + 8); + memset(buf, 0xFF, H5FD_MIRROR_XMIT_HEADER_SIZE + 8); if (H5FD_mirror_xmit_encode_header((buf + 2), &xmit_mock) != H5FD_MIRROR_XMIT_HEADER_SIZE) TEST_ERROR; - if (HDmemcmp(buf, expected, H5FD_MIRROR_XMIT_HEADER_SIZE + 8) != 0) { + if (memcmp(buf, expected, H5FD_MIRROR_XMIT_HEADER_SIZE + 8) != 0) { PRINT_BUFFER_DIFF(buf, expected, H5FD_MIRROR_XMIT_HEADER_SIZE + 8); TEST_ERROR; } @@ -704,7 +704,7 @@ test_encdec_set_eoa(H5FD_mirror_xmit_t xmit_mock) FAIL_PUTS_ERROR("shared header structure is not in expected state"); /* Populate the expected buffer; expect end padding of 0xFF */ - HDmemset(expected, 0xFF, H5FD_MIRROR_XMIT_EOA_SIZE + 8); + memset(expected, 0xFF, H5FD_MIRROR_XMIT_EOA_SIZE + 8); for (i = 0; i < H5FD_MIRROR_XMIT_EOA_SIZE; i++) expected[i + 2] = (unsigned char)i; @@ -716,10 +716,10 @@ test_encdec_set_eoa(H5FD_mirror_xmit_t xmit_mock) /* Encode, and compare buffer contents * Initial buffer is filled with 0xFF to match expected padding */ - HDmemset(buf, 0xFF, H5FD_MIRROR_XMIT_EOA_SIZE + 8); + memset(buf, 0xFF, H5FD_MIRROR_XMIT_EOA_SIZE + 8); if (H5FD_mirror_xmit_encode_set_eoa((buf + 2), &xmit_in) != H5FD_MIRROR_XMIT_EOA_SIZE) TEST_ERROR; - if (HDmemcmp(buf, expected, H5FD_MIRROR_XMIT_EOA_SIZE + 8) != 0) { + if (memcmp(buf, expected, H5FD_MIRROR_XMIT_EOA_SIZE + 8) != 0) { PRINT_BUFFER_DIFF(buf, expected, H5FD_MIRROR_XMIT_EOA_SIZE + 8); TEST_ERROR; } @@ -792,7 +792,7 @@ test_encdec_lock(H5FD_mirror_xmit_t xmit_mock) FAIL_PUTS_ERROR("shared header structure is not in expected state"); /* Populate the expected buffer; expect end padding of 0xFF */ - HDmemset(expected, 0xFF, H5FD_MIRROR_XMIT_LOCK_SIZE + 8); + memset(expected, 0xFF, H5FD_MIRROR_XMIT_LOCK_SIZE + 8); for (i = 0; i < H5FD_MIRROR_XMIT_LOCK_SIZE; i++) expected[i + 2] = (unsigned char)i; @@ -803,10 +803,10 @@ test_encdec_lock(H5FD_mirror_xmit_t xmit_mock) /* Encode, and compare buffer contents * Initial buffer is filled with 0xFF to match expected padding */ - HDmemset(buf, 0xFF, H5FD_MIRROR_XMIT_LOCK_SIZE + 8); + memset(buf, 0xFF, H5FD_MIRROR_XMIT_LOCK_SIZE + 8); if (H5FD_mirror_xmit_encode_lock((buf + 2), &xmit_in) != H5FD_MIRROR_XMIT_LOCK_SIZE) TEST_ERROR; - if (HDmemcmp(buf, expected, H5FD_MIRROR_XMIT_LOCK_SIZE + 8) != 0) { + if (memcmp(buf, expected, H5FD_MIRROR_XMIT_LOCK_SIZE + 8) != 0) { PRINT_BUFFER_DIFF(buf, expected, H5FD_MIRROR_XMIT_LOCK_SIZE + 8); TEST_ERROR; } @@ -887,7 +887,7 @@ test_encdec_open(H5FD_mirror_xmit_t xmit_mock) FAIL_PUTS_ERROR("Unable to allocate memory for xmit_out"); /* Populate the expected buffer; expect end padding of 0xFF */ - HDmemset(expected, 0xFF, H5FD_MIRROR_XMIT_OPEN_SIZE + 8); + memset(expected, 0xFF, H5FD_MIRROR_XMIT_OPEN_SIZE + 8); for (size_t i = 0; i < H5FD_MIRROR_XMIT_OPEN_SIZE; i++) { /* 0x100 is "zero" in a byte, so encode will treat it as a NULL- * terminator in the filepath string. Expect all zeroes following. @@ -909,10 +909,10 @@ test_encdec_open(H5FD_mirror_xmit_t xmit_mock) /* Encode, and compare buffer contents * Initial buffer is filled with 0xFF to match expected padding */ - HDmemset(buf, 0xFF, H5FD_MIRROR_XMIT_OPEN_SIZE + 8); + memset(buf, 0xFF, H5FD_MIRROR_XMIT_OPEN_SIZE + 8); if (H5FD_mirror_xmit_encode_open((buf + 2), xmit_in) != H5FD_MIRROR_XMIT_OPEN_SIZE) TEST_ERROR; - if (HDmemcmp(buf, expected, H5FD_MIRROR_XMIT_OPEN_SIZE + 8) != 0) { + if (memcmp(buf, expected, H5FD_MIRROR_XMIT_OPEN_SIZE + 8) != 0) { PRINT_BUFFER_DIFF(buf, expected, H5FD_MIRROR_XMIT_OPEN_SIZE + 8); TEST_ERROR; } @@ -1013,7 +1013,7 @@ test_encdec_reply(H5FD_mirror_xmit_t xmit_mock) FAIL_PUTS_ERROR("shared header structure is not in expected state"); /* Populate the expected buffer; expect end padding of 0xFF */ - HDmemset(expected, 0xFF, H5FD_MIRROR_XMIT_REPLY_SIZE + 8); + memset(expected, 0xFF, H5FD_MIRROR_XMIT_REPLY_SIZE + 8); for (i = 0; i < H5FD_MIRROR_XMIT_REPLY_SIZE; i++) { /* 0x100 is "zero" in a byte, so encode will treat it as a NULL- * terminator in the filepath string. Expect all zeroes following. @@ -1033,10 +1033,10 @@ test_encdec_reply(H5FD_mirror_xmit_t xmit_mock) /* Encode, and compare buffer contents * Initial buffer is filled with 0xFF to match expected padding */ - HDmemset(buf, 0xFF, H5FD_MIRROR_XMIT_REPLY_SIZE + 8); + memset(buf, 0xFF, H5FD_MIRROR_XMIT_REPLY_SIZE + 8); if (H5FD_mirror_xmit_encode_reply((buf + 2), &xmit_in) != H5FD_MIRROR_XMIT_REPLY_SIZE) TEST_ERROR; - if (HDmemcmp(buf, expected, H5FD_MIRROR_XMIT_REPLY_SIZE + 8) != 0) { + if (memcmp(buf, expected, H5FD_MIRROR_XMIT_REPLY_SIZE + 8) != 0) { PRINT_BUFFER_DIFF(buf, expected, H5FD_MIRROR_XMIT_REPLY_SIZE + 8); TEST_ERROR; } @@ -1116,7 +1116,7 @@ test_encdec_write(H5FD_mirror_xmit_t xmit_mock) FAIL_PUTS_ERROR("shared header structure is not in expected state"); /* Populate the expected buffer; expect end padding of 0xFF */ - HDmemset(expected, 0xFF, H5FD_MIRROR_XMIT_WRITE_SIZE + 8); + memset(expected, 0xFF, H5FD_MIRROR_XMIT_WRITE_SIZE + 8); for (i = 0; i < H5FD_MIRROR_XMIT_WRITE_SIZE; i++) expected[i + 2] = (unsigned char)i; @@ -1129,10 +1129,10 @@ test_encdec_write(H5FD_mirror_xmit_t xmit_mock) /* Encode, and compare buffer contents * Initial buffer is filled with 0xFF to match expected padding */ - HDmemset(buf, 0xFF, H5FD_MIRROR_XMIT_WRITE_SIZE + 8); + memset(buf, 0xFF, H5FD_MIRROR_XMIT_WRITE_SIZE + 8); if (H5FD_mirror_xmit_encode_write((buf + 2), &xmit_in) != H5FD_MIRROR_XMIT_WRITE_SIZE) TEST_ERROR; - if (HDmemcmp(buf, expected, H5FD_MIRROR_XMIT_WRITE_SIZE + 8) != 0) { + if (memcmp(buf, expected, H5FD_MIRROR_XMIT_WRITE_SIZE + 8) != 0) { PRINT_BUFFER_DIFF(buf, expected, H5FD_MIRROR_XMIT_WRITE_SIZE + 8); TEST_ERROR; } @@ -2341,7 +2341,7 @@ confirm_server(struct mt_opts *opts) target_addr.sin_family = AF_INET; target_addr.sin_port = htons((uint16_t)opts->portno); target_addr.sin_addr.s_addr = inet_addr(opts->ip); - HDmemset(target_addr.sin_zero, '\0', sizeof(target_addr.sin_zero)); + memset(target_addr.sin_zero, '\0', sizeof(target_addr.sin_zero)); while (1) { if (connect(live_socket, (struct sockaddr *)&target_addr, (socklen_t)sizeof(target_addr)) < 0) { diff --git a/test/ntypes.c b/test/ntypes.c index 0812c61..99ac151 100644 --- a/test/ntypes.c +++ b/test/ntypes.c @@ -133,7 +133,7 @@ test_atomic_dtype(hid_t file) TEST_ERROR; /* Copy data from temporary buffer to destination buffer */ - HDmemcpy(icheck2, tmp, (size_t)(DIM0 * DIM1 * H5Tget_size(native_type))); + memcpy(icheck2, tmp, (size_t)(DIM0 * DIM1 * H5Tget_size(native_type))); free(tmp); tmp = NULL; @@ -537,7 +537,7 @@ test_compound_dtype2(hid_t file) if (H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0) TEST_ERROR; - HDmemcpy(check, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); + memcpy(check, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); free(tmp); tmp = NULL; @@ -755,7 +755,7 @@ test_compound_dtype(hid_t file) if (H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0) TEST_ERROR; - HDmemcpy(check, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); + memcpy(check, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); free(tmp); tmp = NULL; @@ -982,7 +982,7 @@ test_compound_dtype3(hid_t file) if (H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0) TEST_ERROR; - HDmemcpy(check, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); + memcpy(check, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); free(tmp); tmp = NULL; @@ -1207,7 +1207,7 @@ test_compound_opaque(hid_t file) if (H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0) TEST_ERROR; - HDmemcpy(check, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); + memcpy(check, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); free(tmp); tmp = NULL; @@ -1382,7 +1382,7 @@ test_enum_dtype(hid_t file) if (H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0) TEST_ERROR; - HDmemcpy(scheck2, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); + memcpy(scheck2, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); if (H5Tconvert(native_type, tid_m, (DIM0 * DIM1), scheck2, NULL, H5P_DEFAULT) < 0) TEST_ERROR; @@ -1550,7 +1550,7 @@ test_array_dtype(hid_t file) if (H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0) TEST_ERROR; - HDmemcpy(check, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); + memcpy(check, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); free(tmp); tmp = NULL; @@ -1704,7 +1704,7 @@ test_array_dtype2(hid_t file) if (H5Dread(dataset, native_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, tmp) < 0) TEST_ERROR; - HDmemcpy(icheck3, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); + memcpy(icheck3, tmp, DIM0 * DIM1 * H5Tget_size(native_type)); free(tmp); tmp = NULL; @@ -1886,7 +1886,7 @@ test_vl_dtype(hid_t file) * platforms like Cray */ if (NULL == (tmp = (void **)malloc(t2->len * sizeof(unsigned int)))) TEST_ERROR; - HDmemcpy(tmp, t2->p, t2->len * H5Tget_size(nat_super_type)); + memcpy(tmp, t2->p, t2->len * H5Tget_size(nat_super_type)); if (H5Tconvert(nat_super_type, H5T_NATIVE_UINT, t2->len, tmp, NULL, H5P_DEFAULT) < 0) TEST_ERROR; @@ -2940,7 +2940,7 @@ test_ninteger(void) /* get rank */ if ((rank = H5Sget_simple_extent_ndims(sid1)) < 0) FAIL_STACK_ERROR; - HDmemset(dims, 0, sizeof dims); + memset(dims, 0, sizeof dims); /* get dimension */ if (H5Sget_simple_extent_dims(sid1, dims, NULL) < 0) diff --git a/test/objcopy.c b/test/objcopy.c index 792a782..ab40284 100644 --- a/test/objcopy.c +++ b/test/objcopy.c @@ -1063,7 +1063,7 @@ compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts, /* Iterate over all elements, calling memcmp() for each */ for (elmt = 0; elmt < nelmts; elmt++) { - if (HDmemcmp(memb1, memb2, memb_size) != 0) + if (memcmp(memb1, memb2, memb_size) != 0) TEST_ERROR; /* Update member pointers */ @@ -1285,7 +1285,7 @@ compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts, else TEST_ERROR; } /* end else */ - else if (HDmemcmp(buf1, buf2, (elmt_size * nelmts)) != 0) + else if (memcmp(buf1, buf2, (elmt_size * nelmts)) != 0) TEST_ERROR; /* Data should be the same. :-) */ @@ -1670,7 +1670,7 @@ compare_groups(hid_t gid, hid_t gid2, hid_t pid, int depth, unsigned copy_flags) TEST_ERROR; /* Compare link data */ - if (HDmemcmp(linkval, linkval2, linfo.u.val_size) != 0) + if (memcmp(linkval, linkval2, linfo.u.val_size) != 0) TEST_ERROR; } /* end else-if */ else { @@ -2867,7 +2867,7 @@ test_copy_dataset_compound(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t TESTING("H5Ocopy(): compound dataset"); - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); for (i = 0; i < DIM_SIZE_1; i++) { buf[i].a = i; buf[i].d = 1.0 / (double)(i + 1); @@ -6918,7 +6918,7 @@ compare_attribute_compound_vlstr(hid_t loc, hid_t loc2) FAIL_STACK_ERROR; if (HDstrlen(rbuf.v) != HDstrlen(rbuf2.v)) FAIL_STACK_ERROR; - if (HDmemcmp(rbuf.v, rbuf2.v, HDstrlen(rbuf.v)) != 0) + if (memcmp(rbuf.v, rbuf2.v, HDstrlen(rbuf.v)) != 0) FAIL_STACK_ERROR; /* Reclaim vlen buffer */ @@ -11436,7 +11436,7 @@ test_copy_null_ref(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fap TESTING("H5Ocopy(): NULL references"); /* Initialize "zeros" array */ - HDmemset(zeros, 0, sizeof(zeros)); + memset(zeros, 0, sizeof(zeros)); /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); @@ -11512,9 +11512,9 @@ test_copy_null_ref(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fap TEST_ERROR; /* Verify that the references contain only "0" bytes */ - if (HDmemcmp(obj_buf, zeros, sizeof(obj_buf)) != 0) + if (memcmp(obj_buf, zeros, sizeof(obj_buf)) != 0) TEST_ERROR; - if (HDmemcmp(reg_buf, zeros, sizeof(reg_buf)) != 0) + if (memcmp(reg_buf, zeros, sizeof(reg_buf)) != 0) TEST_ERROR; /* Close datasets */ @@ -11557,9 +11557,9 @@ test_copy_null_ref(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t dst_fap TEST_ERROR; /* Verify that the references contain only "0" bytes */ - if (HDmemcmp(obj_buf, zeros, sizeof(obj_buf)) != 0) + if (memcmp(obj_buf, zeros, sizeof(obj_buf)) != 0) TEST_ERROR; - if (HDmemcmp(reg_buf, zeros, sizeof(reg_buf)) != 0) + if (memcmp(reg_buf, zeros, sizeof(reg_buf)) != 0) TEST_ERROR; /* Close */ @@ -11631,7 +11631,7 @@ test_copy_null_ref_open(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t ds TESTING("H5Ocopy(): NULL references for opened datasets"); /* Initialize "zeros" array */ - HDmemset(zeros, 0, sizeof(zeros)); + memset(zeros, 0, sizeof(zeros)); /* Initialize the filenames */ h5_fixname(FILENAME[0], src_fapl, src_filename, sizeof src_filename); @@ -11716,9 +11716,9 @@ test_copy_null_ref_open(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t ds TEST_ERROR; /* Verify that the references contain only "0" bytes */ - if (HDmemcmp(obj_buf, zeros, sizeof(obj_buf)) != 0) + if (memcmp(obj_buf, zeros, sizeof(obj_buf)) != 0) TEST_ERROR; - if (HDmemcmp(reg_buf, zeros, sizeof(reg_buf)) != 0) + if (memcmp(reg_buf, zeros, sizeof(reg_buf)) != 0) TEST_ERROR; /* Create destination file */ @@ -11761,9 +11761,9 @@ test_copy_null_ref_open(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t ds TEST_ERROR; /* Verify that the references contain only "0" bytes */ - if (HDmemcmp(obj_buf, zeros, sizeof(obj_buf)) != 0) + if (memcmp(obj_buf, zeros, sizeof(obj_buf)) != 0) TEST_ERROR; - if (HDmemcmp(reg_buf, zeros, sizeof(reg_buf)) != 0) + if (memcmp(reg_buf, zeros, sizeof(reg_buf)) != 0) TEST_ERROR; /* Close */ @@ -12106,7 +12106,7 @@ test_copy_committed_datatype_merge(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -12194,7 +12194,7 @@ test_copy_committed_datatype_merge(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fap TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; if (H5Dclose(did) < 0) @@ -12419,7 +12419,7 @@ test_copy_committed_datatype_merge_same_file(hid_t fcpl, hid_t fapl, hbool_t reo TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -12477,7 +12477,7 @@ test_copy_committed_datatype_merge_same_file(hid_t fcpl, hid_t fapl, hbool_t reo TEST_ERROR; if (!token_cmp) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -12560,7 +12560,7 @@ test_copy_committed_datatype_merge_same_file(hid_t fcpl, hid_t fapl, hbool_t reo TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; if (H5Dclose(did) < 0) @@ -12594,7 +12594,7 @@ test_copy_committed_datatype_merge_same_file(hid_t fcpl, hid_t fapl, hbool_t reo TEST_ERROR; if (!token_cmp) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; if (H5Dclose(did) < 0) @@ -12806,7 +12806,7 @@ test_copy_committed_dt_merge_sugg(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -12861,7 +12861,7 @@ test_copy_committed_dt_merge_sugg(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -12886,7 +12886,7 @@ test_copy_committed_dt_merge_sugg(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -13109,7 +13109,7 @@ test_copy_committed_dt_merge_attr(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; if (H5Aclose(aid) < 0) @@ -13423,7 +13423,7 @@ test_copy_cdt_hier_merge(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t d TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token_int, &oinfo.token, sizeof(exp_token_int)); + memcpy(&exp_token_int, &oinfo.token, sizeof(exp_token_int)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -13432,7 +13432,7 @@ test_copy_cdt_hier_merge(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t d TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token_short, &oinfo.token, sizeof(exp_token_short)); + memcpy(&exp_token_short, &oinfo.token, sizeof(exp_token_short)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -13879,7 +13879,7 @@ test_copy_cdt_merge_cdt(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t ds TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -13900,7 +13900,7 @@ test_copy_cdt_merge_cdt(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t ds TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -13921,7 +13921,7 @@ test_copy_cdt_merge_cdt(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t ds TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -13942,7 +13942,7 @@ test_copy_cdt_merge_cdt(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t ds TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -14112,7 +14112,7 @@ test_copy_cdt_merge_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -14160,7 +14160,7 @@ test_copy_cdt_merge_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -14215,7 +14215,7 @@ test_copy_cdt_merge_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -14265,7 +14265,7 @@ test_copy_cdt_merge_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid_t TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -14456,7 +14456,7 @@ test_copy_cdt_merge_dset_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, h TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -14510,7 +14510,7 @@ test_copy_cdt_merge_dset_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, h TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; if (H5Dclose(did) < 0) @@ -14573,7 +14573,7 @@ test_copy_cdt_merge_dset_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, h TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; if (H5Dclose(did) < 0) @@ -14631,7 +14631,7 @@ test_copy_cdt_merge_dset_suggs(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, h TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; if (H5Dclose(did) < 0) @@ -15489,7 +15489,7 @@ test_copy_set_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -15556,7 +15556,7 @@ test_copy_set_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -15611,7 +15611,7 @@ test_copy_set_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -15636,7 +15636,7 @@ test_copy_set_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -15700,7 +15700,7 @@ test_copy_set_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; @@ -15725,7 +15725,7 @@ test_copy_set_mcdt_search_cb(hid_t fcpl_src, hid_t fcpl_dst, hid_t src_fapl, hid TEST_ERROR; if (H5Oget_info3(tid, &oinfo, H5O_INFO_BASIC) < 0) TEST_ERROR; - HDmemcpy(&exp_token, &oinfo.token, sizeof(exp_token)); + memcpy(&exp_token, &oinfo.token, sizeof(exp_token)); if (H5Tclose(tid) < 0) TEST_ERROR; diff --git a/test/objcopy_ref.c b/test/objcopy_ref.c index 8773a98..7a81aea 100644 --- a/test/objcopy_ref.c +++ b/test/objcopy_ref.c @@ -856,7 +856,7 @@ compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts, /* Iterate over all elements, calling memcmp() for each */ for (elmt = 0; elmt < nelmts; elmt++) { - if (HDmemcmp(memb1, memb2, memb_size) != 0) + if (memcmp(memb1, memb2, memb_size) != 0) TEST_ERROR; /* Update member pointers */ @@ -1006,7 +1006,7 @@ compare_data(hid_t parent1, hid_t parent2, hid_t pid, hid_t tid, size_t nelmts, else TEST_ERROR; } /* end else */ - else if (HDmemcmp(buf1, buf2, (elmt_size * nelmts)) != 0) + else if (memcmp(buf1, buf2, (elmt_size * nelmts)) != 0) TEST_ERROR; /* Data should be the same. :-) */ @@ -1391,7 +1391,7 @@ compare_groups(hid_t gid, hid_t gid2, hid_t pid, int depth, unsigned copy_flags) TEST_ERROR; /* Compare link data */ - if (HDmemcmp(linkval, linkval2, linfo.u.val_size) != 0) + if (memcmp(linkval, linkval2, linfo.u.val_size) != 0) TEST_ERROR; } /* end else-if */ else { diff --git a/test/ohdr.c b/test/ohdr.c index ca19eaa..95a4dc3 100644 --- a/test/ohdr.c +++ b/test/ohdr.c @@ -79,8 +79,8 @@ test_cont(char *filename, hid_t fapl) TESTING("object header continuation block"); - HDmemset(&oh_locA, 0, sizeof(oh_locA)); - HDmemset(&oh_locB, 0, sizeof(oh_locB)); + memset(&oh_locA, 0, sizeof(oh_locA)); + memset(&oh_locB, 0, sizeof(oh_locB)); /* Create the file to operate on */ if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) @@ -227,7 +227,7 @@ test_ohdr_cache(char *filename, hid_t fapl) FAIL_STACK_ERROR; /* Create an object header */ - HDmemset(&oh_loc, 0, sizeof(oh_loc)); + memset(&oh_loc, 0, sizeof(oh_loc)); if (H5O_create(f, (size_t)2048, (size_t)1, H5P_GROUP_CREATE_DEFAULT, &oh_loc /*out*/) < 0) FAIL_STACK_ERROR; @@ -979,7 +979,7 @@ test_minimized_dset_ohdr_attribute_addition(hid_t fapl_id) TEST_ERROR; /* modify the string attribute */ - HDmemset(in_buf, 0, buf_size); + memset(in_buf, 0, buf_size); HDstrcpy(in_buf, ATTR_LONG); if (H5Awrite(aid, H5T_NATIVE_CHAR, in_buf) < 0) TEST_ERROR; @@ -1899,7 +1899,7 @@ main(void) * (using default group creation property list only because it's convenient) */ TESTING("object header creation"); - HDmemset(&oh_loc, 0, sizeof(oh_loc)); + memset(&oh_loc, 0, sizeof(oh_loc)); if (H5O_create(f, (size_t)64, (size_t)0, H5P_GROUP_CREATE_DEFAULT, &oh_loc /*out*/) < 0) FAIL_STACK_ERROR; PASSED(); diff --git a/test/onion.c b/test/onion.c index 07dc2f7..50a4aa7 100644 --- a/test/onion.c +++ b/test/onion.c @@ -1335,7 +1335,7 @@ test_revision_record_encode_decode(void) TESTING("encode/decode revision record"); - HDmemcpy(record.time_of_creation, "19411207T190643Z", 16); + memcpy(record.time_of_creation, "19411207T190643Z", 16); record.archival_index.list = calloc(record.archival_index.n_entries, sizeof(H5FD_onion_index_entry_t)); if (NULL == record.archival_index.list) TEST_ERROR; @@ -1602,8 +1602,8 @@ verify_history_as_expected_onion(H5FD_t *raw_file, struct expected_history *filt uint32_t buf_checksum = 0; /* memset to avoid bad frees on errors */ - HDmemset(&rev_out, 0, sizeof(H5FD_onion_revision_record_t)); - HDmemset(&history_out, 0, sizeof(H5FD_onion_history_t)); + memset(&rev_out, 0, sizeof(H5FD_onion_revision_record_t)); + memset(&history_out, 0, sizeof(H5FD_onion_history_t)); hdr_out.version = H5FD_ONION_HEADER_VERSION_CURR; @@ -2036,7 +2036,7 @@ test_create_oniontarget(hbool_t truncate_canonical, hbool_t with_initial_data) TEST_ERROR; if (H5FDread(vfile_rw, H5FD_MEM_DRAW, H5P_DEFAULT, 0, 4, buf) < 0) TEST_ERROR; - if (HDmemcmp(a_list_s, buf, 4) != 0) + if (memcmp(a_list_s, buf, 4) != 0) TEST_ERROR; free(buf); buf = NULL; @@ -2056,7 +2056,7 @@ test_create_oniontarget(hbool_t truncate_canonical, hbool_t with_initial_data) TEST_ERROR; if (H5FDread(vfile_rw, H5FD_MEM_DRAW, H5P_DEFAULT, 0, buf_size, buf) < 0) TEST_ERROR; - if (HDmemcmp(a_list_s + half_size, buf, buf_size) != 0) + if (memcmp(a_list_s + half_size, buf, buf_size) != 0) TEST_ERROR; free(buf); buf = NULL; @@ -2072,7 +2072,7 @@ test_create_oniontarget(hbool_t truncate_canonical, hbool_t with_initial_data) TEST_ERROR; if (H5FDread(vfile_rw, H5FD_MEM_DRAW, H5P_DEFAULT, 0, a_list_size_s, buf) < 0) TEST_ERROR; - if (HDmemcmp(a_list_s, buf, a_list_size_s) != 0) + if (memcmp(a_list_s, buf, a_list_size_s) != 0) TEST_ERROR; free(buf); buf = NULL; @@ -2139,7 +2139,7 @@ test_create_oniontarget(hbool_t truncate_canonical, hbool_t with_initial_data) TEST_ERROR; if (H5FDread(vfile_ro, H5FD_MEM_DRAW, H5P_DEFAULT, 0, a_list_size_s, buf) < 0) TEST_ERROR; - if (HDmemcmp(a_list_s, buf, a_list_size_s) != 0) + if (memcmp(a_list_s, buf, a_list_size_s) != 0) TEST_ERROR; free(buf); buf = NULL; @@ -2366,7 +2366,7 @@ test_several_revisions_with_logical_gaps(void) if (0 != buf[i]) TEST_ERROR; } - if (HDmemcmp(buf + a_off, a_list_s, a_list_size_s) != 0) + if (memcmp(buf + a_off, a_list_s, a_list_size_s) != 0) TEST_ERROR; free(buf); buf = NULL; @@ -2380,7 +2380,7 @@ test_several_revisions_with_logical_gaps(void) if (0 != buf[i]) TEST_ERROR; } - if (HDmemcmp(buf + size, a_list_s, ONION_TEST_PAGE_SIZE_5 - size) != 0) + if (memcmp(buf + size, a_list_s, ONION_TEST_PAGE_SIZE_5 - size) != 0) TEST_ERROR; free(buf); buf = NULL; @@ -2414,13 +2414,13 @@ test_several_revisions_with_logical_gaps(void) if (0 != buf[i]) TEST_ERROR; } - if (HDmemcmp(buf + a_off, a_list_s, a_list_size_s) != 0) + if (memcmp(buf + a_off, a_list_s, a_list_size_s) != 0) TEST_ERROR; for (i = a_off + a_list_size_s; i < b_off; i++) { if (0 != buf[i]) TEST_ERROR; } - if (HDmemcmp(buf + b_off, b_list_s, b_list_size_s) != 0) + if (memcmp(buf + b_off, b_list_s, b_list_size_s) != 0) TEST_ERROR; free(buf); buf = NULL; @@ -2451,15 +2451,15 @@ test_several_revisions_with_logical_gaps(void) TEST_ERROR; if (H5FDread(file, H5FD_MEM_DRAW, H5P_DEFAULT, 0, size, buf) < 0) TEST_ERROR; - if (HDmemcmp(buf, a_list_s, a_list_size_s) != 0) + if (memcmp(buf, a_list_s, a_list_size_s) != 0) TEST_ERROR; - if (HDmemcmp(buf + a_list_size_s, a_list_s + a_list_size_s - a_off, a_off) != 0) + if (memcmp(buf + a_list_size_s, a_list_s + a_list_size_s - a_off, a_off) != 0) TEST_ERROR; for (i = a_off + a_list_size_s; i < b_off; i++) { if (0 != buf[i]) TEST_ERROR; } - if (HDmemcmp(buf + b_off, b_list_s, b_list_size_s) != 0) + if (memcmp(buf + b_off, b_list_s, b_list_size_s) != 0) TEST_ERROR; free(buf); buf = NULL; @@ -2587,7 +2587,7 @@ do_onion_open_and_writes(const char *filename, H5FD_onion_fapl_info_t *onion_inf onion_info_p->revision_num = about[i].revision_num; if (about[i].comment != NULL) { j = MIN(HDstrlen(about[i].comment), H5FD_ONION_FAPL_INFO_COMMENT_MAX_LEN); - HDmemcpy(onion_info_p->comment, about[i].comment, j); + memcpy(onion_info_p->comment, about[i].comment, j); } onion_info_p->comment[j] = '\0'; fapl_id = H5Pcreate(H5P_FILE_ACCESS); @@ -2613,7 +2613,7 @@ do_onion_open_and_writes(const char *filename, H5FD_onion_fapl_info_t *onion_inf TEST_ERROR; if (H5FDread(file, H5FD_MEM_DRAW, H5P_DEFAULT, wi->offset, wi->size, buf_vfy) < 0) TEST_ERROR; - if (HDmemcmp(buf_vfy, wi->buf, wi->size) != 0) { + if (memcmp(buf_vfy, wi->buf, wi->size) != 0) { const unsigned char *_buf = wi->buf; size_t z = 0; HDputs("i exp act"); @@ -2744,7 +2744,7 @@ test_page_aligned_history_create(void) TEST_ERROR; if (H5FDread(file, H5FD_MEM_DRAW, H5P_DEFAULT, 0, b_list_size_s, buf) < 0) TEST_ERROR; - if (HDmemcmp(a_list_s, buf + a_off, a_list_size_s) != 0) { + if (memcmp(a_list_s, buf + a_off, a_list_size_s) != 0) { size_t k; printf("aoff: %" PRIu64 "\n", a_off); HDputs("i exp act"); @@ -2754,7 +2754,7 @@ test_page_aligned_history_create(void) fflush(stdout); TEST_ERROR; } - if (HDmemcmp(b_list_s, buf, a_off) != 0) { + if (memcmp(b_list_s, buf, a_off) != 0) { size_t k; printf("aoff: %" PRIu64 "\n", a_off); HDputs("i exp act"); diff --git a/test/page_buffer.c b/test/page_buffer.c index 1fc8469..6eed35f 100644 --- a/test/page_buffer.c +++ b/test/page_buffer.c @@ -147,7 +147,7 @@ create_file(char *filename, hid_t fcpl, hid_t fapl) if (H5Dclose(dset_id) < 0) FAIL_STACK_ERROR; - HDmemset(data, 0, (size_t)num_elements * sizeof(int)); + memset(data, 0, (size_t)num_elements * sizeof(int)); if ((dset_id = H5Dopen2(grp_id, dset_name, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR; if (H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) @@ -318,7 +318,7 @@ set_multi_split(const char *env_h5_drvr, hid_t fapl, hsize_t pagesize) if (split || multi) { - HDmemset(memb_name, 0, sizeof memb_name); + memset(memb_name, 0, sizeof memb_name); /* Get current split settings */ if (H5Pget_fapl_multi(fapl, memb_map, memb_fapl_arr, memb_name, memb_addr, &relax) < 0) diff --git a/test/s3comms.c b/test/s3comms.c index 87b6c7b..07dcce9 100644 --- a/test/s3comms.c +++ b/test/s3comms.c @@ -2340,7 +2340,7 @@ test_trim(void) assert(str == NULL); str = (char *)malloc(sizeof(char *) * 11); assert(str != NULL); - HDmemcpy(str, "some text ", 11); /* string with null terminator */ + memcpy(str, "some text ", 11); /* string with null terminator */ JSVERIFY(FAIL, H5FD_s3comms_trim(NULL, str, 10, &dest_len), "destination for trim cannot be NULL"); free(str); str = NULL; diff --git a/test/select_io_dset.c b/test/select_io_dset.c index 361b1d5..2746bcc 100644 --- a/test/select_io_dset.c +++ b/test/select_io_dset.c @@ -176,7 +176,7 @@ test_no_type_conv(hid_t fid, unsigned chunked, unsigned dtrans, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(wbuf_bak, wbuf, sizeof(wbuf)); + memcpy(wbuf_bak, wbuf, sizeof(wbuf)); /* Write data to the dataset with/without data transform */ if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, wbuf) < 0) @@ -184,7 +184,7 @@ test_no_type_conv(hid_t fid, unsigned chunked, unsigned dtrans, unsigned mwbuf) /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(wbuf, wbuf_bak, sizeof(wbuf)); + memcpy(wbuf, wbuf_bak, sizeof(wbuf)); /* Read data from the dataset without data transform set in dxpl */ if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, ntrans_dxpl, rbuf) < 0) @@ -316,7 +316,7 @@ test_no_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(wbuf_bak, wbuf, (size_t)(4 * DSET_SELECT_DIM)); + memcpy(wbuf_bak, wbuf, (size_t)(4 * DSET_SELECT_DIM)); /* Write the data to the dataset with little endian */ if (H5Dwrite(did, H5T_STD_I32LE, H5S_ALL, H5S_ALL, dxpl, wbuf) < 0) @@ -324,7 +324,7 @@ test_no_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(wbuf, wbuf_bak, (size_t)(4 * DSET_SELECT_DIM)); + memcpy(wbuf, wbuf_bak, (size_t)(4 * DSET_SELECT_DIM)); /* Read the data from the dataset with little endian */ if (H5Dread(did, H5T_STD_I32LE, H5S_ALL, H5S_ALL, dxpl, rbuf) < 0) @@ -466,7 +466,7 @@ test_larger_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsign /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(wbuf_bak, wbuf, sizeof(wbuf)); + memcpy(wbuf_bak, wbuf, sizeof(wbuf)); /* Write data to the dataset with/without data transform set in dxpl */ if (H5Dwrite(did, H5T_NATIVE_LONG, H5S_ALL, H5S_ALL, dxpl, wbuf) < 0) @@ -474,7 +474,7 @@ test_larger_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsign /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(wbuf, wbuf_bak, sizeof(wbuf)); + memcpy(wbuf, wbuf_bak, sizeof(wbuf)); /* Read the data from the dataset without data transform in dxpl */ if (H5Dread(did, H5T_NATIVE_LLONG, H5S_ALL, H5S_ALL, ntrans_dxpl, rbuf) < 0) @@ -609,7 +609,7 @@ test_smaller_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsig /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(wbuf_bak, wbuf, sizeof(wbuf)); + memcpy(wbuf_bak, wbuf, sizeof(wbuf)); /* Write data to the dataset with/without data transform in dxpl */ if (H5Dwrite(did, H5T_NATIVE_SHORT, H5S_ALL, H5S_ALL, dxpl, wbuf) < 0) @@ -617,7 +617,7 @@ test_smaller_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsig /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(wbuf, wbuf_bak, sizeof(wbuf)); + memcpy(wbuf, wbuf_bak, sizeof(wbuf)); /* Read data from the dataset without data transform in dxpl */ if (H5Dread(did, H5T_NATIVE_SHORT, H5S_ALL, H5S_ALL, ntrans_dxpl, rbuf) < 0) @@ -791,7 +791,7 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(s1_wbuf_bak, s1_wbuf, sizeof(s1_t) * DSET_SELECT_DIM); + memcpy(s1_wbuf_bak, s1_wbuf, sizeof(s1_t) * DSET_SELECT_DIM); /* Write all the data to the dataset */ if (H5Dwrite(did, s1_tid, H5S_ALL, H5S_ALL, dxpl, s1_wbuf) < 0) @@ -799,7 +799,7 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(s1_wbuf, s1_wbuf_bak, sizeof(s1_t) * DSET_SELECT_DIM); + memcpy(s1_wbuf, s1_wbuf_bak, sizeof(s1_t) * DSET_SELECT_DIM); /* Read all the data from the dataset */ if (H5Dread(did, s1_tid, H5S_ALL, H5S_ALL, dxpl, s1_rbuf) < 0) @@ -837,7 +837,7 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(s1_wbuf_bak, s1_wbuf, sizeof(s1_t) * DSET_SELECT_DIM); + memcpy(s1_wbuf_bak, s1_wbuf, sizeof(s1_t) * DSET_SELECT_DIM); /* Write s1_wbuf to the dataset with only subset members in ss_tid */ if (H5Dwrite(did, ss_ac_tid, H5S_ALL, H5S_ALL, dxpl, s1_wbuf) < 0) @@ -845,7 +845,7 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(s1_wbuf, s1_wbuf_bak, sizeof(s1_t) * DSET_SELECT_DIM); + memcpy(s1_wbuf, s1_wbuf_bak, sizeof(s1_t) * DSET_SELECT_DIM); /* Read the whole compound back */ if (H5Dread(did, ss_ac_tid, H5S_ALL, H5S_ALL, dxpl, s1_rbuf) < 0) @@ -923,14 +923,14 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(s2_wbuf_bak, s2_wbuf, sizeof(s2_t) * DSET_SELECT_DIM); + memcpy(s2_wbuf_bak, s2_wbuf, sizeof(s2_t) * DSET_SELECT_DIM); if (H5Dwrite(did, s2_tid, H5S_ALL, H5S_ALL, dxpl, s2_wbuf) < 0) FAIL_STACK_ERROR; /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(s2_wbuf, s2_wbuf_bak, sizeof(s2_t) * DSET_SELECT_DIM); + memcpy(s2_wbuf, s2_wbuf_bak, sizeof(s2_t) * DSET_SELECT_DIM); /* Read it back */ if (H5Dread(did, s2_tid, H5S_ALL, H5S_ALL, dxpl, s2_rbuf) < 0) { @@ -1159,7 +1159,7 @@ test_multi_dsets_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsigned m /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(total_wbuf_bak, total_wbuf, ndsets * DSET_SELECT_DIM * sizeof(int)); + memcpy(total_wbuf_bak, total_wbuf, ndsets * DSET_SELECT_DIM * sizeof(int)); /* Write data to the dataset with/without data transform */ if (H5Dwrite_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, wbufs) < 0) @@ -1167,7 +1167,7 @@ test_multi_dsets_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsigned m /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(total_wbuf, total_wbuf_bak, ndsets * DSET_SELECT_DIM * sizeof(int)); + memcpy(total_wbuf, total_wbuf_bak, ndsets * DSET_SELECT_DIM * sizeof(int)); /* Read data from the dataset (if dtrans, without data transform set in dxpl) */ if (H5Dread_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, ntrans_dxpl, rbufs) < 0) @@ -1224,7 +1224,7 @@ test_multi_dsets_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsigned m /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(total_lwbuf_bak, total_lwbuf, ndsets * DSET_SELECT_DIM * sizeof(long)); + memcpy(total_lwbuf_bak, total_lwbuf, ndsets * DSET_SELECT_DIM * sizeof(long)); /* Write data to the dataset with/without data transform */ if (H5Dwrite_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, wbufs) < 0) @@ -1232,7 +1232,7 @@ test_multi_dsets_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsigned m /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(total_lwbuf, total_lwbuf_bak, ndsets * DSET_SELECT_DIM * sizeof(long)); + memcpy(total_lwbuf, total_lwbuf_bak, ndsets * DSET_SELECT_DIM * sizeof(long)); /* Read data from the dataset (if dtrans, with data transform again in dxpl) */ if (H5Dread_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, rbufs) < 0) @@ -1484,14 +1484,14 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(total_wbuf_bak, total_wbuf, buf_size); + memcpy(total_wbuf_bak, total_wbuf, buf_size); if (H5Dwrite_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, wbufs) < 0) TEST_ERROR; /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(total_wbuf, total_wbuf_bak, buf_size); + memcpy(total_wbuf, total_wbuf_bak, buf_size); if (H5Dread_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, rbufs) < 0) TEST_ERROR; @@ -1543,14 +1543,14 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(total_wbuf_bak, total_wbuf, buf_size); + memcpy(total_wbuf_bak, total_wbuf, buf_size); if (H5Dwrite_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, wbufs) < 0) TEST_ERROR; /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(total_wbuf, total_wbuf_bak, buf_size); + memcpy(total_wbuf, total_wbuf_bak, buf_size); if (H5Dread_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, rbufs) < 0) TEST_ERROR; @@ -1701,14 +1701,14 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(s2_total_wbuf_bak, s2_total_wbuf, s2_buf_size); + memcpy(s2_total_wbuf_bak, s2_total_wbuf, s2_buf_size); if (H5Dwrite_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, wbufs) < 0) TEST_ERROR; /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(s2_total_wbuf, s2_total_wbuf_bak, s2_buf_size); + memcpy(s2_total_wbuf, s2_total_wbuf_bak, s2_buf_size); if (H5Dread_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, rbufs) < 0) TEST_ERROR; @@ -1911,7 +1911,7 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(total_wbuf_bak, total_wbuf, buf_size); + memcpy(total_wbuf_bak, total_wbuf, buf_size); /* Write data to the dataset */ if (H5Dwrite_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, wbufs) < 0) @@ -1919,7 +1919,7 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(total_wbuf, total_wbuf_bak, buf_size); + memcpy(total_wbuf, total_wbuf_bak, buf_size); /* Read data from the dataset */ if (H5Dread_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, rbufs) < 0) @@ -1982,7 +1982,7 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(total_lwbuf_bak, total_lwbuf, buf_size); + memcpy(total_lwbuf_bak, total_lwbuf, buf_size); /* Write data to the dataset */ if (H5Dwrite_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, wbufs) < 0) @@ -1990,7 +1990,7 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(total_lwbuf, total_lwbuf_bak, buf_size); + memcpy(total_lwbuf, total_lwbuf_bak, buf_size); /* Read data from the dataset */ if (H5Dread_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, rbufs) < 0) @@ -2051,7 +2051,7 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(total_swbuf_bak, total_swbuf, buf_size); + memcpy(total_swbuf_bak, total_swbuf, buf_size); /* Write data to the dataset */ if (H5Dwrite_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, wbufs) < 0) @@ -2059,7 +2059,7 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(total_swbuf, total_swbuf_bak, buf_size); + memcpy(total_swbuf, total_swbuf_bak, buf_size); /* Read data from the dataset */ if (H5Dread_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, rbufs) < 0) @@ -2515,12 +2515,11 @@ test_multi_dsets_all(int niter, hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbufs if the library will be modifying them */ if (mwbuf) { - HDmemcpy(total_wbuf1_bak, total_wbuf1, ndsets * DSET_SELECT_DIM * sizeof(int)); - HDmemcpy(ul_total_wbuf2_bak, ul_total_wbuf2, - ndsets * DSET_SELECT_DIM * sizeof(unsigned long)); - HDmemcpy(l_total_wbuf2_bak, l_total_wbuf2, ndsets * DSET_SELECT_DIM * sizeof(long)); - HDmemcpy(s1_total_wbuf3_bak, s1_total_wbuf3, ndsets * DSET_SELECT_DIM * sizeof(s1_t)); - HDmemcpy(s4_total_wbuf3_bak, s4_total_wbuf3, ndsets * DSET_SELECT_DIM * sizeof(s4_t)); + memcpy(total_wbuf1_bak, total_wbuf1, ndsets * DSET_SELECT_DIM * sizeof(int)); + memcpy(ul_total_wbuf2_bak, ul_total_wbuf2, ndsets * DSET_SELECT_DIM * sizeof(unsigned long)); + memcpy(l_total_wbuf2_bak, l_total_wbuf2, ndsets * DSET_SELECT_DIM * sizeof(long)); + memcpy(s1_total_wbuf3_bak, s1_total_wbuf3, ndsets * DSET_SELECT_DIM * sizeof(s1_t)); + memcpy(s4_total_wbuf3_bak, s4_total_wbuf3, ndsets * DSET_SELECT_DIM * sizeof(s4_t)); } if (H5Dwrite_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, wbufs) < 0) @@ -2528,12 +2527,11 @@ test_multi_dsets_all(int niter, hid_t fid, unsigned chunked, unsigned mwbuf) /* Restore wbufs from backup if the library modified them */ if (mwbuf) { - HDmemcpy(total_wbuf1, total_wbuf1_bak, ndsets * DSET_SELECT_DIM * sizeof(int)); - HDmemcpy(ul_total_wbuf2, ul_total_wbuf2_bak, - ndsets * DSET_SELECT_DIM * sizeof(unsigned long)); - HDmemcpy(l_total_wbuf2, l_total_wbuf2_bak, ndsets * DSET_SELECT_DIM * sizeof(long)); - HDmemcpy(s1_total_wbuf3, s1_total_wbuf3_bak, ndsets * DSET_SELECT_DIM * sizeof(s1_t)); - HDmemcpy(s4_total_wbuf3, s4_total_wbuf3_bak, ndsets * DSET_SELECT_DIM * sizeof(s4_t)); + memcpy(total_wbuf1, total_wbuf1_bak, ndsets * DSET_SELECT_DIM * sizeof(int)); + memcpy(ul_total_wbuf2, ul_total_wbuf2_bak, ndsets * DSET_SELECT_DIM * sizeof(unsigned long)); + memcpy(l_total_wbuf2, l_total_wbuf2_bak, ndsets * DSET_SELECT_DIM * sizeof(long)); + memcpy(s1_total_wbuf3, s1_total_wbuf3_bak, ndsets * DSET_SELECT_DIM * sizeof(s1_t)); + memcpy(s4_total_wbuf3, s4_total_wbuf3_bak, ndsets * DSET_SELECT_DIM * sizeof(s4_t)); } if (H5Dread_multi(ndsets, dset_dids, r_mem_tids, mem_sids, file_sids, dxpl, rbufs) < 0) diff --git a/test/stab.c b/test/stab.c index cb7f7e3..acfe090 100644 --- a/test/stab.c +++ b/test/stab.c @@ -650,7 +650,7 @@ long_compact(hid_t fcpl, hid_t fapl2) /* Construct very long object name template */ if (NULL == (objname = (char *)malloc((size_t)(LONG_COMPACT_LENGTH + 1)))) TEST_ERROR; - HDmemset(objname, 'a', (size_t)LONG_COMPACT_LENGTH); + memset(objname, 'a', (size_t)LONG_COMPACT_LENGTH); objname[LONG_COMPACT_LENGTH] = '\0'; /* Re-open file */ diff --git a/test/swmr.c b/test/swmr.c index a7ccaac..0354744 100644 --- a/test/swmr.c +++ b/test/swmr.c @@ -3048,8 +3048,8 @@ test_start_swmr_write_stress_ohdr(hid_t in_fapl) TESTING("H5Fstart_swmr_write()--stress object header messages"); /* Initialize buffers */ - HDmemset(fill, 0, sizeof(fill)); - HDmemset(attr_data, 0, sizeof(attr_data)); + memset(fill, 0, sizeof(fill)); + memset(attr_data, 0, sizeof(attr_data)); if ((fapl = H5Pcopy(in_fapl)) < 0) FAIL_STACK_ERROR; @@ -3992,7 +3992,7 @@ test_append_flush_generic(void) TEST_ERROR; /* Verify expected values: with boundary rank < set boundary rank */ - HDmemset(ret_boundary, 0, sizeof(ret_boundary)); + memset(ret_boundary, 0, sizeof(ret_boundary)); if (H5Pget_append_flush(dapl, 1, ret_boundary, NULL, NULL) < 0) TEST_ERROR; if (ret_boundary[0] != 1 || ret_boundary[1] != 0 || boundary[2] != 0) @@ -4123,7 +4123,7 @@ test_append_flush_dataset_chunked(hid_t in_fapl) FAIL_STACK_ERROR; /* Set boundary dimension rank > the rank of dataset to be created */ - HDmemset(boundary, 0, sizeof(boundary)); + memset(boundary, 0, sizeof(boundary)); if (H5Pset_append_flush(dapl, 3, boundary, NULL, NULL) < 0) FAIL_STACK_ERROR; @@ -4185,7 +4185,7 @@ test_append_flush_dataset_chunked(hid_t in_fapl) if ((ddapl = H5Dget_access_plist(did2)) < 0) FAIL_STACK_ERROR; - HDmemset(ret_boundary, 0, sizeof(ret_boundary)); + memset(ret_boundary, 0, sizeof(ret_boundary)); ret_cb = NULL; ret_count = NULL; /* Retrieve the append flush property values */ @@ -4198,7 +4198,7 @@ test_append_flush_dataset_chunked(hid_t in_fapl) if (ret_boundary[0] != 0 || ret_boundary[1] != 1 || ret_boundary[2] != 0) TEST_ERROR; - HDmemset(ret_boundary, 0, sizeof(ret_boundary)); + memset(ret_boundary, 0, sizeof(ret_boundary)); /* Retrieve the append flush property values */ if (H5Pget_append_flush(ddapl, 1, ret_boundary, NULL, NULL) < 0) TEST_ERROR; @@ -4396,7 +4396,7 @@ test_append_flush_dataset_fixed(hid_t in_fapl) * zero boundary, null callback function, null user data */ - HDmemset(boundary, 0, sizeof(boundary)); + memset(boundary, 0, sizeof(boundary)); if (H5Pset_append_flush(dapl, 1, boundary, append_cb, &count) < 0) FAIL_STACK_ERROR; if ((did2 = H5Dopen2(fid, "dataset2", dapl)) < 0) diff --git a/test/swmr_addrem_writer.c b/test/swmr_addrem_writer.c index 7b6e78c..8fd907a 100644 --- a/test/swmr_addrem_writer.c +++ b/test/swmr_addrem_writer.c @@ -151,7 +151,7 @@ addrem_records(hid_t fid, unsigned verbose, unsigned long nops, unsigned long fl assert(fid > 0); /* Reset the buffer */ - HDmemset(&buf, 0, sizeof(buf)); + memset(&buf, 0, sizeof(buf)); /* Create a dataspace for the record to add */ if ((mem_sid = H5Screate_simple(2, count, NULL)) < 0) diff --git a/test/swmr_generator.c b/test/swmr_generator.c index e24ccab..75e392d 100644 --- a/test/swmr_generator.c +++ b/test/swmr_generator.c @@ -169,7 +169,7 @@ gen_skeleton(const char *filename, hbool_t verbose, hbool_t swmr_write, int comp /* Currently fill values do not work because they can bump the dataspace * message to the second object header chunk. We should enable the fillval * here when this is fixed. -NAF 8/11/11 */ - HDmemset(&fillval, 0, sizeof(fillval)); + memset(&fillval, 0, sizeof(fillval)); fillval.rec_id = (uint64_t)ULLONG_MAX; if (H5Pset_fill_value(dcpl, tid, &fillval) < 0) return -1; diff --git a/test/swmr_reader.c b/test/swmr_reader.c index e14ec7d..08c6307 100644 --- a/test/swmr_reader.c +++ b/test/swmr_reader.c @@ -210,7 +210,7 @@ read_records(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned /* Reset the record */ /* (record's 'info' field might need to change for each record read, also) */ - HDmemset(&record, 0, sizeof(record)); + memset(&record, 0, sizeof(record)); /* Emit informational message */ if (verbose) @@ -305,7 +305,7 @@ read_records(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned /* Check common dataset */ if (check_dataset(fid, verbose, verbose_file, sym_com[v]->name, &record, mem_sid) < 0) return -1; - HDmemset(&record, 0, sizeof(record)); + memset(&record, 0, sizeof(record)); } /* end for */ } /* end if */ @@ -320,7 +320,7 @@ read_records(const char *filename, hbool_t verbose, FILE *verbose_file, unsigned /* Check random dataset */ if (check_dataset(fid, verbose, verbose_file, sym_rand[v]->name, &record, mem_sid) < 0) return -1; - HDmemset(&record, 0, sizeof(record)); + memset(&record, 0, sizeof(record)); } /* end for */ } /* end if */ diff --git a/test/swmr_remove_reader.c b/test/swmr_remove_reader.c index 321a2fc..9a39356 100644 --- a/test/swmr_remove_reader.c +++ b/test/swmr_remove_reader.c @@ -205,7 +205,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nseconds, uns /* Reset the record */ /* (record's 'info' field might need to change for each record written, also) */ - HDmemset(&record, 0, sizeof(record)); + memset(&record, 0, sizeof(record)); /* Emit informational message */ if (verbose) @@ -291,7 +291,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nseconds, uns /* Check common dataset */ if (check_dataset(fid, verbose, sym_com[v]->name, &record, mem_sid) < 0) return -1; - HDmemset(&record, 0, sizeof(record)); + memset(&record, 0, sizeof(record)); } /* end for */ } /* end if */ @@ -306,7 +306,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nseconds, uns /* Check random dataset */ if (check_dataset(fid, verbose, sym_rand[v]->name, &record, mem_sid) < 0) return -1; - HDmemset(&record, 0, sizeof(record)); + memset(&record, 0, sizeof(record)); } /* end for */ } /* end if */ diff --git a/test/swmr_sparse_reader.c b/test/swmr_sparse_reader.c index ae422b6..5a2f464 100644 --- a/test/swmr_sparse_reader.c +++ b/test/swmr_sparse_reader.c @@ -209,7 +209,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nrecords, uns /* Reset the record */ /* (record's 'info' field might need to change for each record written, also) */ - HDmemset(&record, 0, sizeof(record)); + memset(&record, 0, sizeof(record)); /* Create a dataspace for the record to read */ if ((mem_sid = H5Screate(H5S_SCALAR)) < 0) @@ -284,7 +284,7 @@ read_records(const char *filename, unsigned verbose, unsigned long nrecords, uns /* Check dataset */ if (check_dataset(fid, verbose, symbol, &record, mem_sid) < 0) return -1; - HDmemset(&record, 0, sizeof(record)); + memset(&record, 0, sizeof(record)); /* Check for reopen */ iter_to_reopen--; diff --git a/test/swmr_sparse_writer.c b/test/swmr_sparse_writer.c index c536d3c..edef5c6 100644 --- a/test/swmr_sparse_writer.c +++ b/test/swmr_sparse_writer.c @@ -157,7 +157,7 @@ add_records(hid_t fid, unsigned verbose, unsigned long nrecords, unsigned long f /* Reset the record */ /* (record's 'info' field might need to change for each record written, also) */ - HDmemset(&record, 0, sizeof(record)); + memset(&record, 0, sizeof(record)); /* Create a dataspace for the record to add */ if ((mem_sid = H5Screate(H5S_SCALAR)) < 0) diff --git a/test/swmr_start_write.c b/test/swmr_start_write.c index fa5e99b..2bea7d4 100644 --- a/test/swmr_start_write.c +++ b/test/swmr_start_write.c @@ -223,7 +223,7 @@ add_records(hid_t fid, hbool_t verbose, FILE *verbose_file, unsigned long nrecor /* Reset the record */ /* (record's 'info' field might need to change for each record written, also) */ - HDmemset(&record, 0, sizeof(record)); + memset(&record, 0, sizeof(record)); /* Create a dataspace for the record to add */ if ((mem_sid = H5Screate(H5S_SCALAR)) < 0) diff --git a/test/swmr_writer.c b/test/swmr_writer.c index 81d4351..8397c43 100644 --- a/test/swmr_writer.c +++ b/test/swmr_writer.c @@ -159,7 +159,7 @@ add_records(hid_t fid, hbool_t verbose, FILE *verbose_file, unsigned long nrecor /* Reset the record */ /* (record's 'info' field might need to change for each record written, also) */ - HDmemset(&record, 0, sizeof(record)); + memset(&record, 0, sizeof(record)); /* Create a dataspace for the record to add */ if ((mem_sid = H5Screate(H5S_SCALAR)) < 0) diff --git a/test/tarray.c b/test/tarray.c index fede075..5978d9f 100644 --- a/test/tarray.c +++ b/test/tarray.c @@ -1634,7 +1634,7 @@ test_array_bkg(void) /* ------------------- */ dtsinfo = (CmpDTSinfo *)malloc(sizeof(CmpDTSinfo)); CHECK_PTR(dtsinfo, "malloc"); - HDmemset(dtsinfo, 0, sizeof(CmpDTSinfo)); + memset(dtsinfo, 0, sizeof(CmpDTSinfo)); for (i = 0; i < LENGTH; i++) { for (j = 0; j < ALEN; j++) { cf[i].a[j] = 100 * (i + 1) + j; @@ -1849,7 +1849,7 @@ test_array_bkg(void) /* Reset the data to read in */ /* ------------------------- */ - HDmemset(cfr, 0, sizeof(CmpField) * LENGTH); + memset(cfr, 0, sizeof(CmpField) * LENGTH); status = H5Dread(dataset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, cfr); CHECK(status, FAIL, "H5Dread"); diff --git a/test/tattr.c b/test/tattr.c index 2523b44..45f9865 100644 --- a/test/tattr.c +++ b/test/tattr.c @@ -918,7 +918,7 @@ test_attr_compound_read(hid_t fapl) /* Verify values read in */ for (i = 0; i < ATTR4_DIM1; i++) for (j = 0; j < ATTR4_DIM2; j++) - if (HDmemcmp(&attr_data4[i][j], &read_data4[i][j], sizeof(struct attr4_struct)) != 0) { + if (memcmp(&attr_data4[i][j], &read_data4[i][j], sizeof(struct attr4_struct)) != 0) { printf("%d: attribute data different: attr_data4[%d][%d].i=%d, read_data4[%d][%d].i=%d\n", __LINE__, i, j, attr_data4[i][j].i, i, j, read_data4[i][j].i); printf("%d: attribute data different: attr_data4[%d][%d].d=%f, read_data4[%d][%d].d=%f\n", @@ -5682,19 +5682,19 @@ attr_info_by_idx_check(hid_t obj_id, const char *attrname, hsize_t n, hbool_t us old_nerrs = GetTestNumErrs(); /* Verify the information for first attribute, in increasing creation order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, 0, "H5Aget_info_by_idx"); /* Verify the information for new attribute, in increasing creation order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, n, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, n, "H5Aget_info_by_idx"); /* Verify the name for new link, in increasing creation order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, n, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_name_by_idx"); @@ -5707,20 +5707,20 @@ attr_info_by_idx_check(hid_t obj_id, const char *attrname, hsize_t n, hbool_t us */ if (use_index) { /* Verify the information for first attribute, in native creation order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_NATIVE, (hsize_t)0, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, 0, "H5Aget_info_by_idx"); /* Verify the information for new attribute, in native creation order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_NATIVE, n, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, n, "H5Aget_info_by_idx"); /* Verify the name for new link, in increasing native order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_NATIVE, n, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_name_by_idx"); @@ -5729,19 +5729,19 @@ attr_info_by_idx_check(hid_t obj_id, const char *attrname, hsize_t n, hbool_t us } /* end if */ /* Verify the information for first attribute, in decreasing creation order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, n, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, 0, "H5Aget_info_by_idx"); /* Verify the information for new attribute, in increasing creation order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)0, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, n, "H5Aget_info_by_idx"); /* Verify the name for new link, in increasing creation order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(obj_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_name_by_idx"); @@ -5749,19 +5749,19 @@ attr_info_by_idx_check(hid_t obj_id, const char *attrname, hsize_t n, hbool_t us TestErrPrintf("Line %d: attribute name size wrong!\n", __LINE__); /* Verify the information for first attribute, in increasing name order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)0, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, 0, "H5Aget_info_by_idx"); /* Verify the information for new attribute, in increasing name order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_NAME, H5_ITER_INC, n, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, n, "H5Aget_info_by_idx"); /* Verify the name for new link, in increasing name order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(obj_id, ".", H5_INDEX_NAME, H5_ITER_INC, n, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_name_by_idx"); @@ -5773,19 +5773,19 @@ attr_info_by_idx_check(hid_t obj_id, const char *attrname, hsize_t n, hbool_t us */ /* Verify the information for first attribute, in decreasing name order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_NAME, H5_ITER_DEC, n, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, 0, "H5Aget_info_by_idx"); /* Verify the information for new attribute, in increasing name order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(obj_id, ".", H5_INDEX_NAME, H5_ITER_DEC, (hsize_t)0, &ainfo, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_info_by_idx"); VERIFY(ainfo.corder, n, "H5Aget_info_by_idx"); /* Verify the name for new link, in increasing name order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(obj_id, ".", H5_INDEX_NAME, H5_ITER_DEC, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aget_name_by_idx"); @@ -6494,7 +6494,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Adelete_by_idx"); /* Verify the attribute information for first attribute in appropriate order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, &ainfo, H5P_DEFAULT); if (new_format) { @@ -6507,7 +6507,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) } /* end if */ /* Verify the name for first attribute in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); if (order == H5_ITER_INC) @@ -6626,7 +6626,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Adelete_by_idx"); /* Verify the attribute information for first attribute in appropriate order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, &ainfo, H5P_DEFAULT); if (new_format) { @@ -6639,7 +6639,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) } /* end if */ /* Verify the name for first attribute in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); if (order == H5_ITER_INC) @@ -6743,7 +6743,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Adelete_by_idx"); /* Verify the attribute information for first attribute in appropriate order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(my_dataset, ".", idx_type, order, (hsize_t)u, &ainfo, H5P_DEFAULT); if (new_format) { @@ -6757,7 +6757,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) } /* end if */ /* Verify the name for first attribute in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", idx_type, order, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); if (order == H5_ITER_INC) @@ -6796,7 +6796,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) CHECK(ret, FAIL, "H5Adelete_by_idx"); /* Verify the attribute information for first attribute in appropriate order */ - HDmemset(&ainfo, 0, sizeof(ainfo)); + memset(&ainfo, 0, sizeof(ainfo)); ret = H5Aget_info_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, &ainfo, H5P_DEFAULT); if (new_format) { @@ -6810,7 +6810,7 @@ test_attr_delete_by_idx(hbool_t new_format, hid_t fcpl, hid_t fapl) } /* end if */ /* Verify the name for first attribute in appropriate order */ - HDmemset(tmpname, 0, (size_t)NAME_BUF_SIZE); + memset(tmpname, 0, (size_t)NAME_BUF_SIZE); ret = (herr_t)H5Aget_name_by_idx(my_dataset, ".", idx_type, order, (hsize_t)0, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT); if (order == H5_ITER_INC) @@ -6990,7 +6990,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_attrs - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate2(obj_id, idx_type, order, &skip, attr_iterate2_cb, iter_info); CHECK(ret, FAIL, "H5Aiterate2"); @@ -7005,7 +7005,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_attrs - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate_by_name(fid, dsetname, idx_type, order, &skip, attr_iterate2_cb, iter_info, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aiterate_by_name"); @@ -7020,7 +7020,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_attrs - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate_by_name(obj_id, ".", idx_type, order, &skip, attr_iterate2_cb, iter_info, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aiterate_by_name"); @@ -7036,7 +7036,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_attrs - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate1(obj_id, &oskip, attr_iterate1_cb, iter_info); CHECK(ret, FAIL, "H5Aiterate1"); @@ -7052,7 +7052,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? skip : ((max_attrs - 1) - skip); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate2(obj_id, idx_type, order, &skip, attr_iterate2_cb, iter_info); CHECK(ret, FAIL, "H5Aiterate2"); @@ -7083,7 +7083,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? skip : ((max_attrs - 1) - skip); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate_by_name(fid, dsetname, idx_type, order, &skip, attr_iterate2_cb, iter_info, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aiterate_by_name"); @@ -7114,7 +7114,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? skip : ((max_attrs - 1) - skip); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate_by_name(obj_id, ".", idx_type, order, &skip, attr_iterate2_cb, iter_info, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aiterate_by_name"); @@ -7146,7 +7146,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = -1; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? (unsigned)oskip : ((max_attrs - 1) - oskip); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate1(obj_id, &oskip, attr_iterate1_cb, iter_info); CHECK(ret, FAIL, "H5Aiterate1"); @@ -7178,7 +7178,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_attrs - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate2(obj_id, idx_type, order, &skip, attr_iterate2_cb, iter_info); CHECK(ret, FAIL, "H5Aiterate2"); VERIFY(ret, CORDER_ITER_STOP, "H5Aiterate2"); @@ -7190,7 +7190,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_attrs - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate_by_name(fid, dsetname, idx_type, order, &skip, attr_iterate2_cb, iter_info, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aiterate_by_name"); VERIFY(ret, CORDER_ITER_STOP, "H5Aiterate_by_name"); @@ -7202,7 +7202,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_attrs - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate_by_name(obj_id, ".", idx_type, order, &skip, attr_iterate2_cb, iter_info, H5P_DEFAULT); CHECK(ret, FAIL, "H5Aiterate_by_name"); VERIFY(ret, CORDER_ITER_STOP, "H5Aiterate_by_name"); @@ -7215,7 +7215,7 @@ attr_iterate_check(hid_t fid, const char *dsetname, hid_t obj_id, H5_index_t idx iter_info->stop = 3; iter_info->ncalled = 0; iter_info->curr = order != H5_ITER_DEC ? 0 : (max_attrs - 1); - HDmemset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); + memset(iter_info->visited, 0, sizeof(hbool_t) * iter_info->max_visit); ret = H5Aiterate1(obj_id, &oskip, attr_iterate1_cb, iter_info); CHECK(ret, FAIL, "H5Aiterate1"); VERIFY(ret, CORDER_ITER_STOP, "H5Aiterate1"); @@ -8596,7 +8596,7 @@ test_attr_shared_write(hid_t fcpl, hid_t fapl) /* Allocate & initialize "big" attribute data */ big_value = (unsigned *)malloc((size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3) * sizeof(unsigned)); CHECK_PTR(big_value, "malloc"); - HDmemset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); + memset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); /* Create dataspace for dataset */ sid = H5Screate(H5S_SCALAR); @@ -8933,7 +8933,7 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl) /* Allocate & initialize "big" attribute data */ big_value = (unsigned *)malloc((size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3) * sizeof(unsigned)); CHECK_PTR(big_value, "malloc"); - HDmemset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); + memset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); /* Create dataspace for dataset */ sid = H5Screate(H5S_SCALAR); @@ -9380,7 +9380,7 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl) /* Allocate & initialize "big" attribute data */ big_value = (unsigned *)malloc((size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3) * sizeof(unsigned)); CHECK_PTR(big_value, "malloc"); - HDmemset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); + memset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); /* Create dataspace for dataset */ sid = H5Screate(H5S_SCALAR); @@ -9752,7 +9752,7 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl) /* Allocate & initialize "big" attribute data */ big_value = (unsigned *)malloc((size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3) * sizeof(unsigned)); CHECK_PTR(big_value, "malloc"); - HDmemset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); + memset(big_value, 1, sizeof(unsigned) * (size_t)(SPACE1_DIM1 * SPACE1_DIM2 * SPACE1_DIM3)); /* Create dataspace for dataset */ sid = H5Screate(H5S_SCALAR); diff --git a/test/tchecksum.c b/test/tchecksum.c index 450be3f..62db33c 100644 --- a/test/tchecksum.c +++ b/test/tchecksum.c @@ -55,7 +55,7 @@ test_chksum_size_one(void) VERIFY(chksum, 0xa209c931, "H5_checksum_lookup3"); /* Buffer w/zero(s) for data */ - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); chksum = H5_checksum_fletcher32(buf, sizeof(buf)); VERIFY(chksum, 0, "H5_checksum_fletcher32"); @@ -88,7 +88,7 @@ test_chksum_size_two(void) VERIFY(chksum, 0x8ba7a6c9, "H5_checksum_lookup3"); /* Buffer w/zero(s) for data */ - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); chksum = H5_checksum_fletcher32(buf, sizeof(buf)); VERIFY(chksum, 0, "H5_checksum_fletcher32"); @@ -121,7 +121,7 @@ test_chksum_size_three(void) VERIFY(chksum, 0xcebdf4f0, "H5_checksum_lookup3"); /* Buffer w/zero(s) for data */ - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); chksum = H5_checksum_fletcher32(buf, sizeof(buf)); VERIFY(chksum, 0, "H5_checksum_fletcher32"); @@ -154,7 +154,7 @@ test_chksum_size_four(void) VERIFY(chksum, 0x2c88bb51, "H5_checksum_lookup3"); /* Buffer w/zero(s) for data */ - HDmemset(buf, 0, sizeof(buf)); + memset(buf, 0, sizeof(buf)); chksum = H5_checksum_fletcher32(buf, sizeof(buf)); VERIFY(chksum, 0, "H5_checksum_fletcher32"); @@ -196,7 +196,7 @@ test_chksum_large(void) VERIFY(chksum, 0x1bd2ee7b, "H5_checksum_lookup3"); /* Buffer w/zero(s) for data */ - HDmemset(large_buf, 0, (size_t)BUF_LEN); + memset(large_buf, 0, (size_t)BUF_LEN); chksum = H5_checksum_fletcher32(large_buf, (size_t)BUF_LEN); VERIFY(chksum, 0, "H5_checksum_fletcher32"); diff --git a/test/tcoords.c b/test/tcoords.c index 6b3193f..a06b103 100644 --- a/test/tcoords.c +++ b/test/tcoords.c @@ -86,7 +86,7 @@ test_singleEnd_selElements(hid_t file, hbool_t is_chunked) } /* Construct dataset's name */ - HDmemset(dset_name, 0, (size_t)NAME_LEN); + memset(dset_name, 0, (size_t)NAME_LEN); HDstrcat(dset_name, SINGLE_END_DSET); if (is_chunked) HDstrcat(dset_name, "_chunked"); @@ -258,7 +258,7 @@ test_singleEnd_selHyperslab(hid_t file, hbool_t is_chunked) hsize_t mem3_block[4] = {1, 3, 6, 1}; /* Construct dataset's name */ - HDmemset(dset_name, 0, NAME_LEN); + memset(dset_name, 0, NAME_LEN); HDstrcat(dset_name, SINGLE_END_DSET); if (is_chunked) HDstrcat(dset_name, "_chunked"); @@ -461,7 +461,7 @@ test_multiple_ends(hid_t file, hbool_t is_chunked) } /* Construct dataset's name */ - HDmemset(dset_name, 0, NAME_LEN); + memset(dset_name, 0, NAME_LEN); HDstrcat(dset_name, MULTI_ENDS_SEL_HYPER_DSET); if (is_chunked) HDstrcat(dset_name, "_chunked"); diff --git a/test/tfile.c b/test/tfile.c index 5cd0e7d..a68ec03 100644 --- a/test/tfile.c +++ b/test/tfile.c @@ -2795,7 +2795,7 @@ test_file_double_file_dataset_open(hbool_t new_format) CHECK(tid1, FAIL, "H5Tcopy"); /* Second file's dataset read */ - HDmemset(buffer, 0, sizeof(char *) * 5); + memset(buffer, 0, sizeof(char *) * 5); ret = H5Dread(did2, tid2, H5S_ALL, H5S_ALL, H5P_DEFAULT, buffer); CHECK(ret, FAIL, "H5Dread"); ret = H5Treclaim(tid2, sid1, H5P_DEFAULT, buffer); @@ -2810,7 +2810,7 @@ test_file_double_file_dataset_open(hbool_t new_format) CHECK(ret, FAIL, "H5Fclose"); /* First file's dataset read */ - HDmemset(buffer, 0, sizeof(char *) * 5); + memset(buffer, 0, sizeof(char *) * 5); ret = H5Dread(did1, tid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, buffer); CHECK(ret, FAIL, "H5Dread"); ret = H5Treclaim(tid2, sid1, H5P_DEFAULT, buffer); @@ -4395,7 +4395,7 @@ set_multi_split(hid_t fapl, hsize_t pagesize, hbool_t split) assert(split); - HDmemset(memb_name, 0, sizeof memb_name); + memset(memb_name, 0, sizeof memb_name); /* Get current split settings */ if (H5Pget_fapl_multi(fapl, memb_map, memb_fapl_arr, memb_name, memb_addr, &relax) < 0) @@ -4743,7 +4743,7 @@ test_sects_freespace(const char *env_h5_drvr, hbool_t new_format) VERIFY(nsects, FAIL, "H5Fget_free_sections"); /* Retrieve and verify free space info for all the sections */ - HDmemset(all_sect_info, 0, sizeof(all_sect_info)); + memset(all_sect_info, 0, sizeof(all_sect_info)); nsects = H5Fget_free_sections(file, H5FD_MEM_DEFAULT, (size_t)nall, all_sect_info); VERIFY(nsects, nall, "H5Fget_free_sections"); @@ -4756,7 +4756,7 @@ test_sects_freespace(const char *env_h5_drvr, hbool_t new_format) last_size = all_sect_info[nall - 1].size; /* Retrieve and verify free space info for -1 sections */ - HDmemset(sect_info, 0, sizeof(sect_info)); + memset(sect_info, 0, sizeof(sect_info)); nsects = H5Fget_free_sections(file, H5FD_MEM_DEFAULT, (size_t)(nall - 1), sect_info); VERIFY(nsects, nall, "H5Fget_free_sections"); @@ -4770,7 +4770,7 @@ test_sects_freespace(const char *env_h5_drvr, hbool_t new_format) VERIFY(((hsize_t)free_space - last_size), total, "H5Fget_free_sections"); /* Retrieve and verify free-space info for +1 sections */ - HDmemset(sect_info, 0, sizeof(sect_info)); + memset(sect_info, 0, sizeof(sect_info)); nsects = H5Fget_free_sections(file, H5FD_MEM_DEFAULT, (size_t)(nall + 1), sect_info); VERIFY(nsects, nall, "H5Fget_free_sections"); @@ -4785,7 +4785,7 @@ test_sects_freespace(const char *env_h5_drvr, hbool_t new_format) VERIFY(sect_info[nall].size, 0, "H5Fget_free_sections"); VERIFY(free_space, total, "H5Fget_free_sections"); - HDmemset(meta_sect_info, 0, sizeof(meta_sect_info)); + memset(meta_sect_info, 0, sizeof(meta_sect_info)); if (multi_vfd) { hssize_t ntmp; @@ -4818,7 +4818,7 @@ test_sects_freespace(const char *env_h5_drvr, hbool_t new_format) CHECK(nraw, FAIL, "H5Fget_free_sections"); /* Retrieve and verify free-space sections for raw data */ - HDmemset(raw_sect_info, 0, sizeof(raw_sect_info)); + memset(raw_sect_info, 0, sizeof(raw_sect_info)); nsects = H5Fget_free_sections(file, H5FD_MEM_DRAW, (size_t)nraw, raw_sect_info); VERIFY(nsects, nraw, "H5Fget_free_sections"); diff --git a/test/tgenprop.c b/test/tgenprop.c index c319f87..c542603 100644 --- a/test/tgenprop.c +++ b/test/tgenprop.c @@ -802,7 +802,7 @@ test_genprop_basic_list_prop(void) /* Check values of temporary properties (set with regular values) */ ret = H5Pget(lid1, PROP3_NAME, &prop3_value); CHECK_I(ret, "H5Pget"); - if (HDmemcmp(&prop3_value, PROP3_DEF_VALUE, PROP3_SIZE) != 0) + if (memcmp(&prop3_value, PROP3_DEF_VALUE, PROP3_SIZE) != 0) TestErrPrintf("Property #3 doesn't match!, line=%d\n", __LINE__); ret = H5Pget(lid1, PROP4_NAME, &prop4_value); CHECK_I(ret, "H5Pget"); @@ -1028,7 +1028,7 @@ test_genprop_prop_crt_cb1(const char *name, size_t size, void *def_value) prop1_cb_info.crt_count++; prop1_cb_info.crt_name = HDstrdup(name); prop1_cb_info.crt_value = malloc(size); - HDmemcpy(prop1_cb_info.crt_value, def_value, size); + memcpy(prop1_cb_info.crt_value, def_value, size); return (SUCCEED); } @@ -1048,7 +1048,7 @@ test_genprop_prop_set_cb1(hid_t plist_id, const char *name, size_t size, void *v prop1_cb_info.set_name = HDstrdup(name); if (prop1_cb_info.set_value == NULL) prop1_cb_info.set_value = malloc(size); - HDmemcpy(prop1_cb_info.set_value, value, size); + memcpy(prop1_cb_info.set_value, value, size); return (SUCCEED); } @@ -1068,7 +1068,7 @@ test_genprop_prop_get_cb1(hid_t plist_id, const char *name, size_t size, void *v prop1_cb_info.get_name = HDstrdup(name); if (prop1_cb_info.get_value == NULL) prop1_cb_info.get_value = malloc(size); - HDmemcpy(prop1_cb_info.get_value, value, size); + memcpy(prop1_cb_info.get_value, value, size); return (SUCCEED); } @@ -1087,7 +1087,7 @@ test_genprop_prop_cop_cb1(const char *name, size_t size, void *value) prop1_cb_info.cop_name = HDstrdup(name); if (prop1_cb_info.cop_value == NULL) prop1_cb_info.cop_value = malloc(size); - HDmemcpy(prop1_cb_info.cop_value, value, size); + memcpy(prop1_cb_info.cop_value, value, size); return (SUCCEED); } @@ -1103,7 +1103,7 @@ test_genprop_prop_cmp_cb1(const void *value1, const void *value2, size_t size) /* Set the information from the comparison call */ prop1_cb_info.cmp_count++; - return (HDmemcmp(value1, value2, size)); + return (memcmp(value1, value2, size)); } /**************************************************************** @@ -1117,7 +1117,7 @@ test_genprop_prop_cmp_cb3(const void *value1, const void *value2, size_t size) /* Set the information from the comparison call */ prop3_cb_info.cmp_count++; - return (HDmemcmp(value1, value2, size)); + return (memcmp(value1, value2, size)); } /**************************************************************** @@ -1134,7 +1134,7 @@ test_genprop_prop_cls_cb1(const char *name, size_t size, void *value) prop1_cb_info.cls_name = HDstrdup(name); if (prop1_cb_info.cls_value == NULL) prop1_cb_info.cls_value = malloc(size); - HDmemcpy(prop1_cb_info.cls_value, value, size); + memcpy(prop1_cb_info.cls_value, value, size); return (SUCCEED); } @@ -1152,7 +1152,7 @@ test_genprop_prop_del_cb2(hid_t plist_id, const char *name, size_t size, void *v prop2_cb_info.del_plist_id = plist_id; prop2_cb_info.del_name = HDstrdup(name); prop2_cb_info.del_value = malloc(size); - HDmemcpy(prop2_cb_info.del_value, value, size); + memcpy(prop2_cb_info.del_value, value, size); return (SUCCEED); } @@ -1221,9 +1221,9 @@ test_genprop_list_callback(void) cop_cb_struct.id = (-1); /* Initialize callback information for properties tracked */ - HDmemset(&prop1_cb_info, 0, sizeof(prop_cb_info)); - HDmemset(&prop2_cb_info, 0, sizeof(prop_cb_info)); - HDmemset(&prop3_cb_info, 0, sizeof(prop_cb_info)); + memset(&prop1_cb_info, 0, sizeof(prop_cb_info)); + memset(&prop2_cb_info, 0, sizeof(prop_cb_info)); + memset(&prop3_cb_info, 0, sizeof(prop_cb_info)); /* Create a property list from the class */ lid1 = H5Pcreate(cid1); @@ -1240,7 +1240,7 @@ test_genprop_list_callback(void) VERIFY(prop1_cb_info.crt_count, 1, "H5Pcreate"); if (HDstrcmp(prop1_cb_info.crt_name, PROP1_NAME) != 0) TestErrPrintf("Property #1 name doesn't match!, line=%d\n", __LINE__); - if (HDmemcmp(prop1_cb_info.crt_value, PROP1_DEF_VALUE, PROP1_SIZE) != 0) + if (memcmp(prop1_cb_info.crt_value, PROP1_DEF_VALUE, PROP1_SIZE) != 0) TestErrPrintf("Property #1 value doesn't match!, line=%d\n", __LINE__); /* Check values of permanent properties (set with default values) */ @@ -1259,7 +1259,7 @@ test_genprop_list_callback(void) /* Check values of temporary properties (set with regular values) */ ret = H5Pget(lid1, PROP3_NAME, &prop3_value); CHECK_I(ret, "H5Pget"); - if (HDmemcmp(&prop3_value, PROP3_DEF_VALUE, PROP3_SIZE) != 0) + if (memcmp(&prop3_value, PROP3_DEF_VALUE, PROP3_SIZE) != 0) TestErrPrintf("Property #3 doesn't match!, line=%d\n", __LINE__); /* The compare callback should not have been called, as there is no get * callback for this property */ @@ -1276,7 +1276,7 @@ test_genprop_list_callback(void) VERIFY(prop1_cb_info.get_plist_id, lid1, "H5Pget"); if (HDstrcmp(prop1_cb_info.get_name, PROP1_NAME) != 0) TestErrPrintf("Property #1 name doesn't match!, line=%d\n", __LINE__); - if (HDmemcmp(prop1_cb_info.get_value, PROP1_DEF_VALUE, PROP1_SIZE) != 0) + if (memcmp(prop1_cb_info.get_value, PROP1_DEF_VALUE, PROP1_SIZE) != 0) TestErrPrintf("Property #1 value doesn't match!, line=%d\n", __LINE__); /* Set value of property #1 to different value */ @@ -1288,7 +1288,7 @@ test_genprop_list_callback(void) VERIFY(prop1_cb_info.set_plist_id, lid1, "H5Pset"); if (HDstrcmp(prop1_cb_info.set_name, PROP1_NAME) != 0) TestErrPrintf("Property #1 name doesn't match!, line=%d\n", __LINE__); - if (HDmemcmp(prop1_cb_info.set_value, &prop1_new_value, PROP1_SIZE) != 0) + if (memcmp(prop1_cb_info.set_value, &prop1_new_value, PROP1_SIZE) != 0) TestErrPrintf("Property #1 value doesn't match!, line=%d\n", __LINE__); /* The compare callback should not have been called */ @@ -1311,7 +1311,7 @@ test_genprop_list_callback(void) VERIFY(prop1_cb_info.get_plist_id, lid1, "H5Pget"); if (HDstrcmp(prop1_cb_info.get_name, PROP1_NAME) != 0) TestErrPrintf("Property #1 name doesn't match!, line=%d\n", __LINE__); - if (HDmemcmp(prop1_cb_info.get_value, &prop1_new_value, PROP1_SIZE) != 0) + if (memcmp(prop1_cb_info.get_value, &prop1_new_value, PROP1_SIZE) != 0) TestErrPrintf("Property #1 value doesn't match!, line=%d\n", __LINE__); /* Delete property #2 */ @@ -1323,7 +1323,7 @@ test_genprop_list_callback(void) VERIFY(prop2_cb_info.del_plist_id, lid1, "H5Premove"); if (HDstrcmp(prop2_cb_info.del_name, PROP2_NAME) != 0) TestErrPrintf("Property #2 name doesn't match!, line=%d\n", __LINE__); - if (HDmemcmp(prop2_cb_info.del_value, PROP2_DEF_VALUE, PROP2_SIZE) != 0) + if (memcmp(prop2_cb_info.del_value, PROP2_DEF_VALUE, PROP2_SIZE) != 0) TestErrPrintf("Property #2 value doesn't match!, line=%d\n", __LINE__); /* Copy first list */ @@ -1334,7 +1334,7 @@ test_genprop_list_callback(void) VERIFY(prop1_cb_info.cop_count, 1, "H5Pcopy"); if (HDstrcmp(prop1_cb_info.cop_name, PROP1_NAME) != 0) TestErrPrintf("Property #1 name doesn't match!, line=%d\n", __LINE__); - if (HDmemcmp(prop1_cb_info.cop_value, &prop1_new_value, PROP1_SIZE) != 0) + if (memcmp(prop1_cb_info.cop_value, &prop1_new_value, PROP1_SIZE) != 0) TestErrPrintf("Property #1 value doesn't match!, line=%d\n", __LINE__); /* Verify that the class creation callback occurred */ @@ -1357,7 +1357,7 @@ test_genprop_list_callback(void) VERIFY(prop1_cb_info.cls_count, 1, "H5Pclose"); if (HDstrcmp(prop1_cb_info.cls_name, PROP1_NAME) != 0) TestErrPrintf("Property #1 name doesn't match!, line=%d\n", __LINE__); - if (HDmemcmp(prop1_cb_info.cls_value, &prop1_new_value, PROP1_SIZE) != 0) + if (memcmp(prop1_cb_info.cls_value, &prop1_new_value, PROP1_SIZE) != 0) TestErrPrintf("Property #1 value doesn't match!, line=%d\n", __LINE__); /* Close second list */ diff --git a/test/th5o.c b/test/th5o.c index 1b7bd9c..9031b28 100644 --- a/test/th5o.c +++ b/test/th5o.c @@ -1456,8 +1456,8 @@ test_h5o_getinfo_same_file(void) CHECK(gid2, FAIL, "H5Gcreate2"); /* Reset object info */ - HDmemset(&oinfo1, 0, sizeof(oinfo1)); - HDmemset(&oinfo2, 0, sizeof(oinfo2)); + memset(&oinfo1, 0, sizeof(oinfo1)); + memset(&oinfo2, 0, sizeof(oinfo2)); /* Query the object info for each object, through group IDs */ ret = H5Oget_info3(gid1, &oinfo1, H5O_INFO_BASIC); @@ -1468,8 +1468,8 @@ test_h5o_getinfo_same_file(void) VERIFY(oinfo1.fileno, oinfo2.fileno, "file number from H5Oget_info3"); /* Reset object info */ - HDmemset(&oinfo1, 0, sizeof(oinfo1)); - HDmemset(&oinfo2, 0, sizeof(oinfo2)); + memset(&oinfo1, 0, sizeof(oinfo1)); + memset(&oinfo2, 0, sizeof(oinfo2)); /* Query the object info for each object, by name */ ret = H5Oget_info_by_name3(fid1, "group1", &oinfo1, H5O_INFO_BASIC, H5P_DEFAULT); @@ -1500,8 +1500,8 @@ test_h5o_getinfo_same_file(void) CHECK(gid2, FAIL, "H5Gopen2"); /* Reset object info */ - HDmemset(&oinfo1, 0, sizeof(oinfo1)); - HDmemset(&oinfo2, 0, sizeof(oinfo2)); + memset(&oinfo1, 0, sizeof(oinfo1)); + memset(&oinfo2, 0, sizeof(oinfo2)); /* Query the object info for each object, through group IDs */ ret = H5Oget_info3(gid1, &oinfo1, H5O_INFO_BASIC); @@ -1512,8 +1512,8 @@ test_h5o_getinfo_same_file(void) VERIFY(oinfo1.fileno, oinfo2.fileno, "file number from H5Oget_info3"); /* Reset object info */ - HDmemset(&oinfo1, 0, sizeof(oinfo1)); - HDmemset(&oinfo2, 0, sizeof(oinfo2)); + memset(&oinfo1, 0, sizeof(oinfo1)); + memset(&oinfo2, 0, sizeof(oinfo2)); /* Query the object info for each object, by name */ ret = H5Oget_info_by_name3(fid1, "group1", &oinfo1, H5O_INFO_BASIC, H5P_DEFAULT); @@ -1775,8 +1775,8 @@ test_h5o_getinfo_visit(void) CHECK(gid2, FAIL, "H5Gcreate2"); /* Reset object info */ - HDmemset(&oinfo1, 0, sizeof(oinfo1)); - HDmemset(&oinfo2, 0, sizeof(oinfo2)); + memset(&oinfo1, 0, sizeof(oinfo1)); + memset(&oinfo2, 0, sizeof(oinfo2)); /* Query the object info for "group1" via H5Oget_info1 and H5Oget_info2 */ ret = H5Oget_info1(gid1, &oinfo1); @@ -1789,8 +1789,8 @@ test_h5o_getinfo_visit(void) VERIFY(oinfo1.num_attrs, oinfo2.num_attrs, "obj info from H5Oget_info1/2"); /* Reset object info */ - HDmemset(&oinfo1, 0, sizeof(oinfo1)); - HDmemset(&oinfo2, 0, sizeof(oinfo2)); + memset(&oinfo1, 0, sizeof(oinfo1)); + memset(&oinfo2, 0, sizeof(oinfo2)); /* Query the object info for "group2" via H5Oget_info1 and H5Oget_info2 */ ret = H5Oget_info_by_name1(fid, "group2", &oinfo1, H5P_DEFAULT); diff --git a/test/th5s.c b/test/th5s.c index bd193cb..87e0de9 100644 --- a/test/th5s.c +++ b/test/th5s.c @@ -144,7 +144,7 @@ test_h5s_basic(void) rank = H5Sget_simple_extent_dims(sid1, tdims, NULL); CHECK(rank, FAIL, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); sid2 = H5Screate_simple(SPACE2_RANK, dims2, max2); CHECK(sid2, FAIL, "H5Screate_simple"); @@ -159,16 +159,16 @@ test_h5s_basic(void) rank = H5Sget_simple_extent_dims(sid2, tdims, tmax); CHECK(rank, FAIL, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tdims, dims2, SPACE2_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tmax, max2, SPACE2_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tdims, dims2, SPACE2_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tmax, max2, SPACE2_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); /* Change max dims to be equal to the dimensions */ ret = H5Sset_extent_simple(sid1, SPACE1_RANK, dims1, NULL); CHECK(ret, FAIL, "H5Sset_extent_simple"); rank = H5Sget_simple_extent_dims(sid1, tdims, tmax); CHECK(rank, FAIL, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tmax, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tmax, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); ret = H5Sclose(sid1); CHECK(ret, FAIL, "H5Sclose"); @@ -1025,7 +1025,7 @@ test_h5s_zero_dim(void) rank = H5Sget_simple_extent_dims(sid_chunk, tdims, NULL); CHECK(rank, FAIL, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); /* Set it to chunked dataset */ plist_id = H5Pcreate(H5P_DATASET_CREATE); @@ -1289,7 +1289,7 @@ test_h5s_encode(H5F_libver_t low, H5F_libver_t high) /* Retrieve and verify the dataspace dimensions */ rank = H5Sget_simple_extent_dims(decoded_sid1, tdims, NULL); CHECK(rank, FAIL, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); /* Verify the type of dataspace selection */ sel_type = H5Sget_select_type(decoded_sid1); @@ -1481,7 +1481,7 @@ test_h5s_encode1(void) /* Retrieve and verify the dataspace dimensions */ rank = H5Sget_simple_extent_dims(decoded_sid1, tdims, NULL); CHECK(rank, FAIL, "H5Sget_simple_extent_dims"); - VERIFY(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); + VERIFY(memcmp(tdims, dims1, SPACE1_RANK * sizeof(hsize_t)), 0, "H5Sget_simple_extent_dims"); /* Verify the type of dataspace selection */ sel_type = H5Sget_select_type(decoded_sid1); @@ -2460,7 +2460,7 @@ test_h5s_compound_scalar_read(void) ret = H5Dread(dataset, type, H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata); CHECK(ret, FAIL, "H5Dread"); - if (HDmemcmp(&space4_data, &rdata, sizeof(struct space4_struct)) != 0) { + if (memcmp(&space4_data, &rdata, sizeof(struct space4_struct)) != 0) { printf("scalar data different: space4_data.c1=%c, read_data4.c1=%c\n", space4_data.c1, rdata.c1); printf("scalar data different: space4_data.u=%u, read_data4.u=%u\n", space4_data.u, rdata.u); printf("scalar data different: space4_data.f=%f, read_data4.f=%f\n", (double)space4_data.f, @@ -2565,8 +2565,8 @@ test_h5s_chunk(void) CHECK(status, FAIL, "H5Fclose"); /* Reset/initialize the data arrays to read in */ - HDmemset(chunk_data_dbl_data, 0, sizeof(double) * CHUNK_DATA_NX * CHUNK_DATA_NY); - HDmemset(chunk_data_flt_data, 0, sizeof(float) * CHUNK_DATA_NX * CHUNK_DATA_NY); + memset(chunk_data_dbl_data, 0, sizeof(double) * CHUNK_DATA_NX * CHUNK_DATA_NY); + memset(chunk_data_flt_data, 0, sizeof(float) * CHUNK_DATA_NX * CHUNK_DATA_NY); fileID = H5Fopen(DATAFILE, H5F_ACC_RDONLY, H5P_DEFAULT); CHECK(fileID, FAIL, "H5Fopen"); diff --git a/test/thread_id.c b/test/thread_id.c index 7d4b7fe..d42a483 100644 --- a/test/thread_id.c +++ b/test/thread_id.c @@ -73,7 +73,7 @@ pthread_barrier_init(pthread_barrier_t *barrier, const pthread_barrierattr_t *at if (attr != NULL) return EINVAL; - HDmemset(barrier, 0, sizeof(*barrier)); + memset(barrier, 0, sizeof(*barrier)); barrier->count = count; @@ -723,7 +723,7 @@ test_remove_clear_type(void) * Build object list * *********************/ - HDmemset(obj_list.objects, 0, list_size); + memset(obj_list.objects, 0, list_size); /* The number of objects used is a random number between the min and max */ obj_list.count = obj_list.remaining = diff --git a/test/tmeta.c b/test/tmeta.c index 07f6a10..68f77c8 100644 --- a/test/tmeta.c +++ b/test/tmeta.c @@ -76,7 +76,7 @@ test_metadata(void) UINT32ENCODE(p, eu32); /* Encode the uint32 value */ /* Check if we got what we asked for */ - if (HDmemcmp(encode_buffer, compar_buffer, sizeof(compar_buffer)) != 0) { + if (memcmp(encode_buffer, compar_buffer, sizeof(compar_buffer)) != 0) { unsigned u; /* local counting variable */ for (u = 0; u < sizeof(compar_buffer); u++) { diff --git a/test/tmisc.c b/test/tmisc.c index eb0d115..3033613 100644 --- a/test/tmisc.c +++ b/test/tmisc.c @@ -2338,7 +2338,7 @@ misc13_insert_user_block(const char *old_name, const char *new_name, const char CHECK_PTR(user_block, "calloc"); /* Copy in the user block data */ - HDmemcpy(user_block, str, HDstrlen(str)); + memcpy(user_block, str, HDstrlen(str)); /* Open the new file */ new_fp = fopen(new_name, "wb"); @@ -2833,10 +2833,10 @@ test_misc16(void) /* Initialize the data */ /* (Note that these are supposed to stress the code, so are a little weird) */ - HDmemcpy(wdata[0], "1234567", MISC16_STR_SIZE); - HDmemcpy(wdata[1], "1234567\0", MISC16_STR_SIZE); - HDmemcpy(wdata[2], "12345678", MISC16_STR_SIZE); - HDmemcpy(wdata[3], "\0\0\0\0\0\0\0\0", MISC16_STR_SIZE); + memcpy(wdata[0], "1234567", MISC16_STR_SIZE); + memcpy(wdata[1], "1234567\0", MISC16_STR_SIZE); + memcpy(wdata[2], "12345678", MISC16_STR_SIZE); + memcpy(wdata[3], "\0\0\0\0\0\0\0\0", MISC16_STR_SIZE); /* Create the file */ file = H5Fcreate(MISC16_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); @@ -2921,10 +2921,10 @@ test_misc17(void) /* Initialize the data */ /* (Note that these are supposed to stress the code, so are a little weird) */ - HDmemcpy(wdata[0], "1234567", MISC17_SPACE_DIM2); - HDmemcpy(wdata[1], "1234567\0", MISC17_SPACE_DIM2); - HDmemcpy(wdata[2], "12345678", MISC17_SPACE_DIM2); - HDmemcpy(wdata[3], "\0\0\0\0\0\0\0\0", MISC17_SPACE_DIM2); + memcpy(wdata[0], "1234567", MISC17_SPACE_DIM2); + memcpy(wdata[1], "1234567\0", MISC17_SPACE_DIM2); + memcpy(wdata[2], "12345678", MISC17_SPACE_DIM2); + memcpy(wdata[3], "\0\0\0\0\0\0\0\0", MISC17_SPACE_DIM2); /* Create the file */ file = H5Fcreate(MISC17_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); diff --git a/test/trefer.c b/test/trefer.c index 72cbfe0..0aff270 100644 --- a/test/trefer.c +++ b/test/trefer.c @@ -1045,7 +1045,7 @@ test_reference_cmpnd_obj(void) CHECK(dataset, H5I_INVALID_HID, "H5Dcreate2"); /* Reset buffer for writing */ - HDmemset(&cmpnd_wbuf, 0, sizeof(cmpnd_wbuf)); + memset(&cmpnd_wbuf, 0, sizeof(cmpnd_wbuf)); /* Create reference to dataset */ ret = H5Rcreate_object(fid1, "/Group1/Dataset1", H5P_DEFAULT, &cmpnd_wbuf.ref0); diff --git a/test/trefer_deprec.c b/test/trefer_deprec.c index f6a7beb..f39e93c 100644 --- a/test/trefer_deprec.c +++ b/test/trefer_deprec.c @@ -1317,7 +1317,7 @@ test_reference_obj_deleted(void) VERIFY(dset2, FAIL, "H5Rdereference2"); /* Read selection from disk */ - HDmemset(&oref, 0, sizeof(hobj_ref_t)); + memset(&oref, 0, sizeof(hobj_ref_t)); ret = H5Dread(dataset, H5T_STD_REF_OBJ, H5S_ALL, H5S_ALL, H5P_DEFAULT, &oref); CHECK(ret, FAIL, "H5Dread"); @@ -1326,7 +1326,7 @@ test_reference_obj_deleted(void) VERIFY(dset2, FAIL, "H5Rdereference2"); /* Open nonsense reference */ - HDmemset(&oref, 0, sizeof(hobj_ref_t)); + memset(&oref, 0, sizeof(hobj_ref_t)); dset2 = H5Rdereference2(dataset, H5P_DEFAULT, H5R_OBJECT, &oref); VERIFY(dset2, FAIL, "H5Rdereference2"); diff --git a/test/trefstr.c b/test/trefstr.c index c9d585d..1895fb6 100644 --- a/test/trefstr.c +++ b/test/trefstr.c @@ -371,7 +371,7 @@ test_refstr_acat(void) /* Append a large string to ref-counted string */ large_str = malloc(1024); CHECK_PTR(large_str, "malloc"); - HDmemset(large_str, 'a', 1024); + memset(large_str, 'a', 1024); large_str[1023] = '\0'; ret = H5RS_acat(rs, large_str); CHECK(ret, FAIL, "H5RS_acat"); @@ -383,7 +383,7 @@ test_refstr_acat(void) large_str2 = malloc(1024 + 6); CHECK_PTR(large_str2, "malloc"); HDstrcpy(large_str2, "foobar"); - HDmemset(&large_str2[6], 'a', 1024); + memset(&large_str2[6], 'a', 1024); large_str2[1029] = '\0'; cmp = HDstrcmp(s, large_str2); VERIFY(cmp, 0, "HDstrcmp"); diff --git a/test/tselect.c b/test/tselect.c index e75c8d2..879f4f7 100644 --- a/test/tselect.c +++ b/test/tselect.c @@ -648,7 +648,7 @@ test_select_point(hid_t xfer_plist) /* Save points for later iteration */ /* (these are in the second half of the buffer, because we are prepending */ /* the next list of points to the beginning of the point selection list) */ - HDmemcpy(((char *)pi.coord) + sizeof(coord2), coord2, sizeof(coord2)); + memcpy(((char *)pi.coord) + sizeof(coord2), coord2, sizeof(coord2)); ret = (int)H5Sget_select_npoints(sid2); VERIFY(ret, 10, "H5Sget_select_npoints"); @@ -688,7 +688,7 @@ test_select_point(hid_t xfer_plist) VERIFY(ret, 20, "H5Sget_select_npoints"); /* Save points for later iteration */ - HDmemcpy(pi.coord, coord2, sizeof(coord2)); + memcpy(pi.coord, coord2, sizeof(coord2)); /* Create a dataset */ dataset = H5Dcreate2(fid1, SPACE1_NAME, H5T_NATIVE_UCHAR, sid1, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); @@ -1536,7 +1536,7 @@ test_select_hyper_contig(hid_t dset_type, hid_t xfer_plist) CHECK(ret, FAIL, "H5Dread"); /* Compare data read with data written out */ - if (HDmemcmp(rbuf, wbuf, sizeof(uint16_t) * 30 * 12) != 0) + if (memcmp(rbuf, wbuf, sizeof(uint16_t) * 30 * 12) != 0) TestErrPrintf("hyperslab values don't match! Line=%d\n", __LINE__); /* Close memory dataspace */ @@ -1679,7 +1679,7 @@ test_select_hyper_contig2(hid_t dset_type, hid_t xfer_plist) CHECK(ret, FAIL, "H5Dread"); /* Compare data read with data written out */ - if (HDmemcmp(rbuf, wbuf, sizeof(uint16_t) * 2 * SPACE8_DIM3 * SPACE8_DIM2 * SPACE8_DIM1) != 0) + if (memcmp(rbuf, wbuf, sizeof(uint16_t) * 2 * SPACE8_DIM3 * SPACE8_DIM2 * SPACE8_DIM1) != 0) TestErrPrintf("Error: hyperslab values don't match!\n"); /* Close memory dataspace */ @@ -2195,7 +2195,7 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co */ /* zero out the in-memory large cube */ - HDmemset(large_cube_buf_1, 0, large_cube_size * sizeof(uint16_t)); + memset(large_cube_buf_1, 0, large_cube_size * sizeof(uint16_t)); u = 0; do { @@ -2264,7 +2264,7 @@ test_select_hyper_contig_dr__run_test(int test_num, const uint16_t *cube_buf, co TestErrPrintf("large cube read from small cube has bad data! Line=%u\n", __LINE__); /* Zero out the buffer for the next pass */ - HDmemset(large_cube_buf_1 + start_index, 0, small_cube_size * sizeof(uint16_t)); + memset(large_cube_buf_1 + start_index, 0, small_cube_size * sizeof(uint16_t)); x++; } while ((large_rank >= 2) && (small_rank <= 1) && (x < edge_size)); @@ -3166,7 +3166,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ VERIFY(check, TRUE, "H5Sselect_shape_same"); /* zero the buffer that we will be using for reading */ - HDmemset(small_cube_buf_1, 0, sizeof(*small_cube_buf_1) * small_cube_size); + memset(small_cube_buf_1, 0, sizeof(*small_cube_buf_1) * small_cube_size); /* Read selection from disk */ ret = H5Dread(large_cube_dataset, H5T_NATIVE_UINT16, mem_small_cube_sid, @@ -3246,7 +3246,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ VERIFY(check, TRUE, "H5Sselect_shape_same"); /* zero out the in memory large cube */ - HDmemset(large_cube_buf_1, 0, sizeof(*large_cube_buf_1) * large_cube_size); + memset(large_cube_buf_1, 0, sizeof(*large_cube_buf_1) * large_cube_size); /* Read selection from disk */ ret = H5Dread(small_cube_dataset, H5T_NATIVE_UINT16, mem_large_cube_sid, @@ -3373,7 +3373,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ CHECK(ret, FAIL, "H5Dwrite"); /* zero the buffer that we will be using for reading */ - HDmemset(small_cube_buf_1, 0, sizeof(*small_cube_buf_1) * small_cube_size); + memset(small_cube_buf_1, 0, sizeof(*small_cube_buf_1) * small_cube_size); /* read the on disk small cube into memory */ ret = H5Dread(small_cube_dataset, H5T_NATIVE_UINT16, full_small_cube_sid, @@ -3469,7 +3469,7 @@ test_select_hyper_checker_board_dr__run_test(int test_num, const uint16_t *cube_ CHECK(ret, FAIL, "H5Dwrite"); /* zero out the in memory large cube */ - HDmemset(large_cube_buf_1, 0, sizeof(*large_cube_buf_1) * large_cube_size); + memset(large_cube_buf_1, 0, sizeof(*large_cube_buf_1) * large_cube_size); /* read the on disk large cube into memory */ ret = H5Dread(large_cube_dataset, H5T_NATIVE_UINT16, full_large_cube_sid, @@ -3786,7 +3786,7 @@ test_select_hyper_copy(void) CHECK(ret, FAIL, "H5Dread"); /* Compare data read with data written out */ - if (HDmemcmp(rbuf, rbuf2, sizeof(uint16_t) * SPACE3_DIM1 * SPACE3_DIM2) != 0) + if (memcmp(rbuf, rbuf2, sizeof(uint16_t) * SPACE3_DIM1 * SPACE3_DIM2) != 0) TestErrPrintf("hyperslab values don't match! Line=%d\n", __LINE__); /* Close memory dataspace */ @@ -3999,7 +3999,7 @@ test_select_point_copy(void) CHECK(ret, FAIL, "H5Dread"); /* Compare data read with data written out */ - if (HDmemcmp(rbuf, rbuf2, sizeof(uint16_t) * SPACE3_DIM1 * SPACE3_DIM2) != 0) + if (memcmp(rbuf, rbuf2, sizeof(uint16_t) * SPACE3_DIM1 * SPACE3_DIM2) != 0) TestErrPrintf("point values don't match!\n"); /* Close memory dataspace */ @@ -5260,7 +5260,7 @@ test_select_hyper_union_stagger(void) CHECK(error, FAIL, "H5Fclose"); /* Initialize input buffer */ - HDmemset(data_out, 0, 7 * 7 * sizeof(int)); + memset(data_out, 0, 7 * 7 * sizeof(int)); /* Open file */ file_id = H5Fopen(FILENAME, H5F_ACC_RDONLY, H5P_DEFAULT); @@ -6390,7 +6390,7 @@ test_select_hyper_union_random_5d(hid_t read_plist) } /* end if */ /* Set the read buffer back to all zeroes */ - HDmemset(rbuf, 0, (size_t)SPACE6_DIM1); + memset(rbuf, 0, (size_t)SPACE6_DIM1); } /* end for */ /* Close memory dataspace */ @@ -7122,7 +7122,7 @@ test_select_combine(void) VERIFY(nblocks, 1, "H5Sget_select_hyper_nblocks"); /* Retrieve the block defined */ - HDmemset(blocks, -1, sizeof(blocks)); /* Reset block list */ + memset(blocks, -1, sizeof(blocks)); /* Reset block list */ error = H5Sget_select_hyper_blocklist(space1, (hsize_t)0, (hsize_t)nblocks, (hsize_t *)blocks); CHECK(error, FAIL, "H5Sget_select_hyper_blocklist"); @@ -7157,7 +7157,7 @@ test_select_combine(void) VERIFY(nblocks, 2, "H5Sget_select_hyper_nblocks"); /* Retrieve the block defined */ - HDmemset(blocks, -1, sizeof(blocks)); /* Reset block list */ + memset(blocks, -1, sizeof(blocks)); /* Reset block list */ error = H5Sget_select_hyper_blocklist(space1, (hsize_t)0, (hsize_t)nblocks, (hsize_t *)blocks); CHECK(error, FAIL, "H5Sget_select_hyper_blocklist"); @@ -7196,7 +7196,7 @@ test_select_combine(void) VERIFY(nblocks, 2, "H5Sget_select_hyper_nblocks"); /* Retrieve the block defined */ - HDmemset(blocks, -1, sizeof(blocks)); /* Reset block list */ + memset(blocks, -1, sizeof(blocks)); /* Reset block list */ error = H5Sget_select_hyper_blocklist(space1, (hsize_t)0, (hsize_t)nblocks, (hsize_t *)blocks); CHECK(error, FAIL, "H5Sget_select_hyper_blocklist"); @@ -7255,7 +7255,7 @@ test_select_combine(void) VERIFY(nblocks, 1, "H5Sget_select_hyper_nblocks"); /* Retrieve the block defined */ - HDmemset(blocks, -1, sizeof(blocks)); /* Reset block list */ + memset(blocks, -1, sizeof(blocks)); /* Reset block list */ error = H5Sget_select_hyper_blocklist(space1, (hsize_t)0, (hsize_t)nblocks, (hsize_t *)blocks); CHECK(error, FAIL, "H5Sget_select_hyper_blocklist"); @@ -7310,7 +7310,7 @@ test_select_combine(void) VERIFY(nblocks, 1, "H5Sget_select_hyper_nblocks"); /* Retrieve the block defined */ - HDmemset(blocks, -1, sizeof(blocks)); /* Reset block list */ + memset(blocks, -1, sizeof(blocks)); /* Reset block list */ error = H5Sget_select_hyper_blocklist(space1, (hsize_t)0, (hsize_t)nblocks, (hsize_t *)blocks); CHECK(error, FAIL, "H5Sget_select_hyper_blocklist"); @@ -7365,7 +7365,7 @@ test_select_combine(void) VERIFY(nblocks, 1, "H5Sget_select_hyper_nblocks"); /* Retrieve the block defined */ - HDmemset(blocks, -1, sizeof(blocks)); /* Reset block list */ + memset(blocks, -1, sizeof(blocks)); /* Reset block list */ error = H5Sget_select_hyper_blocklist(space1, (hsize_t)0, (hsize_t)nblocks, (hsize_t *)blocks); CHECK(error, FAIL, "H5Sget_select_hyper_blocklist"); @@ -7550,14 +7550,14 @@ test_select_fill_point(hssize_t *offset) CHECK(ret, FAIL, "H5Sselect_elements"); if (offset != NULL) { - HDmemcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); + memcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); /* Set offset, if provided */ ret = H5Soffset_simple(sid1, real_offset); CHECK(ret, FAIL, "H5Soffset_simple"); } /* end if */ else - HDmemset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); + memset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); /* Set fill value */ fill_value = SPACE7_FILL; @@ -7654,14 +7654,14 @@ test_select_fill_hyper_simple(hssize_t *offset) CHECK(ret, FAIL, "H5Sselect_hyperslab"); if (offset != NULL) { - HDmemcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); + memcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); /* Set offset, if provided */ ret = H5Soffset_simple(sid1, real_offset); CHECK(ret, FAIL, "H5Soffset_simple"); } /* end if */ else - HDmemset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); + memset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); /* Set fill value */ fill_value = SPACE7_FILL; @@ -7769,14 +7769,14 @@ test_select_fill_hyper_regular(hssize_t *offset) CHECK(ret, FAIL, "H5Sselect_hyperslab"); if (offset != NULL) { - HDmemcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); + memcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); /* Set offset, if provided */ ret = H5Soffset_simple(sid1, real_offset); CHECK(ret, FAIL, "H5Soffset_simple"); } /* end if */ else - HDmemset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); + memset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); /* Set fill value */ fill_value = SPACE7_FILL; @@ -7893,14 +7893,14 @@ test_select_fill_hyper_irregular(hssize_t *offset) CHECK(ret, FAIL, "H5Sselect_hyperslab"); if (offset != NULL) { - HDmemcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); + memcpy(real_offset, offset, SPACE7_RANK * sizeof(hssize_t)); /* Set offset, if provided */ ret = H5Soffset_simple(sid1, real_offset); CHECK(ret, FAIL, "H5Soffset_simple"); } /* end if */ else - HDmemset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); + memset(real_offset, 0, SPACE7_RANK * sizeof(hssize_t)); /* Set fill value */ fill_value = SPACE7_FILL; @@ -14301,7 +14301,7 @@ test_hyper_unlim_check(hid_t sid, hsize_t *dims, hssize_t endpoints, hssize_t en CHECK(lim_sid, FAIL, "H5Scopy"); /* "And" lim_sid with dims to create limited selection */ - HDmemset(start, 0, sizeof(start)); + memset(start, 0, sizeof(start)); ret = H5Sselect_hyperslab(lim_sid, H5S_SELECT_AND, start, NULL, dims, NULL); CHECK(ret, FAIL, "H5Sselect_hyperslab"); @@ -14328,18 +14328,18 @@ test_hyper_unlim_check(hid_t sid, hsize_t *dims, hssize_t endpoints, hssize_t en /* Verify blocklist */ if (nblocks == (hssize_t)1) { - if (HDmemcmp(blocklist, eblock1, 6 * sizeof(eblock1[0])) != 0) + if (memcmp(blocklist, eblock1, 6 * sizeof(eblock1[0])) != 0) ERROR("H5Sget_select_hyper_blocklist"); } /* end if */ else { assert(nblocks == (hssize_t)2); - if (HDmemcmp(blocklist, eblock1, 6 * sizeof(eblock1[0])) != 0) { - if (HDmemcmp(blocklist, eblock2, 6 * sizeof(eblock2[0])) != 0) + if (memcmp(blocklist, eblock1, 6 * sizeof(eblock1[0])) != 0) { + if (memcmp(blocklist, eblock2, 6 * sizeof(eblock2[0])) != 0) ERROR("H5Sget_select_hyper_blocklist"); - if (HDmemcmp(&blocklist[6], eblock1, 6 * sizeof(eblock1[0])) != 0) + if (memcmp(&blocklist[6], eblock1, 6 * sizeof(eblock1[0])) != 0) ERROR("H5Sget_select_hyper_blocklist"); } /* end if */ - else if (HDmemcmp(&blocklist[6], eblock2, 6 * sizeof(eblock2[0])) != 0) + else if (memcmp(&blocklist[6], eblock2, 6 * sizeof(eblock2[0])) != 0) ERROR("H5Sget_select_hyper_blocklist"); } /* end else */ } /* end if */ @@ -15108,7 +15108,7 @@ test_irreg_io(void) CHECK(ret, FAIL, "H5Sselect_hyperslab"); /* Reset the buffer */ - HDmemset(rbuf, 0, sizeof(rbuf)); + memset(rbuf, 0, sizeof(rbuf)); /* Read selection from disk */ ret = H5Dread(did, H5T_NATIVE_UCHAR, mem_sid, sid, H5P_DEFAULT, rbuf); diff --git a/test/tskiplist.c b/test/tskiplist.c index 4541001..e94e3c0 100644 --- a/test/tskiplist.c +++ b/test/tskiplist.c @@ -92,13 +92,13 @@ test_skiplist_init(void) } /* end for */ /* Copy random values to sorted array */ - HDmemcpy(sort_rand_num, rand_num, sizeof(int) * NUM_ELEMS); + memcpy(sort_rand_num, rand_num, sizeof(int) * NUM_ELEMS); /* Sort random numbers */ qsort(sort_rand_num, (size_t)NUM_ELEMS, sizeof(int), tst_sort); /* Copy random values to reverse sorted array */ - HDmemcpy(rev_sort_rand_num, rand_num, sizeof(int) * NUM_ELEMS); + memcpy(rev_sort_rand_num, rand_num, sizeof(int) * NUM_ELEMS); /* Sort random numbers */ qsort(rev_sort_rand_num, (size_t)NUM_ELEMS, sizeof(int), tst_rev_sort); diff --git a/test/tsohm.c b/test/tsohm.c index 76a82f5..31dacd5 100644 --- a/test/tsohm.c +++ b/test/tsohm.c @@ -597,7 +597,7 @@ size1_helper(hid_t file, const char *filename, hid_t fapl_id, hbool_t test_file_ */ #define TSOHM_S1H_VERIFY_DATA(dset_id, dtype_id) \ { \ - HDmemset(&rdata, 0, sizeof(rdata)); \ + memset(&rdata, 0, sizeof(rdata)); \ if (0 > H5Dread((dset_id), (dtype_id), H5S_ALL, H5S_ALL, H5P_DEFAULT, &rdata)) { \ H5_FAILED(); \ AT(); \ @@ -619,7 +619,7 @@ size1_helper(hid_t file, const char *filename, hid_t fapl_id, hbool_t test_file_ test_file_closing = FALSE; /* Initialize wdata */ - HDmemset(&wdata, 0, sizeof(wdata)); + memset(&wdata, 0, sizeof(wdata)); wdata.i1 = 11; HDstrcpy(wdata.str, "string"); wdata.i2 = 22; @@ -632,7 +632,7 @@ size1_helper(hid_t file, const char *filename, hid_t fapl_id, hbool_t test_file_ wdata.f1 = 0.0F; /* Initialize rdata */ - HDmemset(&rdata, 0, sizeof(rdata)); + memset(&rdata, 0, sizeof(rdata)); dtype1_id = make_dtype_1(); if (dtype1_id < 0) @@ -1145,7 +1145,7 @@ sohm_attr_helper(hid_t fcpl_id) /* Verify */ attr_read_id = (op_index == 2) ? attr_id2 : attr_id; - HDmemset(rdata, 0, sizeof(rdata)); + memset(rdata, 0, sizeof(rdata)); ret = H5Aread(attr_read_id, H5T_NATIVE_INT, rdata); CHECK_I(ret, "H5Aread"); for (x = 0; x < (size_t)dims; ++x) @@ -1392,12 +1392,12 @@ size2_verify_plist1(hid_t plist) /* Check fill value */ dtype1_id = make_dtype_1(); CHECK_I(dtype1_id, "make_dtype_1"); - HDmemset(&fill1_correct, '1', sizeof(fill1_correct)); + memset(&fill1_correct, '1', sizeof(fill1_correct)); ret = H5Pget_fill_value(plist, dtype1_id, &fill1); CHECK_I(ret, "H5Pget_fill_value"); - ret = HDmemcmp(&fill1, &fill1_correct, sizeof(fill1_correct)); + ret = memcmp(&fill1, &fill1_correct, sizeof(fill1_correct)); VERIFY(ret, 0, "memcmp"); ret = H5Tclose(dtype1_id); @@ -1460,12 +1460,12 @@ size2_verify_plist2(hid_t plist) /* Check fill value */ dtype2_id = make_dtype_2(); CHECK_I(dtype2_id, "make_dtype_2"); - HDmemset(&fill2_correct, '2', (size_t)DTYPE2_SIZE); + memset(&fill2_correct, '2', (size_t)DTYPE2_SIZE); ret = H5Pget_fill_value(plist, dtype2_id, &fill2); CHECK_I(ret, "H5Pget_fill_value"); - ret = HDmemcmp(&fill2, &fill2_correct, (size_t)DTYPE2_SIZE); + ret = memcmp(&fill2, &fill2_correct, (size_t)DTYPE2_SIZE); VERIFY(ret, 0, "memcmp"); ret = H5Tclose(dtype2_id); @@ -1585,8 +1585,8 @@ size2_helper(hid_t fcpl_id, int test_file_closing, size2_helper_struct *ret_size /* fill1 and fill2 are fill values for the two datatypes. * We'll set them in the DCPL. */ - HDmemset(&fill1, '1', sizeof(dtype1_struct)); - HDmemset(&fill2, '2', (size_t)DTYPE2_SIZE); + memset(&fill1, '1', sizeof(dtype1_struct)); + memset(&fill2, '2', (size_t)DTYPE2_SIZE); dcpl1_id = H5Pcreate(H5P_DATASET_CREATE); CHECK_I(dcpl1_id, "H5Pcreate"); @@ -1629,8 +1629,8 @@ size2_helper(hid_t fcpl_id, int test_file_closing, size2_helper_struct *ret_size size2_verify_plist2(dcpl2_id); /* Set up attribute data */ - HDmemset(attr_string1, 0, (size_t)NAME_BUF_SIZE); - HDmemset(attr_string2, 0, (size_t)NAME_BUF_SIZE); + memset(attr_string1, 0, (size_t)NAME_BUF_SIZE); + memset(attr_string2, 0, (size_t)NAME_BUF_SIZE); HDstrcpy(attr_string1, LONG_STRING); HDstrcpy(attr_string2, LONG_STRING); attr_string2[1] = '1'; /* The second string starts "01 index..." */ @@ -2036,8 +2036,8 @@ size2_verify(void) group2_id = H5Gopen2(file_id, "interleaved group", H5P_DEFAULT); CHECK_I(group2_id, "H5Gopen2"); - HDmemset(attr_string, 0, (size_t)NAME_BUF_SIZE); - HDmemset(attr_correct_string, 0, (size_t)NAME_BUF_SIZE); + memset(attr_string, 0, (size_t)NAME_BUF_SIZE); + memset(attr_correct_string, 0, (size_t)NAME_BUF_SIZE); HDstrcpy(attr_correct_string, LONG_STRING); HDstrcpy(attr_name, "00 index"); diff --git a/test/ttsafe_dcreate.c b/test/ttsafe_dcreate.c index 7d194bf..42c3f6c 100644 --- a/test/ttsafe_dcreate.c +++ b/test/ttsafe_dcreate.c @@ -136,7 +136,7 @@ tts_dcreate_creator(void *_thread_data) hsize_t dimsf[1]; /* dataset dimensions */ struct thread_info thread_data; - HDmemcpy(&thread_data, _thread_data, sizeof(struct thread_info)); + memcpy(&thread_data, _thread_data, sizeof(struct thread_info)); /* define dataspace for dataset */ dimsf[0] = 1; diff --git a/test/tunicode.c b/test/tunicode.c index 114c79c..29a3cda 100644 --- a/test/tunicode.c +++ b/test/tunicode.c @@ -180,7 +180,7 @@ test_strpad(hid_t H5_ATTR_UNUSED fid, const char *string) cmpbuf[2 * small_len - 1] = '\0'; HDstrcpy(&cmpbuf[2 * small_len], new_string); - VERIFY(HDmemcmp(buf, cmpbuf, 2 * big_len), 0, "HDmemcmp"); + VERIFY(memcmp(buf, cmpbuf, 2 * big_len), 0, "memcmp"); /* Now convert from smaller datatype to bigger datatype. This should * leave our buffer looking like: "abc\0\0\0\0\0abc\0\0\0\0\0" */ @@ -188,12 +188,12 @@ test_strpad(hid_t H5_ATTR_UNUSED fid, const char *string) CHECK(ret, FAIL, "H5Tconvert"); /* First fill the buffer with NULLs */ - HDmemset(cmpbuf, '\0', (size_t)LONG_BUF_SIZE); + memset(cmpbuf, '\0', (size_t)LONG_BUF_SIZE); /* Copy in the characters */ HDstrncpy(cmpbuf, new_string, small_len - 1); HDstrncpy(&cmpbuf[big_len], new_string, small_len - 1); - VERIFY(HDmemcmp(buf, cmpbuf, 2 * big_len), 0, "HDmemcmp"); + VERIFY(memcmp(buf, cmpbuf, 2 * big_len), 0, "memcmp"); ret = H5Tclose(src_type); CHECK(ret, FAIL, "H5Tclose"); @@ -240,7 +240,7 @@ test_strpad(hid_t H5_ATTR_UNUSED fid, const char *string) HDstrncpy(&cmpbuf[small_len], new_string, small_len); HDstrncpy(&cmpbuf[2 * small_len], new_string, big_len); - VERIFY(HDmemcmp(buf, cmpbuf, 2 * big_len), 0, "HDmemcmp"); + VERIFY(memcmp(buf, cmpbuf, 2 * big_len), 0, "memcmp"); /* Now convert from smaller datatype to bigger datatype. This should * leave our buffer looking like: "abcd\0\0\0\0abcd\0\0\0\0" */ @@ -248,12 +248,12 @@ test_strpad(hid_t H5_ATTR_UNUSED fid, const char *string) CHECK(ret, FAIL, "H5Tconvert"); /* First fill the buffer with NULLs */ - HDmemset(cmpbuf, '\0', (size_t)LONG_BUF_SIZE); + memset(cmpbuf, '\0', (size_t)LONG_BUF_SIZE); /* Copy in the characters */ HDstrncpy(cmpbuf, new_string, small_len); HDstrncpy(&cmpbuf[big_len], new_string, small_len); - VERIFY(HDmemcmp(buf, cmpbuf, 2 * big_len), 0, "HDmemcmp"); + VERIFY(memcmp(buf, cmpbuf, 2 * big_len), 0, "memcmp"); ret = H5Tclose(src_type); CHECK(ret, FAIL, "H5Tclose"); @@ -285,7 +285,7 @@ test_strpad(hid_t H5_ATTR_UNUSED fid, const char *string) HDstrncpy(&cmpbuf[small_len], new_string, small_len); HDstrncpy(&cmpbuf[2 * small_len], new_string, big_len); - VERIFY(HDmemcmp(buf, cmpbuf, 2 * big_len), 0, "HDmemcmp"); + VERIFY(memcmp(buf, cmpbuf, 2 * big_len), 0, "memcmp"); /* Now convert from smaller datatype to bigger datatype. This should * leave our buffer looking like: "abcd abcd " */ @@ -293,12 +293,12 @@ test_strpad(hid_t H5_ATTR_UNUSED fid, const char *string) CHECK(ret, FAIL, "H5Tconvert"); /* First fill the buffer with spaces */ - HDmemset(cmpbuf, ' ', (size_t)LONG_BUF_SIZE); + memset(cmpbuf, ' ', (size_t)LONG_BUF_SIZE); /* Copy in the characters */ HDstrncpy(cmpbuf, new_string, small_len); HDstrncpy(&cmpbuf[big_len], new_string, small_len); - VERIFY(HDmemcmp(buf, cmpbuf, 2 * big_len), 0, "HDmemcmp"); + VERIFY(memcmp(buf, cmpbuf, 2 * big_len), 0, "memcmp"); ret = H5Tclose(src_type); CHECK(ret, FAIL, "H5Tclose"); @@ -585,7 +585,7 @@ test_compound(hid_t fid, const char *string) herr_t ret; /* Initialize compound data */ - HDmemset(&s1, 0, sizeof(s1_t)); /* To make purify happy */ + memset(&s1, 0, sizeof(s1_t)); /* To make purify happy */ s1.a = COMP_INT_VAL; s1.c = COMP_DOUBLE_VAL; s1.b = COMP_FLOAT_VAL; @@ -810,7 +810,7 @@ test_unicode(void) /* Create a random string with length NUM_CHARS */ HDsrandom((unsigned)HDtime(NULL)); - HDmemset(test_string, 0, sizeof(test_string)); + memset(test_string, 0, sizeof(test_string)); for (x = 0; x < NUM_CHARS; x++) { /* We need to avoid unprintable characters (codes 0-31) and the * . and / characters, since they aren't allowed in path names. diff --git a/test/tvlstr.c b/test/tvlstr.c index 2a8a28a..90d05d5 100644 --- a/test/tvlstr.c +++ b/test/tvlstr.c @@ -163,7 +163,7 @@ test_vlstrings_basic(void) CHECK(dataset, FAIL, "H5Dcreate2"); wdata2 = (char *)calloc((size_t)65534, sizeof(char)); - HDmemset(wdata2, 'A', (size_t)65533); + memset(wdata2, 'A', (size_t)65533); ret = H5Dwrite(dataset2, tid1, H5S_ALL, H5S_ALL, H5P_DEFAULT, &wdata2); CHECK(ret, FAIL, "H5Dwrite"); @@ -626,7 +626,7 @@ test_write_vl_string_attribute(void) CHECK(att, FAIL, "H5Acreate2"); string_att_write = (char *)calloc((size_t)8192, sizeof(char)); - HDmemset(string_att_write, 'A', (size_t)8191); + memset(string_att_write, 'A', (size_t)8191); ret = H5Awrite(att, type, &string_att_write); CHECK(ret, FAIL, "H5Awrite"); diff --git a/test/tvltypes.c b/test/tvltypes.c index 7bf06e0..2bc747c 100644 --- a/test/tvltypes.c +++ b/test/tvltypes.c @@ -1630,7 +1630,7 @@ test_vltypes_compound_vlen_atomic(void) CHECK(dcpl_pid, FAIL, "H5Pcreate"); /* Set the fill value for the second dataset */ - HDmemset(&fill, 0, sizeof(s1)); + memset(&fill, 0, sizeof(s1)); ret = H5Pset_fill_value(dcpl_pid, tid2, &fill); CHECK(ret, FAIL, "H5Pset_fill_value"); @@ -2832,7 +2832,7 @@ test_vltypes_fill_value(void) CHECK(ret, FAIL, "H5Treclaim"); /* Clear the read buffer */ - HDmemset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); + memset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); /* Read in non-contiguous selection from 'empty' dataset of fill value */ ret = H5Dread(dset_id, dtype1_id, dset_select_dspace_id, dset_select_dspace_id, xfer_pid, rbuf); @@ -2890,7 +2890,7 @@ test_vltypes_fill_value(void) CHECK(ret, FAIL, "H5Treclaim"); /* Clear the read buffer */ - HDmemset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); + memset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); /* Read in non-contiguous selection from 'empty' dataset of fill value */ ret = H5Dread(dset_id, dtype1_id, dset_select_dspace_id, dset_select_dspace_id, xfer_pid, rbuf); @@ -3045,7 +3045,7 @@ test_vltypes_fill_value(void) CHECK(ret, FAIL, "H5Treclaim"); /* Clear the read buffer */ - HDmemset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); + memset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); /* Read in non-contiguous selection from dataset */ ret = H5Dread(dset_id, dtype1_id, dset_select_dspace_id, dset_select_dspace_id, xfer_pid, rbuf); @@ -3133,7 +3133,7 @@ test_vltypes_fill_value(void) CHECK(ret, FAIL, "H5Treclaim"); /* Clear the read buffer */ - HDmemset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); + memset(rbuf, 0, dset_elmts * sizeof(dtype1_struct)); /* Read in non-contiguous selection from dataset */ ret = H5Dread(dset_id, dtype1_id, dset_select_dspace_id, dset_select_dspace_id, xfer_pid, rbuf); diff --git a/test/twriteorder.c b/test/twriteorder.c index ceb3e6c..c542161 100644 --- a/test/twriteorder.c +++ b/test/twriteorder.c @@ -266,10 +266,10 @@ write_wo_file(void) blkaddr = i * part_size_g + i; /* store old block address in byte 0-3 */ - HDmemcpy(&buffer[0], &blkaddr_old, sizeof(blkaddr_old)); + memcpy(&buffer[0], &blkaddr_old, sizeof(blkaddr_old)); /* fill the rest with the lowest byte of i */ - HDmemset(&buffer[4], i & 0xff, (size_t)(BLOCKSIZE_DFT - 4)); + memset(&buffer[4], i & 0xff, (size_t)(BLOCKSIZE_DFT - 4)); /* write the block */ HDlseek(write_fd_g, (HDoff_t)blkaddr, SEEK_SET); @@ -326,7 +326,7 @@ read_wo_file(void) } /* retrieve the block address in byte 0-3 */ - HDmemcpy(&blkaddr, &buffer[0], sizeof(blkaddr)); + memcpy(&blkaddr, &buffer[0], sizeof(blkaddr)); } return 0; diff --git a/test/use_append_chunk.c b/test/use_append_chunk.c index b173707..4f64a66 100644 --- a/test/use_append_chunk.c +++ b/test/use_append_chunk.c @@ -76,7 +76,7 @@ int setup_parameters(int argc, char *const argv[], options_t *opts) { /* use case defaults */ - HDmemset(opts, 0, sizeof(options_t)); + memset(opts, 0, sizeof(options_t)); opts->chunksize = Chunksize_DFT; opts->use_swmr = TRUE; /* use swmr open */ opts->iterations = 1; diff --git a/test/use_append_chunk_mirror.c b/test/use_append_chunk_mirror.c index ce44c3c..0620c68 100644 --- a/test/use_append_chunk_mirror.c +++ b/test/use_append_chunk_mirror.c @@ -116,7 +116,7 @@ int setup_parameters(int argc, char *const argv[], options_t *opts) { /* use case defaults */ - HDmemset(opts, 0, sizeof(options_t)); + memset(opts, 0, sizeof(options_t)); opts->chunksize = Chunksize_DFT; opts->use_swmr = TRUE; opts->iterations = 1; diff --git a/test/use_append_mchunks.c b/test/use_append_mchunks.c index c6fa39d..15f2f2a 100644 --- a/test/use_append_mchunks.c +++ b/test/use_append_mchunks.c @@ -68,7 +68,7 @@ int setup_parameters(int argc, char *const argv[], options_t *opts) { /* use case defaults */ - HDmemset(opts, 0, sizeof(options_t)); + memset(opts, 0, sizeof(options_t)); opts->chunksize = Chunksize_DFT; opts->use_swmr = 1; /* use swmr open */ opts->iterations = 1; @@ -1331,7 +1331,7 @@ test_vds_prefix_first(unsigned config, hid_t vds_fapl, hid_t src_fapl) } /* Read data through virtual dataset */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(vdset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR_SUPPRESSED; @@ -1369,7 +1369,7 @@ test_vds_prefix_first(unsigned config, hid_t vds_fapl, hid_t src_fapl) } /* Read data directly from source dataset */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(srcdset[0], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR_SUPPRESSED; @@ -1602,7 +1602,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) } /* Read data through virtual dataset */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(vdset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR_SUPPRESSED; @@ -1631,7 +1631,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) } /* Read data directly from source dataset */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(srcdset[0], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR_SUPPRESSED; @@ -1774,7 +1774,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) } /* Read data through virtual dataset */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(vdset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR_SUPPRESSED; @@ -1805,7 +1805,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) } /* Read data directly from source datasets */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(srcdset[0], H5T_NATIVE_INT, vspace[0], H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR_SUPPRESSED; if (H5Dread(srcdset[1], H5T_NATIVE_INT, vspace[1], H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) @@ -1868,7 +1868,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Read data through copied virtual dataset */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(vdset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR_SUPPRESSED; @@ -1946,7 +1946,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Read data through copied virtual dataset */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(vdset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR_SUPPRESSED; @@ -2116,7 +2116,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) } /* Read data through virtual dataset */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(vdset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR_SUPPRESSED; @@ -2147,7 +2147,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) } /* Read data directly from source datasets */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); offset[1] = -3; if (H5Soffset_simple(vspace[0], offset) < 0) TEST_ERROR_SUPPRESSED; @@ -2301,7 +2301,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) } /* Read first source dataset through virtual dataset */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(vdset, H5T_NATIVE_INT, vspace[0], vspace[0], H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR_SUPPRESSED; @@ -2312,7 +2312,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Read second source dataset through virtual dataset */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(vdset, H5T_NATIVE_INT, vspace[1], vspace[1], H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR_SUPPRESSED; @@ -2352,7 +2352,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) } /* Read data directly from source datasets */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(srcdset[0], H5T_NATIVE_INT, vspace[0], H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR_SUPPRESSED; if (H5Dread(srcdset[1], H5T_NATIVE_INT, vspace[1], H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) @@ -2535,7 +2535,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset by hyperslab */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Read first slice */ if (H5Dread(vdset, H5T_NATIVE_INT, vspace[0], srcspace[0], H5P_DEFAULT, rbuf[0]) < 0) @@ -2615,7 +2615,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data directly from source datasets */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Read first dataset */ if (H5Dread(srcdset[0], H5T_NATIVE_INT, srcspace[0], srcspace[0], H5P_DEFAULT, rbuf[0]) < 0) @@ -2840,7 +2840,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset by hyperslab */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Read first stripe pattern */ if (H5Dread(vdset, H5T_NATIVE_INT, memspace, srcspace[0], H5P_DEFAULT, rbuf[0]) < 0) @@ -2911,7 +2911,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data directly from source datasets */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Read first dataset */ if (H5Dread(srcdset[0], H5T_NATIVE_INT, memspace, srcspace[0], H5P_DEFAULT, rbuf[0]) < 0) @@ -3166,7 +3166,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -3178,7 +3178,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset by hyperslab */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select stripe */ start[0] = 0; @@ -3197,7 +3197,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Update erbuf */ - HDmemset(erbuf, 0, sizeof(erbuf)); + memset(erbuf, 0, sizeof(erbuf)); for (i = 0; i < 9; i++) for (j = 0; j < 3; j++) erbuf[i][j] = fill; @@ -3219,7 +3219,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select stripe */ start[0] = 0; @@ -3273,7 +3273,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select stripe */ start[0] = 0; @@ -3398,7 +3398,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Update erbuf */ - HDmemset(erbuf, 0, sizeof(erbuf)); + memset(erbuf, 0, sizeof(erbuf)); erbuf[0][0] = buf[0][0]; erbuf[0][1] = buf[0][1]; erbuf[0][8] = buf[0][2]; @@ -3549,7 +3549,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Read dataset */ if (H5Dread(srcdset[0], H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) @@ -3682,7 +3682,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Reset erbuf */ - HDmemset(erbuf[0], 0, sizeof(rbuf)); + memset(erbuf[0], 0, sizeof(rbuf)); /* Populate write buffer */ for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++) @@ -3782,7 +3782,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Read data through virtual dataset */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(vdset, H5T_NATIVE_INT, memspace, vspace[0], H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR_SUPPRESSED; @@ -3915,7 +3915,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Reset erbuf */ - HDmemset(erbuf[0], 0, sizeof(rbuf)); + memset(erbuf[0], 0, sizeof(rbuf)); /* Populate write buffer */ for (i = 0; i < (int)(sizeof(buf) / sizeof(buf[0])); i++) @@ -4039,7 +4039,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Read data through virtual dataset */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR_SUPPRESSED; @@ -4176,7 +4176,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Initialize erbuf */ - HDmemset(erbuf[0], 0, sizeof(rbuf)); + memset(erbuf[0], 0, sizeof(rbuf)); for (i = 0; i < 10; i++) for (j = 0; j < 24; j += 6) { erbuf[i][j] = -1; @@ -4291,7 +4291,7 @@ test_basic_io(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Read data through virtual dataset */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(vdset, H5T_NATIVE_INT, memspace, vspace[0], H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR_SUPPRESSED; @@ -4611,7 +4611,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -4687,7 +4687,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Read data */ if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) @@ -4793,7 +4793,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[1] = 0; @@ -4863,7 +4863,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[1] = 0; @@ -4977,7 +4977,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[1] = 0; @@ -4995,7 +4995,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Now just read middle 2 rows */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); start[0] = 4; count[0] = 2; count[1] = 20; @@ -5031,7 +5031,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -5057,7 +5057,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -5087,7 +5087,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -5153,7 +5153,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -5192,7 +5192,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[1] = 0; @@ -5222,7 +5222,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -5252,7 +5252,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -5479,7 +5479,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -5542,7 +5542,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Read data */ if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) @@ -5653,7 +5653,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -5721,7 +5721,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -5834,7 +5834,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -5851,7 +5851,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) TEST_ERROR_SUPPRESSED; /* Now just read middle 2 rows */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); start[0] = 4; count[0] = 2; count[1] = 20; @@ -5920,7 +5920,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -6200,7 +6200,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -6263,7 +6263,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Read data */ if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) @@ -6368,7 +6368,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -6439,7 +6439,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -6555,7 +6555,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -6618,7 +6618,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -6732,7 +6732,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -6791,7 +6791,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -6813,7 +6813,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) } /* Now just read middle 2 rows */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); start[0] = 4; count[0] = 2; count[1] = 19; @@ -7048,7 +7048,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -7113,7 +7113,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Read data */ if (H5Dread(vdset, H5T_NATIVE_INT, memspace, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) @@ -7218,7 +7218,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -7283,7 +7283,7 @@ test_unlim(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -7675,7 +7675,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -7771,7 +7771,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -7797,7 +7797,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) for (start[1] = (hsize_t)0; start[1] < (hsize_t)5; start[1]++) for (count[1] = (hsize_t)1; count[1] < (hsize_t)11; count[1]++) { /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, count, NULL) < 0) @@ -8183,7 +8183,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -8258,7 +8258,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -8327,7 +8327,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -8396,7 +8396,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -8465,7 +8465,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -8528,7 +8528,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -8751,7 +8751,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -8848,7 +8848,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -9061,7 +9061,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -9158,7 +9158,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -9427,7 +9427,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -9526,7 +9526,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -9590,7 +9590,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -9689,7 +9689,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -9753,7 +9753,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -9817,7 +9817,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -10108,7 +10108,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -10172,7 +10172,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -10275,7 +10275,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -10338,7 +10338,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -10438,7 +10438,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -10475,7 +10475,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -10504,7 +10504,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -10532,7 +10532,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -10596,7 +10596,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -10633,7 +10633,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -10662,7 +10662,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -10690,7 +10690,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -10929,7 +10929,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -10992,7 +10992,7 @@ test_printf(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ if (H5Sselect_hyperslab(memspace, H5S_SELECT_SET, start, NULL, dims, NULL) < 0) @@ -11383,7 +11383,7 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -11491,7 +11491,7 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -11596,7 +11596,7 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -11713,7 +11713,7 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -11818,7 +11818,7 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -11936,7 +11936,7 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; @@ -12041,7 +12041,7 @@ test_all(unsigned config, hid_t vds_fapl, hid_t src_fapl) /* Read data through virtual dataset */ /* Reset rbuf */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); /* Select hyperslab in memory space */ start[0] = 0; diff --git a/test/vds_env.c b/test/vds_env.c index 41bcb42..256455e 100644 --- a/test/vds_env.c +++ b/test/vds_env.c @@ -196,7 +196,7 @@ test_vds_prefix_second(unsigned config, hid_t fapl) } /* Read data through virtual dataset */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(vdset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR; @@ -234,7 +234,7 @@ test_vds_prefix_second(unsigned config, hid_t fapl) } /* Read data directly from source dataset */ - HDmemset(rbuf[0], 0, sizeof(rbuf)); + memset(rbuf[0], 0, sizeof(rbuf)); if (H5Dread(srcdset[0], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[0]) < 0) TEST_ERROR; @@ -489,7 +489,7 @@ test_core(void) for (i = 0; i < CORE_DSET_DIM1; i++) for (j = 0; j < CORE_DSET_DIM2; j++) *pw++ = val++; - HDmemset(data_r, 0, DSET1_DIM1 * DSET1_DIM2 * sizeof(int)); + memset(data_r, 0, DSET1_DIM1 * DSET1_DIM2 * sizeof(int)); /* Create the dataspace */ dims[0] = CORE_DSET_DIM1; @@ -580,7 +580,7 @@ test_core(void) TEST_ERROR; /* Read the data back from the dataset */ - HDmemset(data_r, 0, DSET1_DIM1 * DSET1_DIM2 * sizeof(int)); + memset(data_r, 0, DSET1_DIM1 * DSET1_DIM2 * sizeof(int)); if (H5Dread(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data_r) < 0) TEST_ERROR; @@ -1495,11 +1495,11 @@ test_multi(void) if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) TEST_ERROR; - 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)); - HDmemset(sv, 0, sizeof(sv)); + 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)); + memset(sv, 0, sizeof(sv)); for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt++) { memb_fapl[mt] = H5P_DEFAULT; @@ -1744,11 +1744,11 @@ test_multi_compat(void) if ((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) TEST_ERROR; - 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); - HDmemset(sv, 0, sizeof sv); + 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); + memset(sv, 0, sizeof sv); for (mt = H5FD_MEM_DEFAULT; mt < H5FD_MEM_NTYPES; mt++) memb_map[mt] = H5FD_MEM_SUPER; @@ -2951,7 +2951,7 @@ splitter_compare_expected_data(hid_t file_id, const struct splitter_dataset_def if (sizeof((void *)buf) != sizeof(data->buf)) { SPLITTER_TEST_FAULT("invariant size of expected data does not match that received!\n"); } - HDmemcpy(expected, data->buf, sizeof(expected)); + memcpy(expected, data->buf, sizeof(expected)); dset_id = H5Dopen2(file_id, data->dset_name, H5P_DEFAULT); if (dset_id < 0) { diff --git a/test/vfd_plugin.c b/test/vfd_plugin.c index fab3c96..28aa769 100644 --- a/test/vfd_plugin.c +++ b/test/vfd_plugin.c @@ -291,7 +291,7 @@ test_get_config_str(void) TEST_ERROR; /* Try to retrieve length of default configuration string - should be 0 */ - HDmemset(config_str_buf, 0, 128); + memset(config_str_buf, 0, 128); if ((config_str_len = H5Pget_driver_config_str(fapl_id, config_str_buf, 128)) < 0) TEST_ERROR; @@ -349,7 +349,7 @@ test_env_var(void) TESTING("Loading of VFD plugin with HDF5_DRIVER environment variable"); /* Try to retrieve length of default configuration string - should be 0 */ - HDmemset(config_str_buf, 0, 128); + memset(config_str_buf, 0, 128); if ((config_str_len = H5Pget_driver_config_str(H5P_FILE_ACCESS_DEFAULT, config_str_buf, 128)) < 0) TEST_ERROR; @@ -379,7 +379,7 @@ test_env_var(void) TEST_ERROR; /* Check driver configuration string */ - HDmemset(config_str_buf, 0, 128); + memset(config_str_buf, 0, 128); if ((config_str_len = H5Pget_driver_config_str(H5P_FILE_ACCESS_DEFAULT, config_str_buf, 128)) < 0) TEST_ERROR; if (HDstrlen(config_str) != config_str_len) @@ -717,7 +717,7 @@ test_vol_registration(void) /* Test registering a VOL connector with an incompatible version # */ if (NULL == (bad_fake_vol_class = malloc(sizeof(H5VL_class_t)))) TEST_ERROR; - HDmemcpy(bad_fake_vol_class, &fake_vol_g, sizeof(H5VL_class_t)); + memcpy(bad_fake_vol_class, &fake_vol_g, sizeof(H5VL_class_t)); bad_fake_vol_class->version = H5VL_VERSION + 1; H5E_BEGIN_TRY { diff --git a/testpar/API/t_bigio.c b/testpar/API/t_bigio.c index 620712f..0184c3a 100644 --- a/testpar/API/t_bigio.c +++ b/testpar/API/t_bigio.c @@ -787,7 +787,7 @@ dataset_big_read(void) wdata = (B_DATATYPE *)malloc(bigcount * sizeof(B_DATATYPE)); VRFY_G((wdata != NULL), "wdata malloc succeeded"); - HDmemset(rdata, 0, bigcount * sizeof(B_DATATYPE)); + memset(rdata, 0, bigcount * sizeof(B_DATATYPE)); /* setup file access template */ acc_tpl = H5Pcreate(H5P_FILE_ACCESS); @@ -867,7 +867,7 @@ dataset_big_read(void) if (mpi_rank_g == 0) printf("\nRead Testing Dataset2 by ROW\n"); - HDmemset(rdata, 0, bigcount * sizeof(B_DATATYPE)); + memset(rdata, 0, bigcount * sizeof(B_DATATYPE)); dataset = H5Dopen2(fid, DATASET2, H5P_DEFAULT); VRFY_G((dataset >= 0), "H5Dopen2 succeeded"); @@ -930,7 +930,7 @@ dataset_big_read(void) if (mpi_rank_g == 0) printf("\nRead Testing Dataset3 read select ALL proc 0, NONE others\n"); - HDmemset(rdata, 0, bigcount * sizeof(B_DATATYPE)); + memset(rdata, 0, bigcount * sizeof(B_DATATYPE)); dataset = H5Dopen2(fid, DATASET3, H5P_DEFAULT); VRFY_G((dataset >= 0), "H5Dopen2 succeeded"); @@ -1153,7 +1153,7 @@ single_rank_independent_io(void) VRFY_G((ret >= 0), "H5Dwrite succeeded"); /* Wipe buffer */ - HDmemset(data, 0, dims[0] * sizeof(int)); + memset(data, 0, dims[0] * sizeof(int)); /* Read data back */ ret = H5Dread(dset_id, H5T_NATIVE_INT, H5S_BLOCK, fspace_id, H5P_DEFAULT, data); diff --git a/testpar/API/t_chunk_alloc.c b/testpar/API/t_chunk_alloc.c index 8dd31e3..37ea2fa 100644 --- a/testpar/API/t_chunk_alloc.c +++ b/testpar/API/t_chunk_alloc.c @@ -112,7 +112,7 @@ create_chunked_dataset(const char *filename, int chunk_factor, write_type write_ VRFY((dataset >= 0), ""); if (write_pattern == sec_last) { - HDmemset(buffer, 100, CHUNK_SIZE); + memset(buffer, 100, CHUNK_SIZE); count[0] = 1; stride[0] = 1; @@ -238,7 +238,7 @@ parallel_access_dataset(const char *filename, int chunk_factor, access_type acti /* all chunks are written by all the processes in an interleaved way*/ case write_all: - HDmemset(buffer, mpi_rank + 1, CHUNK_SIZE); + memset(buffer, mpi_rank + 1, CHUNK_SIZE); count[0] = 1; stride[0] = 1; block[0] = chunk_dims[0]; @@ -372,7 +372,7 @@ verify_data(const char *filename, int chunk_factor, write_type write_pattern, in block[0] = chunk_dims[0]; for (i = 0; i < nchunks; i++) { /* reset buffer values */ - HDmemset(buffer, -1, CHUNK_SIZE); + memset(buffer, -1, CHUNK_SIZE); offset[0] = (hsize_t)i * chunk_dims[0]; diff --git a/testpar/API/t_coll_md_read.c b/testpar/API/t_coll_md_read.c index 805e2b7..0b019c1 100644 --- a/testpar/API/t_coll_md_read.c +++ b/testpar/API/t_coll_md_read.c @@ -205,9 +205,9 @@ test_partial_no_selection_coll_md_read(void) * Check data integrity just to be sure. */ if (!PARTIAL_NO_SELECTION_NO_SEL_PROCESS) { - VRFY((!HDmemcmp(data, read_buf, - count[1] * (PARTIAL_NO_SELECTION_Y_DIM_SCALE * PARTIAL_NO_SELECTION_X_DIM_SCALE) * - sizeof(int))), + VRFY((!memcmp(data, read_buf, + count[1] * (PARTIAL_NO_SELECTION_Y_DIM_SCALE * PARTIAL_NO_SELECTION_X_DIM_SCALE) * + sizeof(int))), "memcmp succeeded"); } diff --git a/testpar/API/t_dset.c b/testpar/API/t_dset.c index 984e770..14f9233 100644 --- a/testpar/API/t_dset.c +++ b/testpar/API/t_dset.c @@ -3821,11 +3821,11 @@ test_no_collective_cause_mode(int selection_mode) "reading and writing are the same for global cause of Broken Collective I/O"); /* Test values */ - HDmemset(message, 0, sizeof(message)); + memset(message, 0, sizeof(message)); HDsnprintf(message, sizeof(message), "Local cause of Broken Collective I/O has the correct value for %s.\n", test_name); VRFY((no_collective_cause_local_write == no_collective_cause_local_expected), message); - HDmemset(message, 0, sizeof(message)); + memset(message, 0, sizeof(message)); HDsnprintf(message, sizeof(message), "Global cause of Broken Collective I/O has the correct value for %s.\n", test_name); VRFY((no_collective_cause_global_write == no_collective_cause_global_expected), message); diff --git a/testpar/API/t_file.c b/testpar/API/t_file.c index 3c1247f..ccd4e6e 100644 --- a/testpar/API/t_file.c +++ b/testpar/API/t_file.c @@ -557,7 +557,7 @@ create_file(const char *filename, hid_t fcpl, hid_t fapl, int metadata_write_str ret = H5Dclose(dset_id); VRFY((ret == 0), ""); - HDmemset(data_array, 0, num_elements * sizeof(DATATYPE)); + memset(data_array, 0, num_elements * sizeof(DATATYPE)); dset_id = H5Dopen2(grp_id, dset_name, H5P_DEFAULT); VRFY((dset_id >= 0), ""); diff --git a/testpar/API/t_mdset.c b/testpar/API/t_mdset.c index e0e1c07..cc49e7b 100644 --- a/testpar/API/t_mdset.c +++ b/testpar/API/t_mdset.c @@ -730,7 +730,7 @@ dataset_fillvalue(void) VRFY((ret >= 0), "H5Pset_dxpl_mpio succeeded"); /* set entire read buffer with the constant 2 */ - HDmemset(rdata, 2, (size_t)(dset_size * sizeof(int))); + memset(rdata, 2, (size_t)(dset_size * sizeof(int))); /* Read the entire dataset back */ ret = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, rdata); @@ -820,7 +820,7 @@ dataset_fillvalue(void) VRFY((ret >= 0), "H5Pset_dxpl_mpio succeeded"); /* set entire read buffer with the constant 2 */ - HDmemset(rdata, 2, (size_t)(dset_size * sizeof(int))); + memset(rdata, 2, (size_t)(dset_size * sizeof(int))); /* Read the entire dataset back */ ret = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, rdata); diff --git a/testpar/API/t_shapesame.c b/testpar/API/t_shapesame.c index 443a7e0..621c336 100644 --- a/testpar/API/t_shapesame.c +++ b/testpar/API/t_shapesame.c @@ -236,18 +236,18 @@ hs_dr_pio_test__setup(const int test_num, const int edge_size, const int checker ptr_0 = tv_ptr->small_ds_buf_0; for (i = 0; i < (int)(tv_ptr->small_ds_size); i++) *ptr_0++ = (uint32_t)i; - HDmemset(tv_ptr->small_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->small_ds_size); - HDmemset(tv_ptr->small_ds_buf_2, 0, sizeof(uint32_t) * tv_ptr->small_ds_size); + memset(tv_ptr->small_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->small_ds_size); + memset(tv_ptr->small_ds_buf_2, 0, sizeof(uint32_t) * tv_ptr->small_ds_size); - HDmemset(tv_ptr->small_ds_slice_buf, 0, sizeof(uint32_t) * tv_ptr->small_ds_slice_size); + memset(tv_ptr->small_ds_slice_buf, 0, sizeof(uint32_t) * tv_ptr->small_ds_slice_size); ptr_0 = tv_ptr->large_ds_buf_0; for (i = 0; i < (int)(tv_ptr->large_ds_size); i++) *ptr_0++ = (uint32_t)i; - HDmemset(tv_ptr->large_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->large_ds_size); - HDmemset(tv_ptr->large_ds_buf_2, 0, sizeof(uint32_t) * tv_ptr->large_ds_size); + memset(tv_ptr->large_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->large_ds_size); + memset(tv_ptr->large_ds_buf_2, 0, sizeof(uint32_t) * tv_ptr->large_ds_size); - HDmemset(tv_ptr->large_ds_slice_buf, 0, sizeof(uint32_t) * tv_ptr->large_ds_slice_size); + memset(tv_ptr->large_ds_slice_buf, 0, sizeof(uint32_t) * tv_ptr->large_ds_slice_size); filename = filenames[0]; /* (const char *)GetTestParameters(); */ assert(filename != NULL); @@ -738,7 +738,7 @@ contig_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) } /* zero out the buffer we will be reading into */ - HDmemset(tv_ptr->small_ds_slice_buf, 0, sizeof(uint32_t) * tv_ptr->small_ds_slice_size); + memset(tv_ptr->small_ds_slice_buf, 0, sizeof(uint32_t) * tv_ptr->small_ds_slice_size); #if CONTIG_HS_DR_PIO_TEST__D2M_L2S__DEBUG fprintf(stdout, "%s reading slices from big cube on disk into small cube slice.\n", fcnName); @@ -951,7 +951,7 @@ contig_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) #endif /* CONTIG_HS_DR_PIO_TEST__D2M_S2L__DEBUG */ /* zero out the in memory large ds */ - HDmemset(tv_ptr->large_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->large_ds_size); + memset(tv_ptr->large_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->large_ds_size); /* set up start, stride, count, and block -- note that we will * change start[] so as to read slices of the large cube. @@ -1220,7 +1220,7 @@ contig_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) } /* zero out the in memory small ds */ - HDmemset(tv_ptr->small_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->small_ds_size); + memset(tv_ptr->small_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->small_ds_size); #if CONTIG_HS_DR_PIO_TEST__M2D_L2S__DEBUG fprintf(stdout, "%s writing slices from big ds to slices of small ds on disk.\n", fcnName); @@ -1493,7 +1493,7 @@ contig_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) } /* zero out the in memory large ds */ - HDmemset(tv_ptr->large_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->large_ds_size); + memset(tv_ptr->large_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->large_ds_size); #if CONTIG_HS_DR_PIO_TEST__M2D_S2L__DEBUG fprintf(stdout, "%s writing process slices of small ds to slices of large ds on disk.\n", fcnName); @@ -2578,7 +2578,7 @@ ckrbrd_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) sel_start); /* zero out the buffer we will be reading into */ - HDmemset(tv_ptr->small_ds_slice_buf, 0, sizeof(uint32_t) * tv_ptr->small_ds_slice_size); + memset(tv_ptr->small_ds_slice_buf, 0, sizeof(uint32_t) * tv_ptr->small_ds_slice_size); #if CHECKER_BOARD_HS_DR_PIO_TEST__D2M_L2S__DEBUG fprintf(stdout, "%s:%d: initial small_ds_slice_buf = ", fcnName, tv_ptr->mpi_rank); @@ -2810,7 +2810,7 @@ ckrbrd_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__D2M_S2L__DEBUG */ /* zero out the buffer we will be reading into */ - HDmemset(tv_ptr->large_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->large_ds_size); + memset(tv_ptr->large_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->large_ds_size); /* set up start, stride, count, and block -- note that we will * change start[] so as to read the slice of the small data set @@ -3134,7 +3134,7 @@ ckrbrd_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) } /* zero out the in memory small ds */ - HDmemset(tv_ptr->small_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->small_ds_size); + memset(tv_ptr->small_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->small_ds_size); #if CHECKER_BOARD_HS_DR_PIO_TEST__M2D_L2S__DEBUG fprintf(stdout, @@ -3431,7 +3431,7 @@ ckrbrd_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) } /* zero out the in memory large ds */ - HDmemset(tv_ptr->large_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->large_ds_size); + memset(tv_ptr->large_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->large_ds_size); #if CHECKER_BOARD_HS_DR_PIO_TEST__M2D_S2L__DEBUG fprintf(stdout, @@ -4334,7 +4334,7 @@ main(int argc, char **argv) } #if 0 - HDmemset(filenames, 0, sizeof(filenames)); + memset(filenames, 0, sizeof(filenames)); for (int i = 0; i < NFILENAME; i++) { if (NULL == (filenames[i] = malloc(PATH_MAX))) { printf("couldn't allocate filename array\n"); diff --git a/testpar/API/t_span_tree.c b/testpar/API/t_span_tree.c index d57392a..b66b72c 100644 --- a/testpar/API/t_span_tree.c +++ b/testpar/API/t_span_tree.c @@ -320,7 +320,7 @@ coll_write_test(int chunk_factor) matrix_out = (int *)malloc(sizeof(int) * (size_t)mdim[0] * (size_t)mdim[1] * (size_t)mpi_size); matrix_out1 = (int *)malloc(sizeof(int) * (size_t)mdim[0] * (size_t)mdim[1] * (size_t)mpi_size); - HDmemset(vector, 0, sizeof(int) * (size_t)mdim1[0] * (size_t)mpi_size); + memset(vector, 0, sizeof(int) * (size_t)mdim1[0] * (size_t)mpi_size); vector[0] = vector[MSPACE1_DIM * mpi_size - 1] = -1; for (i = 1; i < MSPACE1_DIM * mpi_size - 1; i++) vector[i] = (int)i; @@ -643,8 +643,8 @@ coll_write_test(int chunk_factor) * Initialize data buffer. */ - HDmemset(matrix_out, 0, sizeof(int) * (size_t)MSPACE_DIM1 * (size_t)MSPACE_DIM2 * (size_t)mpi_size); - HDmemset(matrix_out1, 0, sizeof(int) * (size_t)MSPACE_DIM1 * (size_t)MSPACE_DIM2 * (size_t)mpi_size); + memset(matrix_out, 0, sizeof(int) * (size_t)MSPACE_DIM1 * (size_t)MSPACE_DIM2 * (size_t)mpi_size); + memset(matrix_out1, 0, sizeof(int) * (size_t)MSPACE_DIM1 * (size_t)MSPACE_DIM2 * (size_t)mpi_size); /* * Read data back to the buffer matrix_out. */ @@ -881,8 +881,8 @@ coll_read_test(void) * Initialize data buffer. */ - HDmemset(matrix_out, 0, sizeof(int) * (size_t)MSPACE_DIM1 * (size_t)MSPACE_DIM2 * (size_t)mpi_size); - HDmemset(matrix_out1, 0, sizeof(int) * (size_t)MSPACE_DIM1 * (size_t)MSPACE_DIM2 * (size_t)mpi_size); + memset(matrix_out, 0, sizeof(int) * (size_t)MSPACE_DIM1 * (size_t)MSPACE_DIM2 * (size_t)mpi_size); + memset(matrix_out1, 0, sizeof(int) * (size_t)MSPACE_DIM1 * (size_t)MSPACE_DIM2 * (size_t)mpi_size); /* * Read data back to the buffer matrix_out. diff --git a/testpar/API/testphdf5.c b/testpar/API/testphdf5.c index 044ebac..9469c12 100644 --- a/testpar/API/testphdf5.c +++ b/testpar/API/testphdf5.c @@ -351,7 +351,7 @@ main(int argc, char **argv) /* h5_show_hostname(); */ #if 0 - HDmemset(filenames, 0, sizeof(filenames)); + memset(filenames, 0, sizeof(filenames)); for (int i = 0; i < NFILENAME; i++) { if (NULL == (filenames[i] = malloc(PATH_MAX))) { printf("couldn't allocate filename array\n"); diff --git a/testpar/t_2Gio.c b/testpar/t_2Gio.c index 8ab13bf..e651b1b 100644 --- a/testpar/t_2Gio.c +++ b/testpar/t_2Gio.c @@ -4134,11 +4134,11 @@ test_no_collective_cause_mode(int selection_mode) "reading and writing are the same for global cause of Broken Collective I/O"); /* Test values */ - HDmemset(message, 0, sizeof(message)); + memset(message, 0, sizeof(message)); HDsnprintf(message, sizeof(message), "Local cause of Broken Collective I/O has the correct value for %s.\n", test_name); VRFY((no_collective_cause_local_write == no_collective_cause_local_expected), message); - HDmemset(message, 0, sizeof(message)); + memset(message, 0, sizeof(message)); HDsnprintf(message, sizeof(message), "Global cause of Broken Collective I/O has the correct value for %s.\n", test_name); VRFY((no_collective_cause_global_write == no_collective_cause_global_expected), message); @@ -4616,7 +4616,7 @@ main(int argc, char **argv) MPI_Comm_size(test_comm, &mpi_size); MPI_Comm_rank(test_comm, &mpi_rank); - HDmemset(filenames, 0, sizeof(filenames)); + memset(filenames, 0, sizeof(filenames)); dim0 = BIG_X_FACTOR; dim1 = BIG_Y_FACTOR; @@ -4635,7 +4635,7 @@ main(int argc, char **argv) }; H5open(); - HDmemset(filenames, 0, sizeof(filenames)); + memset(filenames, 0, sizeof(filenames)); for (int i = 0; i < NFILENAME; i++) { if (NULL == (filenames[i] = malloc(PATH_MAX))) { printf("couldn't allocate filename array\n"); diff --git a/testpar/t_bigio.c b/testpar/t_bigio.c index ef36f3e..49c39e4 100644 --- a/testpar/t_bigio.c +++ b/testpar/t_bigio.c @@ -784,7 +784,7 @@ dataset_big_read(void) wdata = (B_DATATYPE *)malloc(bigcount * sizeof(B_DATATYPE)); VRFY_G((wdata != NULL), "wdata malloc succeeded"); - HDmemset(rdata, 0, bigcount * sizeof(B_DATATYPE)); + memset(rdata, 0, bigcount * sizeof(B_DATATYPE)); /* setup file access template */ acc_tpl = H5Pcreate(H5P_FILE_ACCESS); @@ -864,7 +864,7 @@ dataset_big_read(void) if (mpi_rank_g == 0) printf("\nRead Testing Dataset2 by ROW\n"); - HDmemset(rdata, 0, bigcount * sizeof(B_DATATYPE)); + memset(rdata, 0, bigcount * sizeof(B_DATATYPE)); dataset = H5Dopen2(fid, DATASET2, H5P_DEFAULT); VRFY_G((dataset >= 0), "H5Dopen2 succeeded"); @@ -927,7 +927,7 @@ dataset_big_read(void) if (mpi_rank_g == 0) printf("\nRead Testing Dataset3 read select ALL proc 0, NONE others\n"); - HDmemset(rdata, 0, bigcount * sizeof(B_DATATYPE)); + memset(rdata, 0, bigcount * sizeof(B_DATATYPE)); dataset = H5Dopen2(fid, DATASET3, H5P_DEFAULT); VRFY_G((dataset >= 0), "H5Dopen2 succeeded"); @@ -1150,7 +1150,7 @@ single_rank_independent_io(void) VRFY_G((ret >= 0), "H5Dwrite succeeded"); /* Wipe buffer */ - HDmemset(data, 0, dims[0] * sizeof(int)); + memset(data, 0, dims[0] * sizeof(int)); /* Read data back */ ret = H5Dread(dset_id, H5T_NATIVE_INT, H5S_BLOCK, fspace_id, H5P_DEFAULT, data); diff --git a/testpar/t_cache.c b/testpar/t_cache.c index c3189b1..d6768bd 100644 --- a/testpar/t_cache.c +++ b/testpar/t_cache.c @@ -1073,7 +1073,7 @@ setup_derived_types(void) MPI_Aint displs[9]; struct mssg_t sample; /* used to compute displacements */ - HDmemset(&sample, 0, sizeof(struct mssg_t)); + memset(&sample, 0, sizeof(struct mssg_t)); /* setup the displacements array */ if ((MPI_SUCCESS != MPI_Get_address(&sample.req, &displs[0])) || @@ -6713,7 +6713,7 @@ main(int argc, char **argv) MPI_Abort(MPI_COMM_WORLD, -1); } - HDmemset(filenames, 0, sizeof(filenames)); + memset(filenames, 0, sizeof(filenames)); for (int i = 0; i < NFILENAME; i++) { if (NULL == (filenames[i] = malloc(PATH_MAX))) { printf("couldn't allocate filename array\n"); diff --git a/testpar/t_chunk_alloc.c b/testpar/t_chunk_alloc.c index c8d20b5..6f862c0 100644 --- a/testpar/t_chunk_alloc.c +++ b/testpar/t_chunk_alloc.c @@ -109,7 +109,7 @@ create_chunked_dataset(const char *filename, int chunk_factor, write_type write_ VRFY((dataset >= 0), ""); if (write_pattern == sec_last) { - HDmemset(buffer, 100, CHUNK_SIZE); + memset(buffer, 100, CHUNK_SIZE); count[0] = 1; stride[0] = 1; @@ -226,7 +226,7 @@ parallel_access_dataset(const char *filename, int chunk_factor, access_type acti /* all chunks are written by all the processes in an interleaved way*/ case write_all: - HDmemset(buffer, mpi_rank + 1, CHUNK_SIZE); + memset(buffer, mpi_rank + 1, CHUNK_SIZE); count[0] = 1; stride[0] = 1; block[0] = chunk_dims[0]; @@ -358,7 +358,7 @@ verify_data(const char *filename, int chunk_factor, write_type write_pattern, in block[0] = chunk_dims[0]; for (i = 0; i < nchunks; i++) { /* reset buffer values */ - HDmemset(buffer, -1, CHUNK_SIZE); + memset(buffer, -1, CHUNK_SIZE); offset[0] = (hsize_t)i * chunk_dims[0]; diff --git a/testpar/t_coll_md.c b/testpar/t_coll_md.c index 2ff6f77..b6442a5 100644 --- a/testpar/t_coll_md.c +++ b/testpar/t_coll_md.c @@ -191,9 +191,9 @@ test_partial_no_selection_coll_md_read(void) * Check data integrity just to be sure. */ if (!PARTIAL_NO_SELECTION_NO_SEL_PROCESS) { - VRFY((!HDmemcmp(data, read_buf, - count[1] * (PARTIAL_NO_SELECTION_Y_DIM_SCALE * PARTIAL_NO_SELECTION_X_DIM_SCALE) * - sizeof(int))), + VRFY((!memcmp(data, read_buf, + count[1] * (PARTIAL_NO_SELECTION_Y_DIM_SCALE * PARTIAL_NO_SELECTION_X_DIM_SCALE) * + sizeof(int))), "memcmp succeeded"); } diff --git a/testpar/t_dset.c b/testpar/t_dset.c index 9c72108..e401cd5 100644 --- a/testpar/t_dset.c +++ b/testpar/t_dset.c @@ -3725,11 +3725,11 @@ test_no_collective_cause_mode(int selection_mode) "reading and writing are the same for global cause of Broken Collective I/O"); /* Test values */ - HDmemset(message, 0, sizeof(message)); + memset(message, 0, sizeof(message)); HDsnprintf(message, sizeof(message), "Local cause of Broken Collective I/O has the correct value for %s.\n", test_name); VRFY((no_collective_cause_local_write == no_collective_cause_local_expected), message); - HDmemset(message, 0, sizeof(message)); + memset(message, 0, sizeof(message)); HDsnprintf(message, sizeof(message), "Global cause of Broken Collective I/O has the correct value for %s.\n", test_name); VRFY((no_collective_cause_global_write == no_collective_cause_global_expected), message); diff --git a/testpar/t_file.c b/testpar/t_file.c index 3c410dc..69d0562 100644 --- a/testpar/t_file.c +++ b/testpar/t_file.c @@ -542,7 +542,7 @@ create_file(const char *filename, hid_t fcpl, hid_t fapl, int metadata_write_str ret = H5Dclose(dset_id); VRFY((ret == 0), ""); - HDmemset(data_array, 0, num_elements * sizeof(DATATYPE)); + memset(data_array, 0, num_elements * sizeof(DATATYPE)); dset_id = H5Dopen2(grp_id, dset_name, H5P_DEFAULT); VRFY((dset_id >= 0), ""); diff --git a/testpar/t_filters_parallel.c b/testpar/t_filters_parallel.c index 16856bd..d5042b3 100644 --- a/testpar/t_filters_parallel.c +++ b/testpar/t_filters_parallel.c @@ -522,7 +522,7 @@ test_write_one_chunk_filtered_dataset(const char *parent_group, H5Z_filter_t fil VRFY((H5Dread(dset_id, HDF5_DATATYPE_NAME, H5S_ALL, H5S_ALL, dxpl_id, read_buf) >= 0), "Dataset read succeeded"); - VRFY((0 == HDmemcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); if (correct_buf) free(correct_buf); @@ -673,7 +673,7 @@ test_write_filtered_dataset_no_overlap(const char *parent_group, H5Z_filter_t fi VRFY((H5Dread(dset_id, HDF5_DATATYPE_NAME, H5S_ALL, H5S_ALL, dxpl_id, read_buf) >= 0), "Dataset read succeeded"); - VRFY((0 == HDmemcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); if (correct_buf) free(correct_buf); @@ -829,7 +829,7 @@ test_write_filtered_dataset_no_overlap_partial(const char *parent_group, H5Z_fil VRFY((H5Dread(dset_id, HDF5_DATATYPE_NAME, H5S_ALL, H5S_ALL, dxpl_id, read_buf) >= 0), "Dataset read succeeded"); - VRFY((0 == HDmemcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); if (correct_buf) free(correct_buf); @@ -981,7 +981,7 @@ test_write_filtered_dataset_overlap(const char *parent_group, H5Z_filter_t filte VRFY((H5Dread(dset_id, HDF5_DATATYPE_NAME, H5S_ALL, H5S_ALL, dxpl_id, read_buf) >= 0), "Dataset read succeeded"); - VRFY((0 == HDmemcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); if (correct_buf) free(correct_buf); @@ -1119,13 +1119,13 @@ test_write_filtered_dataset_single_unlim_dim_no_overlap(const char *parent_group dset_id = H5Dopen2(group_id, WRITE_UNSHARED_ONE_UNLIM_DIM_DATASET_NAME, H5P_DEFAULT); VRFY((dset_id >= 0), "Dataset open succeeded"); - HDmemset(read_buf, 255, data_size); + memset(read_buf, 255, data_size); VRFY((H5Dread(dset_id, HDF5_DATATYPE_NAME, H5S_BLOCK, filespace, dxpl_id, read_buf) >= 0), "Dataset read succeeded"); /* Verify the correct data was written */ - VRFY((0 == HDmemcmp(read_buf, data, data_size)), "Data verification succeeded"); + VRFY((0 == memcmp(read_buf, data, data_size)), "Data verification succeeded"); if (i < (size_t)WRITE_UNSHARED_ONE_UNLIM_DIM_NLOOPS - 1) { /* Extend the dataset by count[1] chunks in the extensible dimension */ @@ -1272,13 +1272,13 @@ test_write_filtered_dataset_single_unlim_dim_overlap(const char *parent_group, H dset_id = H5Dopen2(group_id, WRITE_SHARED_ONE_UNLIM_DIM_DATASET_NAME, H5P_DEFAULT); VRFY((dset_id >= 0), "Dataset open succeeded"); - HDmemset(read_buf, 255, data_size); + memset(read_buf, 255, data_size); VRFY((H5Dread(dset_id, HDF5_DATATYPE_NAME, H5S_BLOCK, filespace, dxpl_id, read_buf) >= 0), "Dataset read succeeded"); /* Verify correct data was written */ - VRFY((0 == HDmemcmp(read_buf, data, data_size)), "Data verification succeeded"); + VRFY((0 == memcmp(read_buf, data, data_size)), "Data verification succeeded"); if (i < (size_t)WRITE_SHARED_ONE_UNLIM_DIM_NLOOPS - 1) { /* Extend the dataset by count[1] chunks in the extensible dimension */ @@ -1436,13 +1436,13 @@ test_write_filtered_dataset_multi_unlim_dim_no_overlap(const char *parent_group, dset_id = H5Dopen2(group_id, WRITE_UNSHARED_TWO_UNLIM_DIM_DATASET_NAME, H5P_DEFAULT); VRFY((dset_id >= 0), "Dataset open succeeded"); - HDmemset(read_buf, 255, data_size); + memset(read_buf, 255, data_size); VRFY((H5Dread(dset_id, HDF5_DATATYPE_NAME, H5S_BLOCK, filespace, dxpl_id, read_buf) >= 0), "Dataset read succeeded"); /* Verify the correct data was written */ - VRFY((0 == HDmemcmp(read_buf, data, data_size)), "Data verification succeeded"); + VRFY((0 == memcmp(read_buf, data, data_size)), "Data verification succeeded"); if (i < (size_t)WRITE_UNSHARED_TWO_UNLIM_DIM_NLOOPS - 1) { /* @@ -1603,13 +1603,13 @@ test_write_filtered_dataset_multi_unlim_dim_overlap(const char *parent_group, H5 dset_id = H5Dopen2(group_id, WRITE_SHARED_TWO_UNLIM_DIM_DATASET_NAME, H5P_DEFAULT); VRFY((dset_id >= 0), "Dataset open succeeded"); - HDmemset(read_buf, 255, data_size); + memset(read_buf, 255, data_size); VRFY((H5Dread(dset_id, HDF5_DATATYPE_NAME, H5S_BLOCK, filespace, dxpl_id, read_buf) >= 0), "Dataset read succeeded"); /* Verify correct data was written */ - VRFY((0 == HDmemcmp(read_buf, data, data_size)), "Data verification succeeded"); + VRFY((0 == memcmp(read_buf, data, data_size)), "Data verification succeeded"); if (i < (size_t)WRITE_SHARED_TWO_UNLIM_DIM_NLOOPS - 1) { /* Extend the dataset by the size of a chunk in each extensible dimension */ @@ -1764,9 +1764,8 @@ test_write_filtered_dataset_single_no_selection(const char *parent_group, H5Z_fi /* Compute the correct offset into the buffer for the process having no selection and clear it */ segment_length = dataset_dims[0] * dataset_dims[1] / (hsize_t)mpi_size; - HDmemset(correct_buf + - ((size_t)WRITE_SINGLE_NO_SELECTION_FILTERED_CHUNKS_NO_SELECT_PROC * segment_length), - 0, segment_length * sizeof(*data)); + memset(correct_buf + ((size_t)WRITE_SINGLE_NO_SELECTION_FILTERED_CHUNKS_NO_SELECT_PROC * segment_length), + 0, segment_length * sizeof(*data)); VRFY((H5Dwrite(dset_id, HDF5_DATATYPE_NAME, memspace, filespace, dxpl_id, data) >= 0), "Dataset write succeeded"); @@ -1789,7 +1788,7 @@ test_write_filtered_dataset_single_no_selection(const char *parent_group, H5Z_fi VRFY((H5Dread(dset_id, HDF5_DATATYPE_NAME, H5S_ALL, H5S_ALL, dxpl_id, read_buf) >= 0), "Dataset read succeeded"); - VRFY((0 == HDmemcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); if (correct_buf) free(correct_buf); @@ -1912,7 +1911,7 @@ test_write_filtered_dataset_all_no_selection(const char *parent_group, H5Z_filte VRFY((H5Dread(dset_id, HDF5_DATATYPE_NAME, H5S_ALL, H5S_ALL, dxpl_id, read_buf) >= 0), "Dataset read succeeded"); - VRFY((0 == HDmemcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); if (correct_buf) free(correct_buf); @@ -2052,7 +2051,7 @@ test_write_filtered_dataset_point_selection(const char *parent_group, H5Z_filter VRFY((H5Dread(dset_id, HDF5_DATATYPE_NAME, H5S_ALL, H5S_ALL, dxpl_id, read_buf) >= 0), "Dataset read succeeded"); - VRFY((0 == HDmemcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); if (coords) free(coords); @@ -2218,7 +2217,7 @@ test_write_filtered_dataset_interleaved_write(const char *parent_group, H5Z_filt VRFY((H5Dread(dset_id, HDF5_DATATYPE_NAME, H5S_ALL, H5S_ALL, dxpl_id, read_buf) >= 0), "Dataset read succeeded"); - VRFY((0 == HDmemcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); if (correct_buf) free(correct_buf); @@ -2381,7 +2380,7 @@ test_write_transformed_filtered_dataset_no_overlap(const char *parent_group, H5Z VRFY((H5Dread(dset_id, HDF5_DATATYPE_NAME, H5S_ALL, H5S_ALL, plist_id, read_buf) >= 0), "Dataset read succeeded"); - VRFY((0 == HDmemcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); VRFY((H5Pclose(plist_id) >= 0), "DCPL close succeeded"); @@ -2547,7 +2546,7 @@ test_write_3d_filtered_dataset_no_overlap_separate_pages(const char *parent_grou VRFY((H5Dread(dset_id, HDF5_DATATYPE_NAME, H5S_ALL, H5S_ALL, dxpl_id, read_buf) >= 0), "Dataset read succeeded"); - VRFY((0 == HDmemcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); if (correct_buf) free(correct_buf); @@ -2708,7 +2707,7 @@ test_write_3d_filtered_dataset_no_overlap_same_pages(const char *parent_group, H VRFY((H5Dread(dset_id, HDF5_DATATYPE_NAME, H5S_ALL, H5S_ALL, dxpl_id, read_buf) >= 0), "Dataset read succeeded"); - VRFY((0 == HDmemcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); if (correct_buf) free(correct_buf); @@ -2881,7 +2880,7 @@ test_write_3d_filtered_dataset_overlap(const char *parent_group, H5Z_filter_t fi VRFY((H5Dread(dset_id, HDF5_DATATYPE_NAME, H5S_ALL, H5S_ALL, dxpl_id, read_buf) >= 0), "Dataset read succeeded"); - VRFY((0 == HDmemcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); if (correct_buf) free(correct_buf); @@ -3059,7 +3058,7 @@ test_write_cmpd_filtered_dataset_no_conversion_unshared(const char *parent_group VRFY((H5Dread(dset_id, memtype, H5S_ALL, H5S_ALL, dxpl_id, read_buf) >= 0), "Dataset read succeeded"); - VRFY((0 == HDmemcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); if (correct_buf) free(correct_buf); @@ -3244,7 +3243,7 @@ test_write_cmpd_filtered_dataset_no_conversion_shared(const char *parent_group, VRFY((H5Dread(dset_id, memtype, H5S_ALL, H5S_ALL, dxpl_id, read_buf) >= 0), "Dataset read succeeded"); - VRFY((0 == HDmemcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); if (correct_buf) free(correct_buf); @@ -3440,7 +3439,7 @@ test_write_cmpd_filtered_dataset_type_conversion_unshared(const char *parent_gro VRFY((H5Dread(dset_id, memtype, H5S_ALL, H5S_ALL, dxpl_id, read_buf) >= 0), "Dataset read succeeded"); - VRFY((0 == HDmemcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); if (correct_buf) free(correct_buf); @@ -3637,7 +3636,7 @@ test_write_cmpd_filtered_dataset_type_conversion_shared(const char *parent_group VRFY((H5Dread(dset_id, memtype, H5S_ALL, H5S_ALL, dxpl_id, read_buf) >= 0), "Dataset read succeeded"); - VRFY((0 == HDmemcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); if (correct_buf) free(correct_buf); @@ -3834,7 +3833,7 @@ test_read_one_chunk_filtered_dataset(const char *parent_group, H5Z_filter_t filt displs, C_DATATYPE_MPI, comm)), "MPI_Allgatherv succeeded"); - VRFY((0 == HDmemcmp(global_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(global_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); if (displs) free(displs); @@ -4032,7 +4031,7 @@ test_read_filtered_dataset_no_overlap(const char *parent_group, H5Z_filter_t fil displs, C_DATATYPE_MPI, comm)), "MPI_Allgatherv succeeded"); - VRFY((0 == HDmemcmp(global_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(global_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); if (displs) free(displs); @@ -4248,7 +4247,7 @@ test_read_filtered_dataset_overlap(const char *parent_group, H5Z_filter_t filter } } - VRFY((0 == HDmemcmp(global_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(global_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); if (displs) free(displs); @@ -4322,8 +4321,8 @@ test_read_filtered_dataset_single_no_selection(const char *parent_group, H5Z_fil /* Compute the correct offset into the buffer for the process having no selection and clear it */ segment_length = dataset_dims[0] * dataset_dims[1] / (hsize_t)mpi_size; - HDmemset(correct_buf + ((size_t)READ_SINGLE_NO_SELECTION_FILTERED_CHUNKS_NO_SELECT_PROC * segment_length), - 0, segment_length * sizeof(*correct_buf)); + memset(correct_buf + ((size_t)READ_SINGLE_NO_SELECTION_FILTERED_CHUNKS_NO_SELECT_PROC * segment_length), + 0, segment_length * sizeof(*correct_buf)); if (MAINPROCESS) { plist_id = H5Pcreate(H5P_FILE_ACCESS); @@ -4474,7 +4473,7 @@ test_read_filtered_dataset_single_no_selection(const char *parent_group, H5Z_fil recvcounts, displs, C_DATATYPE_MPI, comm)), "MPI_Allgatherv succeeded"); - VRFY((0 == HDmemcmp(global_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(global_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); if (displs) free(displs); @@ -4615,7 +4614,7 @@ test_read_filtered_dataset_all_no_selection(const char *parent_group, H5Z_filter VRFY((H5Dread(dset_id, HDF5_DATATYPE_NAME, memspace, filespace, dxpl_id, read_buf) >= 0), "Dataset read succeeded"); - VRFY((0 == HDmemcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); if (read_buf) free(read_buf); @@ -4816,7 +4815,7 @@ test_read_filtered_dataset_point_selection(const char *parent_group, H5Z_filter_ } } - VRFY((0 == HDmemcmp(global_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(global_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); if (displs) free(displs); @@ -5047,7 +5046,7 @@ test_read_filtered_dataset_interleaved_read(const char *parent_group, H5Z_filter } } - VRFY((0 == HDmemcmp(global_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(global_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); if (displs) free(displs); @@ -5258,7 +5257,7 @@ test_read_3d_filtered_dataset_no_overlap_separate_pages(const char *parent_group resized_vector_type, comm)), "MPI_Allgather succeeded"); - VRFY((0 == HDmemcmp(global_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(global_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); VRFY((MPI_SUCCESS == MPI_Type_free(&vector_type)), "MPI_Type_free succeeded"); VRFY((MPI_SUCCESS == MPI_Type_free(&resized_vector_type)), "MPI_Type_free succeeded"); @@ -5485,7 +5484,7 @@ test_read_transformed_filtered_dataset_no_overlap(const char *parent_group, H5Z_ displs, C_DATATYPE_MPI, comm)), "MPI_Allgatherv succeeded"); - VRFY((0 == HDmemcmp(global_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(global_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); if (displs) free(displs); @@ -5695,7 +5694,7 @@ test_read_3d_filtered_dataset_no_overlap_same_pages(const char *parent_group, H5 displs, C_DATATYPE_MPI, comm)), "MPI_Allgatherv succeeded"); - VRFY((0 == HDmemcmp(global_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(global_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); if (displs) free(displs); @@ -5927,7 +5926,7 @@ test_read_3d_filtered_dataset_overlap(const char *parent_group, H5Z_filter_t fil resized_vector_type, comm)), "MPI_Allgatherv succeeded"); - VRFY((0 == HDmemcmp(global_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(global_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); VRFY((MPI_SUCCESS == MPI_Type_free(&vector_type)), "MPI_Type_free succeeded"); VRFY((MPI_SUCCESS == MPI_Type_free(&resized_vector_type)), "MPI_Type_free succeeded"); @@ -6150,7 +6149,7 @@ test_read_cmpd_filtered_dataset_no_conversion_unshared(const char *parent_group, global_buf, recvcounts, displs, MPI_BYTE, comm)), "MPI_Allgatherv succeeded"); - VRFY((0 == HDmemcmp(global_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(global_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); if (displs) free(displs); @@ -6381,7 +6380,7 @@ test_read_cmpd_filtered_dataset_no_conversion_shared(const char *parent_group, H global_buf, recvcounts, displs, MPI_BYTE, comm)), "MPI_Allgatherv succeeded"); - VRFY((0 == HDmemcmp(global_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(global_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); if (displs) free(displs); @@ -6614,7 +6613,7 @@ test_read_cmpd_filtered_dataset_type_conversion_unshared(const char *parent_grou global_buf, recvcounts, displs, MPI_BYTE, comm)), "MPI_Allgatherv succeeded"); - VRFY((0 == HDmemcmp(global_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(global_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); if (displs) free(displs); @@ -6854,7 +6853,7 @@ test_read_cmpd_filtered_dataset_type_conversion_shared(const char *parent_group, global_buf, recvcounts, displs, MPI_BYTE, comm)), "MPI_Allgatherv succeeded"); - VRFY((0 == HDmemcmp(global_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(global_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); if (displs) free(displs); @@ -6997,7 +6996,7 @@ test_write_serial_read_parallel(const char *parent_group, H5Z_filter_t filter_id VRFY((H5Dread(dset_id, HDF5_DATATYPE_NAME, H5S_ALL, H5S_ALL, dxpl_id, read_buf) >= 0), "Dataset read succeeded"); - VRFY((0 == HDmemcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); if (correct_buf) free(correct_buf); @@ -7175,7 +7174,7 @@ test_write_parallel_read_serial(const char *parent_group, H5Z_filter_t filter_id VRFY((H5Dread(dset_id, HDF5_DATATYPE_NAME, H5S_ALL, H5S_ALL, H5P_DEFAULT, read_buf) >= 0), "Dataset read succeeded"); - VRFY((0 == HDmemcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(read_buf, correct_buf, correct_buf_size)), "Data verification succeeded"); VRFY((H5Dclose(dset_id) >= 0), "Dataset close succeeded"); VRFY((H5Gclose(group_id) >= 0), "Group close succeeded"); @@ -7293,7 +7292,7 @@ test_shrinking_growing_chunks(const char *parent_group, H5Z_filter_t filter_id, for (i = 0; i < SHRINKING_GROWING_CHUNKS_NLOOPS; i++) { /* Continually write random float data, followed by zeroed-out data */ if (i % 2) - HDmemset(data, 0, data_size); + memset(data, 0, data_size); else { size_t j; for (j = 0; j < data_size / sizeof(*data); j++) { @@ -7308,16 +7307,16 @@ test_shrinking_growing_chunks(const char *parent_group, H5Z_filter_t filter_id, verify_space_alloc_status(dset_id, plist_id, ALL_CHUNKS_WRITTEN); if (i % 2) { - HDmemset(read_buf, 255, data_size); + memset(read_buf, 255, data_size); } else { - HDmemset(read_buf, 0, data_size); + memset(read_buf, 0, data_size); } VRFY((H5Dread(dset_id, H5T_NATIVE_DOUBLE, memspace, filespace, dxpl_id, read_buf) >= 0), "Dataset read succeeded"); - VRFY((0 == HDmemcmp(read_buf, data, data_size)), "data verification succeeded"); + VRFY((0 == memcmp(read_buf, data, data_size)), "data verification succeeded"); } if (read_buf) @@ -7457,7 +7456,7 @@ test_edge_chunks_no_overlap(const char *parent_group, H5Z_filter_t filter_id, hi VRFY((H5Dread(dset_id, HDF5_DATATYPE_NAME, H5S_BLOCK, filespace, dxpl_id, read_buf) >= 0), "Dataset read succeeded"); - VRFY((0 == HDmemcmp(read_buf, data, data_size)), "Data verification succeeded"); + VRFY((0 == memcmp(read_buf, data, data_size)), "Data verification succeeded"); VRFY((H5Dclose(dset_id) >= 0), "Dataset close succeeded"); @@ -7516,12 +7515,12 @@ test_edge_chunks_no_overlap(const char *parent_group, H5Z_filter_t filter_id, hi dset_id = H5Dopen2(group_id, WRITE_UNSHARED_FILTERED_EDGE_CHUNKS_DATASET_NAME2, H5P_DEFAULT); VRFY((dset_id >= 0), "Dataset open succeeded"); - HDmemset(read_buf, 255, data_size); + memset(read_buf, 255, data_size); VRFY((H5Dread(dset_id, HDF5_DATATYPE_NAME, H5S_BLOCK, filespace, dxpl_id, read_buf) >= 0), "Dataset read succeeded"); - VRFY((0 == HDmemcmp(read_buf, data, data_size)), "Data verification succeeded"); + VRFY((0 == memcmp(read_buf, data, data_size)), "Data verification succeeded"); if (data) free(data); @@ -7660,7 +7659,7 @@ test_edge_chunks_overlap(const char *parent_group, H5Z_filter_t filter_id, hid_t VRFY((H5Dread(dset_id, HDF5_DATATYPE_NAME, H5S_BLOCK, filespace, dxpl_id, read_buf) >= 0), "Dataset read succeeded"); - VRFY((0 == HDmemcmp(read_buf, data, data_size)), "Data verification succeeded"); + VRFY((0 == memcmp(read_buf, data, data_size)), "Data verification succeeded"); VRFY((H5Dclose(dset_id) >= 0), "Dataset close succeeded"); @@ -7720,12 +7719,12 @@ test_edge_chunks_overlap(const char *parent_group, H5Z_filter_t filter_id, hid_t dset_id = H5Dopen2(group_id, WRITE_SHARED_FILTERED_EDGE_CHUNKS_DATASET_NAME2, H5P_DEFAULT); VRFY((dset_id >= 0), "Dataset open succeeded"); - HDmemset(read_buf, 255, data_size); + memset(read_buf, 255, data_size); VRFY((H5Dread(dset_id, HDF5_DATATYPE_NAME, H5S_BLOCK, filespace, dxpl_id, read_buf) >= 0), "Dataset read succeeded"); - VRFY((0 == HDmemcmp(read_buf, data, data_size)), "Data verification succeeded"); + VRFY((0 == memcmp(read_buf, data, data_size)), "Data verification succeeded"); if (data) free(data); @@ -7845,7 +7844,7 @@ test_fill_values(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id for (i = 0; i < read_buf_size / sizeof(*read_buf); i++) correct_buf[i] = FILL_VALUES_TEST_FILL_VAL; - VRFY((0 == HDmemcmp(read_buf, correct_buf, read_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(read_buf, correct_buf, read_buf_size)), "Data verification succeeded"); /* * Write to part of the first chunk in the dataset with @@ -7921,7 +7920,7 @@ test_fill_values(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id displs, C_DATATYPE_MPI, comm)), "MPI_Allgatherv succeeded"); - VRFY((0 == HDmemcmp(read_buf, correct_buf, read_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(read_buf, correct_buf, read_buf_size)), "Data verification succeeded"); /* * Write to whole dataset and ensure fill value isn't returned @@ -7993,7 +7992,7 @@ test_fill_values(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id for (i = 0; i < read_buf_size / sizeof(*read_buf); i++) correct_buf[i] = FILL_VALUES_TEST_FILL_VAL; - VRFY((0 == HDmemcmp(read_buf, correct_buf, read_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(read_buf, correct_buf, read_buf_size)), "Data verification succeeded"); /* * Write to part of the first chunk in the dataset with @@ -8057,7 +8056,7 @@ test_fill_values(const char *parent_group, H5Z_filter_t filter_id, hid_t fapl_id displs, C_DATATYPE_MPI, comm)), "MPI_Allgatherv succeeded"); - VRFY((0 == HDmemcmp(read_buf, correct_buf, read_buf_size)), "Data verification succeeded"); + VRFY((0 == memcmp(read_buf, correct_buf, read_buf_size)), "Data verification succeeded"); /* * Write to whole dataset and ensure fill value isn't returned @@ -8436,7 +8435,7 @@ test_fill_time_never(const char *parent_group, H5Z_filter_t filter_id, hid_t fap * values to all be the fill value, so this should be * a safe comparison in theory. */ - VRFY((0 != HDmemcmp(read_buf, fill_buf, read_buf_size)), "Data verification succeeded"); + VRFY((0 != memcmp(read_buf, fill_buf, read_buf_size)), "Data verification succeeded"); /* * Write to part of the first chunk in the dataset with @@ -8517,7 +8516,7 @@ test_fill_time_never(const char *parent_group, H5Z_filter_t filter_id, hid_t fap * values to all be the fill value, so this should be * a safe comparison in theory. */ - VRFY((0 != HDmemcmp(read_buf, fill_buf, read_buf_size)), "Data verification succeeded"); + VRFY((0 != memcmp(read_buf, fill_buf, read_buf_size)), "Data verification succeeded"); /* * Write to whole dataset and ensure fill value isn't returned diff --git a/testpar/t_mdset.c b/testpar/t_mdset.c index 2db7eff..bc6305e 100644 --- a/testpar/t_mdset.c +++ b/testpar/t_mdset.c @@ -649,7 +649,7 @@ dataset_fillvalue(void) VRFY((ret >= 0), "H5Pset_dxpl_mpio succeeded"); /* set entire read buffer with the constant 2 */ - HDmemset(rdata, 2, (size_t)(dset_size * sizeof(int))); + memset(rdata, 2, (size_t)(dset_size * sizeof(int))); /* Read the entire dataset back */ ret = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, rdata); @@ -739,7 +739,7 @@ dataset_fillvalue(void) VRFY((ret >= 0), "H5Pset_dxpl_mpio succeeded"); /* set entire read buffer with the constant 2 */ - HDmemset(rdata, 2, (size_t)(dset_size * sizeof(int))); + memset(rdata, 2, (size_t)(dset_size * sizeof(int))); /* Read the entire dataset back */ ret = H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl, rdata); diff --git a/testpar/t_pmulti_dset.c b/testpar/t_pmulti_dset.c index 5da2e31..8d7fdef 100644 --- a/testpar/t_pmulti_dset.c +++ b/testpar/t_pmulti_dset.c @@ -305,8 +305,8 @@ test_pmdset(size_t niter, unsigned flags) } /* end for */ /* Initialize read buffer and expected read buffer */ - (void)HDmemset(rbuf, 0, buf_size); - (void)HDmemset(erbuf, 0, buf_size); + (void)memset(rbuf, 0, buf_size); + (void)memset(erbuf, 0, buf_size); /* Initialize write buffer */ for (j = 0; j < max_dsets; j++) @@ -316,7 +316,7 @@ test_pmdset(size_t niter, unsigned flags) (j * MAX_DSET_X * MAX_DSET_Y) + (k * MAX_DSET_Y) + l); /* Initialize expected file buffer */ - (void)HDmemset(efbuf, 0, buf_size); + (void)memset(efbuf, 0, buf_size); /* Set last_read to TRUE so we don't reopen the file on the first * iteration */ @@ -377,7 +377,7 @@ test_pmdset(size_t niter, unsigned flags) /* Reset dataset usage array, if writing */ if (!do_read) - HDmemset(dset_usage, 0, max_dsets * MAX_DSET_X * MAX_DSET_Y); + memset(dset_usage, 0, max_dsets * MAX_DSET_X * MAX_DSET_Y); /* Iterate over processes */ for (l = 0; l < (size_t)mpi_size; l++) { @@ -466,7 +466,7 @@ test_pmdset(size_t niter, unsigned flags) /* Reset dataset usage array if reading, since in this case we don't care * about overlapping selections between processes */ if (do_read) - HDmemset(dset_usage, 0, max_dsets * MAX_DSET_X * MAX_DSET_Y); + memset(dset_usage, 0, max_dsets * MAX_DSET_X * MAX_DSET_Y); /* Generate points */ for (m = 0; m < npoints; m++) { diff --git a/testpar/t_select_io_dset.c b/testpar/t_select_io_dset.c index 13c6743..eb64bfe 100644 --- a/testpar/t_select_io_dset.c +++ b/testpar/t_select_io_dset.c @@ -269,7 +269,7 @@ test_no_type_conv(hid_t fid, unsigned chunked, unsigned dtrans, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(wbuf_bak, wbuf, sizeof(wbuf)); + memcpy(wbuf_bak, wbuf, sizeof(wbuf)); /* Write data to the dataset with/without data transform */ if (H5Dwrite(did, H5T_NATIVE_INT, mspace_id, fspace_id, dxpl, wbuf) < 0) @@ -277,7 +277,7 @@ test_no_type_conv(hid_t fid, unsigned chunked, unsigned dtrans, unsigned mwbuf) /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(wbuf, wbuf_bak, sizeof(wbuf)); + memcpy(wbuf, wbuf_bak, sizeof(wbuf)); check_io_mode(dxpl, chunked); @@ -415,7 +415,7 @@ test_no_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(wbuf_bak, wbuf, (size_t)(4 * DSET_SELECT_DIM)); + memcpy(wbuf_bak, wbuf, (size_t)(4 * DSET_SELECT_DIM)); /* Write the data to the dataset with little endian */ if (H5Dwrite(did, H5T_STD_I32LE, mspace_id, fspace_id, dxpl, wbuf) < 0) @@ -423,7 +423,7 @@ test_no_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(wbuf, wbuf_bak, (size_t)(4 * DSET_SELECT_DIM)); + memcpy(wbuf, wbuf_bak, (size_t)(4 * DSET_SELECT_DIM)); check_io_mode(dxpl, chunked); @@ -567,7 +567,7 @@ test_larger_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsign /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(wbuf_bak, wbuf, sizeof(wbuf)); + memcpy(wbuf_bak, wbuf, sizeof(wbuf)); /* Write data to the dataset with/without data transform set in dxpl */ if (H5Dwrite(did, H5T_NATIVE_LONG, mspace_id, fspace_id, dxpl, wbuf) < 0) @@ -575,7 +575,7 @@ test_larger_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsign /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(wbuf, wbuf_bak, sizeof(wbuf)); + memcpy(wbuf, wbuf_bak, sizeof(wbuf)); check_io_mode(dxpl, chunked); @@ -716,7 +716,7 @@ test_smaller_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsig /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(wbuf_bak, wbuf, sizeof(wbuf)); + memcpy(wbuf_bak, wbuf, sizeof(wbuf)); /* Write data to the dataset with/without data transform in dxpl */ if (H5Dwrite(did, H5T_NATIVE_SHORT, mspace_id, fspace_id, dxpl, wbuf) < 0) @@ -724,7 +724,7 @@ test_smaller_mem_type_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsig /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(wbuf, wbuf_bak, sizeof(wbuf)); + memcpy(wbuf, wbuf_bak, sizeof(wbuf)); check_io_mode(dxpl, chunked); @@ -906,7 +906,7 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(s1_wbuf_bak, s1_wbuf, sizeof(s1_t) * DSET_SELECT_DIM); + memcpy(s1_wbuf_bak, s1_wbuf, sizeof(s1_t) * DSET_SELECT_DIM); /* Write all the data to the dataset */ if (H5Dwrite(did, s1_tid, mspace_id, fspace_id, dxpl, s1_wbuf) < 0) @@ -914,12 +914,12 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(s1_wbuf, s1_wbuf_bak, sizeof(s1_t) * DSET_SELECT_DIM); + memcpy(s1_wbuf, s1_wbuf_bak, sizeof(s1_t) * DSET_SELECT_DIM); check_io_mode(dxpl, chunked); /* Read all the data from the dataset */ - HDmemset(s1_rbuf, 0, sizeof(s1_t) * DSET_SELECT_DIM); + memset(s1_rbuf, 0, sizeof(s1_t) * DSET_SELECT_DIM); if (H5Dread(did, s1_tid, mspace_id, fspace_id, dxpl, s1_rbuf) < 0) P_TEST_ERROR; @@ -956,7 +956,7 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(s1_wbuf_bak, s1_wbuf, sizeof(s1_t) * DSET_SELECT_DIM); + memcpy(s1_wbuf_bak, s1_wbuf, sizeof(s1_t) * DSET_SELECT_DIM); /* Write s1_wbuf to the dataset but with only subset members in ss_tid */ if (H5Dwrite(did, ss_ac_tid, mspace_id, fspace_id, dxpl, s1_wbuf) < 0) @@ -964,10 +964,10 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(s1_wbuf, s1_wbuf_bak, sizeof(s1_t) * DSET_SELECT_DIM); + memcpy(s1_wbuf, s1_wbuf_bak, sizeof(s1_t) * DSET_SELECT_DIM); /* Read the whole compound back */ - HDmemset(s1_rbuf, 0, sizeof(s1_t) * DSET_SELECT_DIM); + memset(s1_rbuf, 0, sizeof(s1_t) * DSET_SELECT_DIM); if (H5Dread(did, s1_tid, mspace_id, fspace_id, dxpl, s1_rbuf) < 0) P_TEST_ERROR; @@ -1048,17 +1048,17 @@ test_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(s2_wbuf_bak, s2_wbuf, sizeof(s2_t) * DSET_SELECT_DIM); + memcpy(s2_wbuf_bak, s2_wbuf, sizeof(s2_t) * DSET_SELECT_DIM); if (H5Dwrite(did, s2_tid, mspace_id, fspace_id, dxpl, s2_wbuf) < 0) P_TEST_ERROR; /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(s2_wbuf, s2_wbuf_bak, sizeof(s2_t) * DSET_SELECT_DIM); + memcpy(s2_wbuf, s2_wbuf_bak, sizeof(s2_t) * DSET_SELECT_DIM); /* Read it back */ - HDmemset(s2_rbuf, 0, sizeof(s2_t) * DSET_SELECT_DIM); + memset(s2_rbuf, 0, sizeof(s2_t) * DSET_SELECT_DIM); if (H5Dread(did, s2_tid, mspace_id, fspace_id, dxpl, s2_rbuf) < 0) P_TEST_ERROR; @@ -1212,7 +1212,7 @@ test_type_conv_sel_empty(hid_t fid, unsigned chunked, unsigned dtrans, unsigned /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(lwbuf_bak, lwbuf, sizeof(lwbuf)); + memcpy(lwbuf_bak, lwbuf, sizeof(lwbuf)); /* Write data to the dataset with/without data transform in dxpl */ if (H5Dwrite(did, H5T_NATIVE_LONG, mspace_id, fspace_id, dxpl, lwbuf) < 0) @@ -1220,7 +1220,7 @@ test_type_conv_sel_empty(hid_t fid, unsigned chunked, unsigned dtrans, unsigned /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(lwbuf, lwbuf_bak, sizeof(lwbuf)); + memcpy(lwbuf, lwbuf_bak, sizeof(lwbuf)); check_io_mode(dxpl, chunked); @@ -1271,7 +1271,7 @@ test_type_conv_sel_empty(hid_t fid, unsigned chunked, unsigned dtrans, unsigned /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(lwbuf_bak, lwbuf, sizeof(lwbuf)); + memcpy(lwbuf_bak, lwbuf, sizeof(lwbuf)); /* Write data to the dataset with/without data transform */ if (H5Dwrite(did, H5T_NATIVE_LONG, mspace_id, fspace_id, dxpl, lwbuf) < 0) @@ -1279,7 +1279,7 @@ test_type_conv_sel_empty(hid_t fid, unsigned chunked, unsigned dtrans, unsigned /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(lwbuf, lwbuf_bak, sizeof(lwbuf)); + memcpy(lwbuf, lwbuf_bak, sizeof(lwbuf)); /* Read the data from the dataset: type conversion int-->short */ /* If dtrans, without data transform set in dxpl */ @@ -1332,7 +1332,7 @@ test_type_conv_sel_empty(hid_t fid, unsigned chunked, unsigned dtrans, unsigned /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(swbuf_bak, swbuf, sizeof(swbuf)); + memcpy(swbuf_bak, swbuf, sizeof(swbuf)); /* Write data to the dataset with/without data transform */ if (H5Dwrite(did, H5T_NATIVE_SHORT, mspace_id, fspace_id, dxpl, swbuf) < 0) @@ -1340,7 +1340,7 @@ test_type_conv_sel_empty(hid_t fid, unsigned chunked, unsigned dtrans, unsigned /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(swbuf, swbuf_bak, sizeof(swbuf)); + memcpy(swbuf, swbuf_bak, sizeof(swbuf)); /* Read the data from the dataset: type conversion int-->llong */ /* If dtrans, without data transform set in dxpl */ @@ -1540,7 +1540,7 @@ test_multi_dsets_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsigned m /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(total_wbuf_bak, total_wbuf, ndsets * DSET_SELECT_DIM * sizeof(int)); + memcpy(total_wbuf_bak, total_wbuf, ndsets * DSET_SELECT_DIM * sizeof(int)); /* Write data to the dataset with/without data transform */ if (H5Dwrite_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, wbufs) < 0) @@ -1548,7 +1548,7 @@ test_multi_dsets_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsigned m /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(total_wbuf, total_wbuf_bak, ndsets * DSET_SELECT_DIM * sizeof(int)); + memcpy(total_wbuf, total_wbuf_bak, ndsets * DSET_SELECT_DIM * sizeof(int)); check_io_mode(dxpl, chunked); @@ -1609,7 +1609,7 @@ test_multi_dsets_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsigned m /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(total_lwbuf_bak, total_lwbuf, ndsets * DSET_SELECT_DIM * sizeof(long)); + memcpy(total_lwbuf_bak, total_lwbuf, ndsets * DSET_SELECT_DIM * sizeof(long)); /* Write data to the dataset with/without data transform */ if (H5Dwrite_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, wbufs) < 0) @@ -1617,7 +1617,7 @@ test_multi_dsets_no_bkg(hid_t fid, unsigned chunked, unsigned dtrans, unsigned m /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(total_lwbuf, total_lwbuf_bak, ndsets * DSET_SELECT_DIM * sizeof(long)); + memcpy(total_lwbuf, total_lwbuf_bak, ndsets * DSET_SELECT_DIM * sizeof(long)); /* Read data from the dataset (if dtrans, with data transform again in dxpl */ if (H5Dread_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, rbufs) < 0) @@ -1845,14 +1845,14 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(total_wbuf_bak, total_wbuf, buf_size); + memcpy(total_wbuf_bak, total_wbuf, buf_size); if (H5Dwrite_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, wbufs) < 0) P_TEST_ERROR; /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(total_wbuf, total_wbuf_bak, buf_size); + memcpy(total_wbuf, total_wbuf_bak, buf_size); check_io_mode(dxpl, chunked); @@ -1909,14 +1909,14 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(total_wbuf_bak, total_wbuf, buf_size); + memcpy(total_wbuf_bak, total_wbuf, buf_size); if (H5Dwrite_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, wbufs) < 0) P_TEST_ERROR; /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(total_wbuf, total_wbuf_bak, buf_size); + memcpy(total_wbuf, total_wbuf_bak, buf_size); if (H5Dread_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, rbufs) < 0) P_TEST_ERROR; @@ -2089,14 +2089,14 @@ test_multi_dsets_cmpd_with_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(s2_total_wbuf_bak, s2_total_wbuf, s2_buf_size); + memcpy(s2_total_wbuf_bak, s2_total_wbuf, s2_buf_size); if (H5Dwrite_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, wbufs) < 0) P_TEST_ERROR; /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(s2_total_wbuf, s2_total_wbuf_bak, s2_buf_size); + memcpy(s2_total_wbuf, s2_total_wbuf_bak, s2_buf_size); if (H5Dread_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, rbufs) < 0) P_TEST_ERROR; @@ -2285,7 +2285,7 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(total_wbuf_bak, total_wbuf, buf_size); + memcpy(total_wbuf_bak, total_wbuf, buf_size); /* Write data to the dataset */ if (H5Dwrite_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, wbufs) < 0) @@ -2293,7 +2293,7 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(total_wbuf, total_wbuf_bak, buf_size); + memcpy(total_wbuf, total_wbuf_bak, buf_size); check_io_mode(dxpl, chunked); @@ -2358,7 +2358,7 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(total_lwbuf_bak, total_lwbuf, buf_size); + memcpy(total_lwbuf_bak, total_lwbuf, buf_size); /* Write data to the dataset */ if (H5Dwrite_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, wbufs) < 0) @@ -2366,7 +2366,7 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(total_lwbuf, total_lwbuf_bak, buf_size); + memcpy(total_lwbuf, total_lwbuf_bak, buf_size); /* Read data from the dataset */ if (H5Dread_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, rbufs) < 0) @@ -2427,7 +2427,7 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(total_swbuf_bak, total_swbuf, buf_size); + memcpy(total_swbuf_bak, total_swbuf, buf_size); /* Write data to the dataset */ if (H5Dwrite_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, wbufs) < 0) @@ -2435,7 +2435,7 @@ test_multi_dsets_size_change_no_bkg(hid_t fid, unsigned chunked, unsigned mwbuf) /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(total_swbuf, total_swbuf_bak, buf_size); + memcpy(total_swbuf, total_swbuf_bak, buf_size); /* Read data from the dataset */ if (H5Dread_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, rbufs) < 0) @@ -2754,7 +2754,7 @@ test_multi_dsets_conv_sel_empty(hid_t fid, unsigned chunked, unsigned dtrans, un /* Copy wbuf if the library will be modifying it */ if (mwbuf) - HDmemcpy(total_wbuf_bak, total_wbuf, buf_size); + memcpy(total_wbuf_bak, total_wbuf, buf_size); /* Write data to the dataset with/without data transform */ if (H5Dwrite_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, wbufs) < 0) @@ -2762,7 +2762,7 @@ test_multi_dsets_conv_sel_empty(hid_t fid, unsigned chunked, unsigned dtrans, un /* Restore wbuf from backup if the library modified it */ if (mwbuf) - HDmemcpy(total_wbuf, total_wbuf_bak, buf_size); + memcpy(total_wbuf, total_wbuf_bak, buf_size); check_io_mode(dxpl, chunked); @@ -3217,12 +3217,11 @@ test_multi_dsets_all(int niter, hid_t fid, unsigned chunked, unsigned mwbuf) /* Copy wbufs if the library will be modifying them */ if (mwbuf) { - HDmemcpy(total_wbuf1_bak, total_wbuf1, ndsets * DSET_SELECT_DIM * sizeof(int)); - HDmemcpy(ul_total_wbuf2_bak, ul_total_wbuf2, - ndsets * DSET_SELECT_DIM * sizeof(unsigned long)); - HDmemcpy(l_total_wbuf2_bak, l_total_wbuf2, ndsets * DSET_SELECT_DIM * sizeof(long)); - HDmemcpy(s1_total_wbuf3_bak, s1_total_wbuf3, ndsets * DSET_SELECT_DIM * sizeof(s1_t)); - HDmemcpy(s4_total_wbuf3_bak, s4_total_wbuf3, ndsets * DSET_SELECT_DIM * sizeof(s4_t)); + memcpy(total_wbuf1_bak, total_wbuf1, ndsets * DSET_SELECT_DIM * sizeof(int)); + memcpy(ul_total_wbuf2_bak, ul_total_wbuf2, ndsets * DSET_SELECT_DIM * sizeof(unsigned long)); + memcpy(l_total_wbuf2_bak, l_total_wbuf2, ndsets * DSET_SELECT_DIM * sizeof(long)); + memcpy(s1_total_wbuf3_bak, s1_total_wbuf3, ndsets * DSET_SELECT_DIM * sizeof(s1_t)); + memcpy(s4_total_wbuf3_bak, s4_total_wbuf3, ndsets * DSET_SELECT_DIM * sizeof(s4_t)); } if (H5Dwrite_multi(ndsets, dset_dids, mem_tids, mem_sids, file_sids, dxpl, wbufs) < 0) @@ -3230,12 +3229,11 @@ test_multi_dsets_all(int niter, hid_t fid, unsigned chunked, unsigned mwbuf) /* Restore wbufs from backup if the library modified them */ if (mwbuf) { - HDmemcpy(total_wbuf1, total_wbuf1_bak, ndsets * DSET_SELECT_DIM * sizeof(int)); - HDmemcpy(ul_total_wbuf2, ul_total_wbuf2_bak, - ndsets * DSET_SELECT_DIM * sizeof(unsigned long)); - HDmemcpy(l_total_wbuf2, l_total_wbuf2_bak, ndsets * DSET_SELECT_DIM * sizeof(long)); - HDmemcpy(s1_total_wbuf3, s1_total_wbuf3_bak, ndsets * DSET_SELECT_DIM * sizeof(s1_t)); - HDmemcpy(s4_total_wbuf3, s4_total_wbuf3_bak, ndsets * DSET_SELECT_DIM * sizeof(s4_t)); + memcpy(total_wbuf1, total_wbuf1_bak, ndsets * DSET_SELECT_DIM * sizeof(int)); + memcpy(ul_total_wbuf2, ul_total_wbuf2_bak, ndsets * DSET_SELECT_DIM * sizeof(unsigned long)); + memcpy(l_total_wbuf2, l_total_wbuf2_bak, ndsets * DSET_SELECT_DIM * sizeof(long)); + memcpy(s1_total_wbuf3, s1_total_wbuf3_bak, ndsets * DSET_SELECT_DIM * sizeof(s1_t)); + memcpy(s4_total_wbuf3, s4_total_wbuf3_bak, ndsets * DSET_SELECT_DIM * sizeof(s4_t)); } if (H5Dread_multi(ndsets, dset_dids, r_mem_tids, mem_sids, file_sids, dxpl, rbufs) < 0) diff --git a/testpar/t_shapesame.c b/testpar/t_shapesame.c index 2c64e41..dc60e51 100644 --- a/testpar/t_shapesame.c +++ b/testpar/t_shapesame.c @@ -218,18 +218,18 @@ hs_dr_pio_test__setup(const int test_num, const int edge_size, const int checker ptr_0 = tv_ptr->small_ds_buf_0; for (i = 0; i < (int)(tv_ptr->small_ds_size); i++) *ptr_0++ = (uint32_t)i; - HDmemset(tv_ptr->small_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->small_ds_size); - HDmemset(tv_ptr->small_ds_buf_2, 0, sizeof(uint32_t) * tv_ptr->small_ds_size); + memset(tv_ptr->small_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->small_ds_size); + memset(tv_ptr->small_ds_buf_2, 0, sizeof(uint32_t) * tv_ptr->small_ds_size); - HDmemset(tv_ptr->small_ds_slice_buf, 0, sizeof(uint32_t) * tv_ptr->small_ds_slice_size); + memset(tv_ptr->small_ds_slice_buf, 0, sizeof(uint32_t) * tv_ptr->small_ds_slice_size); ptr_0 = tv_ptr->large_ds_buf_0; for (i = 0; i < (int)(tv_ptr->large_ds_size); i++) *ptr_0++ = (uint32_t)i; - HDmemset(tv_ptr->large_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->large_ds_size); - HDmemset(tv_ptr->large_ds_buf_2, 0, sizeof(uint32_t) * tv_ptr->large_ds_size); + memset(tv_ptr->large_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->large_ds_size); + memset(tv_ptr->large_ds_buf_2, 0, sizeof(uint32_t) * tv_ptr->large_ds_size); - HDmemset(tv_ptr->large_ds_slice_buf, 0, sizeof(uint32_t) * tv_ptr->large_ds_slice_size); + memset(tv_ptr->large_ds_slice_buf, 0, sizeof(uint32_t) * tv_ptr->large_ds_slice_size); filename = (const char *)GetTestParameters(); assert(filename != NULL); @@ -720,7 +720,7 @@ contig_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) } /* zero out the buffer we will be reading into */ - HDmemset(tv_ptr->small_ds_slice_buf, 0, sizeof(uint32_t) * tv_ptr->small_ds_slice_size); + memset(tv_ptr->small_ds_slice_buf, 0, sizeof(uint32_t) * tv_ptr->small_ds_slice_size); #if CONTIG_HS_DR_PIO_TEST__D2M_L2S__DEBUG fprintf(stdout, "%s reading slices from big cube on disk into small cube slice.\n", fcnName); @@ -933,7 +933,7 @@ contig_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) #endif /* CONTIG_HS_DR_PIO_TEST__D2M_S2L__DEBUG */ /* zero out the in memory large ds */ - HDmemset(tv_ptr->large_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->large_ds_size); + memset(tv_ptr->large_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->large_ds_size); /* set up start, stride, count, and block -- note that we will * change start[] so as to read slices of the large cube. @@ -1202,7 +1202,7 @@ contig_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) } /* zero out the in memory small ds */ - HDmemset(tv_ptr->small_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->small_ds_size); + memset(tv_ptr->small_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->small_ds_size); #if CONTIG_HS_DR_PIO_TEST__M2D_L2S__DEBUG fprintf(stdout, "%s writing slices from big ds to slices of small ds on disk.\n", fcnName); @@ -1475,7 +1475,7 @@ contig_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) } /* zero out the in memory large ds */ - HDmemset(tv_ptr->large_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->large_ds_size); + memset(tv_ptr->large_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->large_ds_size); #if CONTIG_HS_DR_PIO_TEST__M2D_S2L__DEBUG fprintf(stdout, "%s writing process slices of small ds to slices of large ds on disk.\n", fcnName); @@ -2551,7 +2551,7 @@ ckrbrd_hs_dr_pio_test__d2m_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) sel_start); /* zero out the buffer we will be reading into */ - HDmemset(tv_ptr->small_ds_slice_buf, 0, sizeof(uint32_t) * tv_ptr->small_ds_slice_size); + memset(tv_ptr->small_ds_slice_buf, 0, sizeof(uint32_t) * tv_ptr->small_ds_slice_size); #if CHECKER_BOARD_HS_DR_PIO_TEST__D2M_L2S__DEBUG fprintf(stdout, "%s:%d: initial small_ds_slice_buf = ", fcnName, tv_ptr->mpi_rank); @@ -2783,7 +2783,7 @@ ckrbrd_hs_dr_pio_test__d2m_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) #endif /* CHECKER_BOARD_HS_DR_PIO_TEST__D2M_S2L__DEBUG */ /* zero out the buffer we will be reading into */ - HDmemset(tv_ptr->large_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->large_ds_size); + memset(tv_ptr->large_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->large_ds_size); /* set up start, stride, count, and block -- note that we will * change start[] so as to read the slice of the small data set @@ -3107,7 +3107,7 @@ ckrbrd_hs_dr_pio_test__m2d_l2s(struct hs_dr_pio_test_vars_t *tv_ptr) } /* zero out the in memory small ds */ - HDmemset(tv_ptr->small_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->small_ds_size); + memset(tv_ptr->small_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->small_ds_size); #if CHECKER_BOARD_HS_DR_PIO_TEST__M2D_L2S__DEBUG fprintf(stdout, @@ -3404,7 +3404,7 @@ ckrbrd_hs_dr_pio_test__m2d_s2l(struct hs_dr_pio_test_vars_t *tv_ptr) } /* zero out the in memory large ds */ - HDmemset(tv_ptr->large_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->large_ds_size); + memset(tv_ptr->large_ds_buf_1, 0, sizeof(uint32_t) * tv_ptr->large_ds_size); #if CHECKER_BOARD_HS_DR_PIO_TEST__M2D_S2L__DEBUG fprintf(stdout, @@ -4282,7 +4282,7 @@ main(int argc, char **argv) H5open(); h5_show_hostname(); - HDmemset(filenames, 0, sizeof(filenames)); + memset(filenames, 0, sizeof(filenames)); for (int i = 0; i < NFILENAME; i++) { if (NULL == (filenames[i] = malloc(PATH_MAX))) { printf("couldn't allocate filename array\n"); diff --git a/testpar/t_span_tree.c b/testpar/t_span_tree.c index 20930ff..4950bc8 100644 --- a/testpar/t_span_tree.c +++ b/testpar/t_span_tree.c @@ -221,7 +221,7 @@ coll_write_test(int chunk_factor) matrix_out = (int *)malloc(sizeof(int) * (size_t)mdim[0] * (size_t)mdim[1] * (size_t)mpi_size); matrix_out1 = (int *)malloc(sizeof(int) * (size_t)mdim[0] * (size_t)mdim[1] * (size_t)mpi_size); - HDmemset(vector, 0, sizeof(int) * (size_t)mdim1[0] * (size_t)mpi_size); + memset(vector, 0, sizeof(int) * (size_t)mdim1[0] * (size_t)mpi_size); vector[0] = vector[MSPACE1_DIM * mpi_size - 1] = -1; for (i = 1; i < MSPACE1_DIM * mpi_size - 1; i++) H5_CHECKED_ASSIGN(vector[i], int, i, unsigned); @@ -544,8 +544,8 @@ coll_write_test(int chunk_factor) * Initialize data buffer. */ - HDmemset(matrix_out, 0, sizeof(int) * (size_t)MSPACE_DIM1 * (size_t)MSPACE_DIM2 * (size_t)mpi_size); - HDmemset(matrix_out1, 0, sizeof(int) * (size_t)MSPACE_DIM1 * (size_t)MSPACE_DIM2 * (size_t)mpi_size); + memset(matrix_out, 0, sizeof(int) * (size_t)MSPACE_DIM1 * (size_t)MSPACE_DIM2 * (size_t)mpi_size); + memset(matrix_out1, 0, sizeof(int) * (size_t)MSPACE_DIM1 * (size_t)MSPACE_DIM2 * (size_t)mpi_size); /* * Read data back to the buffer matrix_out. */ @@ -782,8 +782,8 @@ coll_read_test(void) * Initialize data buffer. */ - HDmemset(matrix_out, 0, sizeof(int) * (size_t)MSPACE_DIM1 * (size_t)MSPACE_DIM2 * (size_t)mpi_size); - HDmemset(matrix_out1, 0, sizeof(int) * (size_t)MSPACE_DIM1 * (size_t)MSPACE_DIM2 * (size_t)mpi_size); + memset(matrix_out, 0, sizeof(int) * (size_t)MSPACE_DIM1 * (size_t)MSPACE_DIM2 * (size_t)mpi_size); + memset(matrix_out1, 0, sizeof(int) * (size_t)MSPACE_DIM1 * (size_t)MSPACE_DIM2 * (size_t)mpi_size); /* * Read data back to the buffer matrix_out. diff --git a/testpar/t_subfiling_vfd.c b/testpar/t_subfiling_vfd.c index 7135617..8ac413a 100644 --- a/testpar/t_subfiling_vfd.c +++ b/testpar/t_subfiling_vfd.c @@ -514,7 +514,7 @@ test_stripe_sizes(void) write_buf = malloc(nbytes); VRFY(write_buf, "malloc succeeded"); - HDmemset(write_buf, 255, nbytes); + memset(write_buf, 255, nbytes); c_write_buf = write_buf; @@ -676,7 +676,7 @@ test_stripe_sizes(void) write_buf = malloc(nbytes); VRFY(write_buf, "malloc succeeded"); - HDmemset(write_buf, 255, nbytes); + memset(write_buf, 255, nbytes); c_write_buf = write_buf; diff --git a/testpar/t_vfd.c b/testpar/t_vfd.c index 37c918a..6e6329c 100644 --- a/testpar/t_vfd.c +++ b/testpar/t_vfd.c @@ -344,8 +344,8 @@ setup_vfd_test_file(int file_name_id, char *file_name, int mpi_size, H5FD_mpio_x failure_mssg = "Can't set MPI communicator and info in subfiling fapl."; } - HDmemset(&ioc_config, 0, sizeof(ioc_config)); - HDmemset(&subfiling_conf, 0, sizeof(subfiling_conf)); + memset(&ioc_config, 0, sizeof(ioc_config)); + memset(&subfiling_conf, 0, sizeof(subfiling_conf)); /* Get subfiling VFD defaults */ if ((pass) && (H5Pget_fapl_subfiling(fapl_id, &subfiling_conf) == FAIL)) { diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c index 5b7cd14..b35a758 100644 --- a/testpar/testphdf5.c +++ b/testpar/testphdf5.c @@ -334,7 +334,7 @@ main(int argc, char **argv) H5open(); h5_show_hostname(); - HDmemset(filenames, 0, sizeof(filenames)); + memset(filenames, 0, sizeof(filenames)); for (int i = 0; i < NFILENAME; i++) { if (NULL == (filenames[i] = malloc(PATH_MAX))) { printf("couldn't allocate filename array\n"); diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c index 442fb3e..502b2ec 100644 --- a/tools/lib/h5diff.c +++ b/tools/lib/h5diff.c @@ -112,7 +112,7 @@ print_incoming_data(void) do { MPI_Iprobe(MPI_ANY_SOURCE, MPI_TAG_PRINT_DATA, MPI_COMM_WORLD, &incomingMessage, &Status); if (incomingMessage) { - HDmemset(data, 0, PRINT_DATA_MAX_SIZE + 1); + memset(data, 0, PRINT_DATA_MAX_SIZE + 1); MPI_Recv(data, PRINT_DATA_MAX_SIZE, MPI_CHAR, Status.MPI_SOURCE, MPI_TAG_PRINT_DATA, MPI_COMM_WORLD, &Status); @@ -494,7 +494,7 @@ trav_grp_symlinks(const char *path, const H5L_info2_t *linfo, void *udata) H5TOOLS_START_DEBUG(" "); /* init linkinfo struct */ - HDmemset(&lnk_info, 0, sizeof(h5tool_link_info_t)); + memset(&lnk_info, 0, sizeof(h5tool_link_info_t)); if (!opts->follow_links) { trav_info_visit_lnk(path, linfo, tinfo); @@ -628,10 +628,10 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char H5TOOLS_START_DEBUG(" "); /* init filenames */ - HDmemset(filenames, 0, MAX_FILENAME * 2); + memset(filenames, 0, MAX_FILENAME * 2); /* init link info struct */ - HDmemset(&trg_linfo1, 0, sizeof(h5tool_link_info_t)); - HDmemset(&trg_linfo2, 0, sizeof(h5tool_link_info_t)); + memset(&trg_linfo1, 0, sizeof(h5tool_link_info_t)); + memset(&trg_linfo2, 0, sizeof(h5tool_link_info_t)); /*------------------------------------------------------------------------- * check invalid combination of options @@ -776,7 +776,7 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char obj1type = (h5trav_type_t)oinfo1.type; trav_info_add(info1_obj, obj1fullname, obj1type); idx = info1_obj->nused - 1; - HDmemcpy(&info1_obj->paths[idx].obj_token, &oinfo1.token, sizeof(H5O_token_t)); + memcpy(&info1_obj->paths[idx].obj_token, &oinfo1.token, sizeof(H5O_token_t)); info1_obj->paths[idx].fileno = oinfo1.fileno; } else if (src_linfo1.type == H5L_TYPE_SOFT) { @@ -826,7 +826,7 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char obj2type = (h5trav_type_t)oinfo2.type; trav_info_add(info2_obj, obj2fullname, obj2type); idx = info2_obj->nused - 1; - HDmemcpy(&info2_obj->paths[idx].obj_token, &oinfo2.token, sizeof(H5O_token_t)); + memcpy(&info2_obj->paths[idx].obj_token, &oinfo2.token, sizeof(H5O_token_t)); info2_obj->paths[idx].fileno = oinfo2.fileno; } else if (src_linfo2.type == H5L_TYPE_SOFT) { @@ -896,7 +896,7 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char size_t idx = info1_lp->nused - 1; H5TOOLS_DEBUG("h5diff ... ... ... info1_obj not null"); - HDmemcpy(&info1_lp->paths[idx].obj_token, &trg_linfo1.obj_token, sizeof(H5O_token_t)); + memcpy(&info1_lp->paths[idx].obj_token, &trg_linfo1.obj_token, sizeof(H5O_token_t)); info1_lp->paths[idx].type = (h5trav_type_t)trg_linfo1.trg_type; info1_lp->paths[idx].fileno = trg_linfo1.fileno; } @@ -936,7 +936,7 @@ h5diff(const char *fname1, const char *fname2, const char *objname1, const char size_t idx = info2_lp->nused - 1; H5TOOLS_DEBUG("h5diff ... ... ... info2_obj not null"); - HDmemcpy(&info2_lp->paths[idx].obj_token, &trg_linfo2.obj_token, sizeof(H5O_token_t)); + memcpy(&info2_lp->paths[idx].obj_token, &trg_linfo2.obj_token, sizeof(H5O_token_t)); info2_lp->paths[idx].type = (h5trav_type_t)trg_linfo2.trg_type; info2_lp->paths[idx].fileno = trg_linfo2.fileno; } @@ -1173,7 +1173,7 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1, hid_t file2_id, MPI_Status Status; /*set all tasks as free */ - HDmemset(workerTasks, 1, (size_t)(g_nTasks - 1) * sizeof(char)); + memset(workerTasks, 1, (size_t)(g_nTasks - 1) * sizeof(char)); #endif for (i = 0; i < table->nobjs; i++) { @@ -1472,7 +1472,7 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1, hid_t file2_id, } /* end else-if */ else if (Status.MPI_TAG == MPI_TAG_PRINT_DATA) { char data[PRINT_DATA_MAX_SIZE + 1]; - HDmemset(data, 0, PRINT_DATA_MAX_SIZE + 1); + memset(data, 0, PRINT_DATA_MAX_SIZE + 1); MPI_Recv(data, PRINT_DATA_MAX_SIZE, MPI_CHAR, Status.MPI_SOURCE, MPI_TAG_PRINT_DATA, MPI_COMM_WORLD, &Status); @@ -1548,8 +1548,8 @@ diff(hid_t file1_id, const char *path1, hid_t file2_id, const char *path2, diff_ H5TOOLS_START_DEBUG(" - errstat:%d", opts->err_stat); /*init link info struct */ - HDmemset(&linkinfo1, 0, sizeof(h5tool_link_info_t)); - HDmemset(&linkinfo2, 0, sizeof(h5tool_link_info_t)); + memset(&linkinfo1, 0, sizeof(h5tool_link_info_t)); + memset(&linkinfo2, 0, sizeof(h5tool_link_info_t)); /* pass how to handle printing warnings to linkinfo option */ if (print_warn(opts)) @@ -1833,7 +1833,7 @@ diff(hid_t file1_id, const char *path1, hid_t file2_id, const char *path2, diff_ if (linkinfo1.linfo.type == H5L_TYPE_EXTERNAL && linkinfo2.linfo.type == H5L_TYPE_EXTERNAL) { /* If the buffers are the same size, compare them */ if (linkinfo1.linfo.u.val_size == linkinfo2.linfo.u.val_size) { - status = HDmemcmp(linkinfo1.trg_path, linkinfo2.trg_path, linkinfo1.linfo.u.val_size); + status = memcmp(linkinfo1.trg_path, linkinfo2.trg_path, linkinfo1.linfo.u.val_size); } else status = 1; diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c index 37c17e5..edb0190 100644 --- a/tools/lib/h5diff_array.c +++ b/tools/lib/h5diff_array.c @@ -212,7 +212,7 @@ diff_array(void *_mem1, void *_mem2, diff_opt_t *opts, hid_t container1_id, hid_ * by the condition, but it gives more clarity for code planning */ if (type_class != H5T_REFERENCE && type_class != H5T_COMPOUND && type_class != H5T_STRING && - type_class != H5T_VLEN && HDmemcmp(mem1, mem2, size * opts->hs_nelmts) == 0) { + type_class != H5T_VLEN && memcmp(mem1, mem2, size * opts->hs_nelmts) == 0) { H5TOOLS_ENDDEBUG(":Fast comparison - errstat:%d", opts->err_stat); return 0; } @@ -381,7 +381,7 @@ diff_array(void *_mem1, void *_mem2, diff_opt_t *opts, hid_t container1_id, hid_ case H5T_VLEN: case H5T_REFERENCE: H5TOOLS_DEBUG("type_class:OTHER"); - HDmemset(&members, 0, sizeof(mcomp_t)); + memset(&members, 0, sizeof(mcomp_t)); get_member_types(opts->m_tid, &members); for (i = 0; i < opts->hs_nelmts; i++) { H5TOOLS_DEBUG("opts->pos[%" PRIuHSIZE "]:%" PRIuHSIZE " - nelmts:%" PRIuHSIZE, i, @@ -460,7 +460,7 @@ diff_datum(void *_mem1, void *_mem2, hsize_t elemtno, diff_opt_t *opts, hid_t co * by the condition, but it gives more clarity for code planning */ if (type_class != H5T_REFERENCE && type_class != H5T_COMPOUND && type_class != H5T_STRING && - type_class != H5T_VLEN && HDmemcmp(mem1, mem2, type_size) == 0) + type_class != H5T_VLEN && memcmp(mem1, mem2, type_size) == 0) H5TOOLS_GOTO_DONE(opts->err_stat); switch (H5Tget_class(opts->m_tid)) { @@ -590,7 +590,7 @@ diff_datum(void *_mem1, void *_mem2, hsize_t elemtno, diff_opt_t *opts, hid_t co /* check for NULL pointer for string */ if (s != NULL) { /* try fast compare first */ - if ((HDmemcmp(s, sx, size) == 0) && (size1 != size2)) { + if ((memcmp(s, sx, size) == 0) && (size1 != size2)) { for (u = size; u < sizex; u++) character_compare(s + u, sx + u, elemtno, u, opts); } @@ -1556,8 +1556,8 @@ character_compare(char *mem1, char *mem2, hsize_t elemtno, size_t u, diff_opt_t char temp1_uchar; char temp2_uchar; - HDmemcpy(&temp1_uchar, mem1, sizeof(unsigned char)); - HDmemcpy(&temp2_uchar, mem2, sizeof(unsigned char)); + memcpy(&temp1_uchar, mem1, sizeof(unsigned char)); + memcpy(&temp2_uchar, mem2, sizeof(unsigned char)); H5TOOLS_START_DEBUG(" %d=%d", temp1_uchar, temp2_uchar); if (temp1_uchar != temp2_uchar) { @@ -1598,8 +1598,8 @@ character_compare_opt(unsigned char *mem1, unsigned char *mem2, hsize_t elemtno, /* both_zero is set in the PER_UNSIGN macro but not used in this function */ (void)both_zero; - HDmemcpy(&temp1_uchar, mem1, sizeof(unsigned char)); - HDmemcpy(&temp2_uchar, mem2, sizeof(unsigned char)); + memcpy(&temp1_uchar, mem1, sizeof(unsigned char)); + memcpy(&temp2_uchar, mem2, sizeof(unsigned char)); H5TOOLS_START_DEBUG(" %d=%d", temp1_uchar, temp2_uchar); /* -d and !-p */ @@ -1673,8 +1673,8 @@ diff_float_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, d H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool); - HDmemcpy(&temp1_float, mem1, sizeof(float)); - HDmemcpy(&temp2_float, mem2, sizeof(float)); + memcpy(&temp1_float, mem1, sizeof(float)); + memcpy(&temp2_float, mem2, sizeof(float)); /* logic for detecting NaNs is different with opts -d, -p and no opts */ @@ -1853,8 +1853,8 @@ diff_double_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool); - HDmemcpy(&temp1_double, mem1, sizeof(double)); - HDmemcpy(&temp2_double, mem2, sizeof(double)); + memcpy(&temp1_double, mem1, sizeof(double)); + memcpy(&temp2_double, mem2, sizeof(double)); /*------------------------------------------------------------------------- * -d and !-p @@ -2026,8 +2026,8 @@ diff_ldouble_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool); - HDmemcpy(&temp1_double, mem1, sizeof(long double)); - HDmemcpy(&temp2_double, mem2, sizeof(long double)); + memcpy(&temp1_double, mem1, sizeof(long double)); + memcpy(&temp2_double, mem2, sizeof(long double)); /* logic for detecting NaNs is different with options -d, -p and no options */ @@ -2196,8 +2196,8 @@ diff_schar_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, d hbool_t both_zero = FALSE; H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool); - HDmemcpy(&temp1_char, mem1, sizeof(char)); - HDmemcpy(&temp2_char, mem2, sizeof(char)); + memcpy(&temp1_char, mem1, sizeof(char)); + memcpy(&temp2_char, mem2, sizeof(char)); /* -d and !-p */ if (opts->delta_bool && !opts->percent_bool) { @@ -2285,8 +2285,8 @@ diff_uchar_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, d H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool); - HDmemcpy(&temp1_uchar, mem1, sizeof(unsigned char)); - HDmemcpy(&temp2_uchar, mem2, sizeof(unsigned char)); + memcpy(&temp1_uchar, mem1, sizeof(unsigned char)); + memcpy(&temp2_uchar, mem2, sizeof(unsigned char)); /* -d and !-p */ if (opts->delta_bool && !opts->percent_bool) { if (PDIFF(temp1_uchar, temp2_uchar) > opts->delta) { @@ -2373,8 +2373,8 @@ diff_short_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, d H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool); - HDmemcpy(&temp1_short, mem1, sizeof(short)); - HDmemcpy(&temp2_short, mem2, sizeof(short)); + memcpy(&temp1_short, mem1, sizeof(short)); + memcpy(&temp2_short, mem2, sizeof(short)); /* -d and !-p */ if (opts->delta_bool && !opts->percent_bool) { if (ABS(temp1_short - temp2_short) > opts->delta) { @@ -2461,8 +2461,8 @@ diff_ushort_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool); - HDmemcpy(&temp1_ushort, mem1, sizeof(unsigned short)); - HDmemcpy(&temp2_ushort, mem2, sizeof(unsigned short)); + memcpy(&temp1_ushort, mem1, sizeof(unsigned short)); + memcpy(&temp2_ushort, mem2, sizeof(unsigned short)); /* -d and !-p */ if (opts->delta_bool && !opts->percent_bool) { if (PDIFF(temp1_ushort, temp2_ushort) > opts->delta) { @@ -2553,8 +2553,8 @@ diff_int_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, dif H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool); - HDmemcpy(&temp1_int, mem1, sizeof(int)); - HDmemcpy(&temp2_int, mem2, sizeof(int)); + memcpy(&temp1_int, mem1, sizeof(int)); + memcpy(&temp2_int, mem2, sizeof(int)); /* -d and !-p */ if (opts->delta_bool && !opts->percent_bool) { if (ABS(temp1_int - temp2_int) > opts->delta) { @@ -2641,8 +2641,8 @@ diff_uint_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, di H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool); - HDmemcpy(&temp1_uint, mem1, sizeof(unsigned int)); - HDmemcpy(&temp2_uint, mem2, sizeof(unsigned int)); + memcpy(&temp1_uint, mem1, sizeof(unsigned int)); + memcpy(&temp2_uint, mem2, sizeof(unsigned int)); /* -d and !-p */ if (opts->delta_bool && !opts->percent_bool) { if (PDIFF(temp1_uint, temp2_uint) > opts->delta) { @@ -2729,8 +2729,8 @@ diff_long_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, di H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool); - HDmemcpy(&temp1_long, mem1, sizeof(long)); - HDmemcpy(&temp2_long, mem2, sizeof(long)); + memcpy(&temp1_long, mem1, sizeof(long)); + memcpy(&temp2_long, mem2, sizeof(long)); /* -d and !-p */ if (opts->delta_bool && !opts->percent_bool) { if (ABS(temp1_long - temp2_long) > (long)opts->delta) { @@ -2817,8 +2817,8 @@ diff_ulong_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, d H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool); - HDmemcpy(&temp1_ulong, mem1, sizeof(unsigned long)); - HDmemcpy(&temp2_ulong, mem2, sizeof(unsigned long)); + memcpy(&temp1_ulong, mem1, sizeof(unsigned long)); + memcpy(&temp2_ulong, mem2, sizeof(unsigned long)); /* -d and !-p */ if (opts->delta_bool && !opts->percent_bool) { if (PDIFF(temp1_ulong, temp2_ulong) > (unsigned long)opts->delta) { @@ -2907,8 +2907,8 @@ diff_llong_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, d H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool); - HDmemcpy(&temp1_llong, mem1, sizeof(long long)); - HDmemcpy(&temp2_llong, mem2, sizeof(long long)); + memcpy(&temp1_llong, mem1, sizeof(long long)); + memcpy(&temp2_llong, mem2, sizeof(long long)); /* -d and !-p */ if (opts->delta_bool && !opts->percent_bool) { @@ -3001,8 +3001,8 @@ diff_ullong_element(unsigned char *mem1, unsigned char *mem2, hsize_t elem_idx, H5TOOLS_START_DEBUG("delta_bool:%d - percent_bool:%d", opts->delta_bool, opts->percent_bool); - HDmemcpy(&temp1_ullong, mem1, sizeof(unsigned long long)); - HDmemcpy(&temp2_ullong, mem2, sizeof(unsigned long long)); + memcpy(&temp1_ullong, mem1, sizeof(unsigned long long)); + memcpy(&temp2_ullong, mem2, sizeof(unsigned long long)); /* -d and !-p */ if (opts->delta_bool && !opts->percent_bool) { @@ -3104,13 +3104,13 @@ ull2float(unsigned long long ull_value, float *f_value) if ((buf = (unsigned char *)calloc((size_t)1, MAX(src_size, dst_size))) == NULL) H5TOOLS_GOTO_ERROR(FAIL, "Could not allocate buffer for dims"); - HDmemcpy(buf, &ull_value, src_size); + memcpy(buf, &ull_value, src_size); /* do conversion */ if (H5Tconvert(H5T_NATIVE_ULLONG, H5T_NATIVE_FLOAT, (size_t)1, buf, NULL, dxpl_id) < 0) H5TOOLS_GOTO_ERROR(FAIL, "H5Tconvert failed"); - HDmemcpy(f_value, buf, dst_size); + memcpy(f_value, buf, dst_size); done: H5E_BEGIN_TRY @@ -3165,7 +3165,7 @@ equal_double(double value, double expected, diff_opt_t *opts) } else { /* Check bits */ - if (!HDmemcmp(&value, &expected, sizeof(double))) + if (!memcmp(&value, &expected, sizeof(double))) return TRUE; } @@ -3212,7 +3212,7 @@ equal_ldouble(long double value, long double expected, diff_opt_t *opts) } else { /* Check bits */ - if (!HDmemcmp(&value, &expected, sizeof(long double))) + if (!memcmp(&value, &expected, sizeof(long double))) return TRUE; } @@ -3258,7 +3258,7 @@ equal_float(float value, float expected, diff_opt_t *opts) } else { /* Check bits */ - if (!HDmemcmp(&value, &expected, sizeof(float))) + if (!memcmp(&value, &expected, sizeof(float))) return TRUE; } @@ -3501,7 +3501,7 @@ get_member_types(hid_t tid, mcomp_t *members) members->ids[u] = H5Tget_member_type(tid, u); members->offsets[u] = H5Tget_member_offset(tid, u); members->m[u] = (mcomp_t *)malloc(sizeof(mcomp_t)); - HDmemset(members->m[u], 0, sizeof(mcomp_t)); + memset(members->m[u], 0, sizeof(mcomp_t)); get_member_types(members->ids[u], members->m[u]); } } diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c index c0c5ba1..78f52bc 100644 --- a/tools/lib/h5diff_dset.c +++ b/tools/lib/h5diff_dset.c @@ -532,17 +532,17 @@ diff_datasetid(hid_t did1, hid_t did2, const char *obj1_name, const char *obj2_n } /* the stripmine loop */ - HDmemset(hs_offset1, 0, sizeof hs_offset1); - HDmemset(hs_stride1, 0, sizeof hs_stride1); - HDmemset(hs_count1, 0, sizeof hs_count1); - HDmemset(hs_block1, 0, sizeof hs_block1); - HDmemset(hs_size1, 0, sizeof hs_size1); - HDmemset(hs_offset2, 0, sizeof hs_offset2); - HDmemset(hs_stride2, 0, sizeof hs_stride2); - HDmemset(hs_count2, 0, sizeof hs_count2); - HDmemset(hs_block2, 0, sizeof hs_block2); - HDmemset(hs_size2, 0, sizeof hs_size2); - HDmemset(zero, 0, sizeof zero); + memset(hs_offset1, 0, sizeof hs_offset1); + memset(hs_stride1, 0, sizeof hs_stride1); + memset(hs_count1, 0, sizeof hs_count1); + memset(hs_block1, 0, sizeof hs_block1); + memset(hs_size1, 0, sizeof hs_size1); + memset(hs_offset2, 0, sizeof hs_offset2); + memset(hs_stride2, 0, sizeof hs_stride2); + memset(hs_count2, 0, sizeof hs_count2); + memset(hs_block2, 0, sizeof hs_block2); + memset(hs_size2, 0, sizeof hs_size2); + memset(zero, 0, sizeof zero); /* if subsetting was requested - initialize the subsetting variables */ H5TOOLS_DEBUG("compare by hyperslabs: opts->nelmts=%ld - opts->m_size=%ld", opts->nelmts, diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c index 30edd5f..5beffa4 100644 --- a/tools/lib/h5tools.c +++ b/tools/lib/h5tools.c @@ -1229,8 +1229,8 @@ h5tools_simple_prefix(FILE *stream, const h5tool_format_t *info, h5tools_context H5TOOLS_START_DEBUG(" "); - HDmemset(&prefix, 0, sizeof(h5tools_str_t)); - HDmemset(&str, 0, sizeof(h5tools_str_t)); + memset(&prefix, 0, sizeof(h5tools_str_t)); + memset(&str, 0, sizeof(h5tools_str_t)); /* Terminate previous line, if any */ H5TOOLS_DEBUG("before CR elmtno=%ld, ctx->cur_column=%d, info->idx_fmt=%s, info->line_suf=%s", elmtno, @@ -1324,8 +1324,8 @@ h5tools_region_simple_prefix(FILE *stream, const h5tool_format_t *info, h5tools_ if (!ctx->need_prefix) return; - HDmemset(&prefix, 0, sizeof(h5tools_str_t)); - HDmemset(&str, 0, sizeof(h5tools_str_t)); + memset(&prefix, 0, sizeof(h5tools_str_t)); + memset(&str, 0, sizeof(h5tools_str_t)); /* Terminate previous line, if any */ if (ctx->cur_column) { @@ -1842,7 +1842,7 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem, hsize_t s = (char *)mem; } for (i = 0; i < size && (s[i] || pad != H5T_STR_NULLTERM); i++) { - HDmemcpy(&tempuchar, &s[i], sizeof(unsigned char)); + memcpy(&tempuchar, &s[i], sizeof(unsigned char)); if (1 != fwrite(&tempuchar, sizeof(unsigned char), 1, stream)) H5TOOLS_THROW((-1), "fwrite failed"); } /* i */ @@ -1946,11 +1946,11 @@ render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem, hsize_t if (size > sizeof(tref)) H5TOOLS_THROW((-1), "unexpectedly large ref"); - HDmemset(&tref, 0, sizeof(tref)); + memset(&tref, 0, sizeof(tref)); for (block_index = 0; block_index < block_nelmts; block_index++) { mem = ((unsigned char *)_mem) + block_index * size; - HDmemcpy(&tref, mem, size); + memcpy(&tref, mem, size); if ((region_id = H5Ropen_object(&tref, H5P_DEFAULT, H5P_DEFAULT)) < 0) H5TOOLS_INFO("H5Ropen_object H5T_STD_REF failed"); else { diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c index 4840def..d869907 100644 --- a/tools/lib/h5tools_dump.c +++ b/tools/lib/h5tools_dump.c @@ -264,7 +264,7 @@ h5tools_dump_simple_data(FILE *stream, const h5tool_format_t *info, h5tools_cont } /* end if */ else { /* setup */ - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&buffer, 0, sizeof(h5tools_str_t)); size = H5Tget_size(type); H5TOOLS_DEBUG("type size is %ld", size); @@ -500,7 +500,7 @@ h5tools_print_region_data_blocks(hid_t region_id, FILE *stream, const h5tool_for assert(buffer); assert(ptdata); - HDmemset(&ctx, 0, sizeof(ctx)); + memset(&ctx, 0, sizeof(ctx)); H5TOOLS_START_DEBUG(" "); @@ -899,7 +899,7 @@ h5tools_print_region_data_points(hid_t region_space, hid_t region_id, FILE *stre H5TOOLS_START_DEBUG(" "); - HDmemset(&ctx, 0, sizeof(ctx)); + memset(&ctx, 0, sizeof(ctx)); /* Allocate space for the dimension array */ if ((dims1 = (hsize_t *)malloc(sizeof(hsize_t) * ndims)) == NULL) H5TOOLS_THROW((-1), "Could not allocate buffer for dims"); @@ -1702,8 +1702,8 @@ h5tools_dump_simple_dset(FILE *stream, const h5tool_format_t *info, h5tools_cont H5TOOLS_DEBUG("ctx->ndims:%d", ctx->ndims); /* The stripmine loop */ - HDmemset(hs_offset, 0, sizeof hs_offset); - HDmemset(zero, 0, sizeof zero); + memset(hs_offset, 0, sizeof hs_offset); + memset(zero, 0, sizeof zero); for (elmtno = 0; elmtno < p_nelmts; elmtno += hs_nelmts) { H5TOOLS_DEBUG("stripmine read loop:%d", i); @@ -1901,7 +1901,7 @@ h5tools_dump_dset(FILE *stream, const h5tool_format_t *info, h5tools_context_t * stream = rawoutstream; if (!info) { - HDmemset(&info_dflt, 0, sizeof info_dflt); + memset(&info_dflt, 0, sizeof info_dflt); info = &info_dflt; } @@ -1977,7 +1977,7 @@ h5tools_dump_mem(FILE *stream, const h5tool_format_t *info, h5tools_context_t *c stream = rawoutstream; if (!info) { - HDmemset(&info_dflt, 0, sizeof(info_dflt)); + memset(&info_dflt, 0, sizeof(info_dflt)); info = &info_dflt; } @@ -2812,13 +2812,13 @@ h5tools_print_enum(FILE *stream, h5tools_str_t *buffer, const h5tool_format_t *i else if (H5T_SGN_NONE == H5Tget_sign(native)) { unsigned long long copy; - HDmemcpy(©, value + i * dst_size, sizeof(copy)); + memcpy(©, value + i * dst_size, sizeof(copy)); h5tools_str_append(buffer, "%llu", copy); } else { long long copy; - HDmemcpy(©, value + i * dst_size, sizeof(copy)); + memcpy(©, value + i * dst_size, sizeof(copy)); h5tools_str_append(buffer, "%lld", copy); } @@ -2871,7 +2871,7 @@ h5tools_dump_datatype(FILE *stream, const h5tool_format_t *info, h5tools_context */ /* setup */ - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&buffer, 0, sizeof(h5tools_str_t)); if (info->line_ncols > 0) ncols = info->line_ncols; @@ -2917,7 +2917,7 @@ h5tools_dump_dataspace(FILE *stream, const h5tool_format_t *info, h5tools_contex */ /* setup */ - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&buffer, 0, sizeof(h5tools_str_t)); if (info->line_ncols > 0) ncols = info->line_ncols; @@ -2964,7 +2964,7 @@ h5tools_dump_oid(FILE *stream, const h5tool_format_t *info, h5tools_context_t *c */ /* setup */ - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&buffer, 0, sizeof(h5tools_str_t)); if (info->line_ncols > 0) ncols = info->line_ncols; @@ -3122,7 +3122,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t * h5tools_str_t buffer; /* string into which to render */ /* setup */ - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&buffer, 0, sizeof(h5tools_str_t)); if (info->line_ncols > 0) ncols = info->line_ncols; @@ -3765,7 +3765,7 @@ h5tools_dump_comment(FILE *stream, const h5tool_format_t *info, h5tools_context_ return; /* setup */ - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&buffer, 0, sizeof(h5tools_str_t)); if (info->line_ncols > 0) ncols = info->line_ncols; @@ -3817,7 +3817,7 @@ h5tools_dump_attribute(FILE *stream, const h5tool_format_t *info, h5tools_contex */ /* setup */ - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&buffer, 0, sizeof(h5tools_str_t)); if (info->line_ncols > 0) ncols = info->line_ncols; @@ -3959,7 +3959,7 @@ h5tools_dump_subsetting_header(FILE *stream, const h5tool_format_t *info, h5tool size_t ncols = 80; /* available output width */ /* setup */ - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&buffer, 0, sizeof(h5tools_str_t)); if (info->line_ncols > 0) ncols = info->line_ncols; @@ -4054,7 +4054,7 @@ h5tools_dump_reference(FILE *stream, const h5tool_format_t *info, h5tools_contex /* Assume entire data space to be printed */ datactx.need_prefix = TRUE; - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&buffer, 0, sizeof(h5tools_str_t)); for (i = 0; i < ndims; i++, datactx.cur_elmt++, elmt_counter++) { H5O_type_t obj_type = -1; /* Object type */ H5R_type_t ref_type; /* Reference type */ @@ -4287,7 +4287,7 @@ h5tools_dump_data(FILE *stream, const h5tool_format_t *info, h5tools_context_t * H5TOOLS_START_DEBUG(" file=%p", (void *)stream); H5TOOLS_DEBUG("rawdata file=%p", (void *)rawdatastream); /* setup */ - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&buffer, 0, sizeof(h5tools_str_t)); if (info->line_ncols > 0) ncols = info->line_ncols; diff --git a/tools/lib/h5tools_ref.c b/tools/lib/h5tools_ref.c index e7858c8..d89c546 100644 --- a/tools/lib/h5tools_ref.c +++ b/tools/lib/h5tools_ref.c @@ -108,7 +108,7 @@ ref_path_table_cmp(const void *key1, const void *key2) if (thefile > 0) H5Otoken_cmp(thefile, token1, token2, &cmp_value); else - cmp_value = HDmemcmp(token1, token2, sizeof(H5O_token_t)); + cmp_value = memcmp(token1, token2, sizeof(H5O_token_t)); return cmp_value; } @@ -201,7 +201,7 @@ ref_path_table_lookup(const char *thepath, H5O_token_t *token) return -1; /* Return object token through parameter */ - HDmemcpy(token, &oi.token, sizeof(H5O_token_t)); + memcpy(token, &oi.token, sizeof(H5O_token_t)); return 0; } @@ -230,7 +230,7 @@ ref_path_table_put(const char *path, const H5O_token_t *token) if ((new_node = (ref_path_node_t *)malloc(sizeof(ref_path_node_t))) == NULL) return (-1); - HDmemcpy(&new_node->obj_token, token, sizeof(H5O_token_t)); + memcpy(&new_node->obj_token, token, sizeof(H5O_token_t)); new_node->path = HDstrdup(path); return (H5SL_insert(ref_path_table, new_node, &(new_node->obj_token))); diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c index d927820..5ae6838 100644 --- a/tools/lib/h5tools_str.c +++ b/tools/lib/h5tools_str.c @@ -63,7 +63,7 @@ h5tools_str_close(h5tools_str_t *str) { if (str && str->nalloc) { free(str->s); - HDmemset(str, 0, sizeof(h5tools_str_t)); + memset(str, 0, sizeof(h5tools_str_t)); } } @@ -704,21 +704,21 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai /* if (H5Tequal(type, H5T_NATIVE_FLOAT)) */ float tempfloat; - HDmemcpy(&tempfloat, vp, sizeof(float)); + memcpy(&tempfloat, vp, sizeof(float)); h5tools_str_append(str, OPT(info->fmt_float, "%g"), (double)tempfloat); } else if (sizeof(double) == nsize) { /* if (H5Tequal(type, H5T_NATIVE_DOUBLE)) */ double tempdouble; - HDmemcpy(&tempdouble, vp, sizeof(double)); + memcpy(&tempdouble, vp, sizeof(double)); h5tools_str_append(str, OPT(info->fmt_double, "%g"), tempdouble); } else if (sizeof(long double) == nsize) { /* if (H5Tequal(type, H5T_NATIVE_LDOUBLE)) */ long double templdouble; - HDmemcpy(&templdouble, vp, sizeof(long double)); + memcpy(&templdouble, vp, sizeof(long double)); h5tools_str_append(str, "%Lg", templdouble); } else { @@ -818,7 +818,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai else if (H5T_SGN_NONE == nsign) { unsigned char tempuchar; - HDmemcpy(&tempuchar, ucp_vp, sizeof(unsigned char)); + memcpy(&tempuchar, ucp_vp, sizeof(unsigned char)); if (packed_bits_num) { if (packed_data_offset >= 8 * sizeof(unsigned char)) tempuchar = 0; @@ -832,7 +832,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai else { signed char tempchar; - HDmemcpy(&tempchar, cp_vp, sizeof(char)); + memcpy(&tempchar, cp_vp, sizeof(char)); if (packed_bits_num) { if (packed_data_offset >= 8 * sizeof(char)) tempchar = 0; @@ -848,7 +848,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai if (H5T_SGN_NONE == nsign) { unsigned int tempuint; - HDmemcpy(&tempuint, vp, sizeof(unsigned int)); + memcpy(&tempuint, vp, sizeof(unsigned int)); if (packed_bits_num) { if (packed_data_offset >= 8 * sizeof(unsigned int)) tempuint = 0; @@ -860,7 +860,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai else { int tempint; - HDmemcpy(&tempint, vp, sizeof(int)); + memcpy(&tempint, vp, sizeof(int)); if (packed_bits_num) { if (packed_data_offset >= 8 * sizeof(int)) tempint = 0; @@ -875,7 +875,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai if (H5T_SGN_NONE == nsign) { unsigned short tempushort; - HDmemcpy(&tempushort, vp, sizeof(unsigned short)); + memcpy(&tempushort, vp, sizeof(unsigned short)); if (packed_bits_num) { if (packed_data_offset >= 8 * sizeof(unsigned short)) tempushort = 0; @@ -889,7 +889,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai else { short tempshort; - HDmemcpy(&tempshort, vp, sizeof(short)); + memcpy(&tempshort, vp, sizeof(short)); if (packed_bits_num) { if (packed_data_offset >= 8 * sizeof(short)) tempshort = 0; @@ -904,7 +904,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai if (H5T_SGN_NONE == nsign) { unsigned long tempulong; - HDmemcpy(&tempulong, vp, sizeof(unsigned long)); + memcpy(&tempulong, vp, sizeof(unsigned long)); if (packed_bits_num) { if (packed_data_offset >= 8 * sizeof(unsigned long)) tempulong = 0; @@ -916,7 +916,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai else { long templong; - HDmemcpy(&templong, vp, sizeof(long)); + memcpy(&templong, vp, sizeof(long)); if (packed_bits_num) { if (packed_data_offset >= 8 * sizeof(long)) templong = 0; @@ -932,7 +932,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai if (H5T_SGN_NONE == nsign) { unsigned long long tempullong; - HDmemcpy(&tempullong, vp, sizeof(unsigned long long)); + memcpy(&tempullong, vp, sizeof(unsigned long long)); if (packed_bits_num) { if (packed_data_offset >= 8 * sizeof(unsigned long long)) tempullong = 0; @@ -944,7 +944,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai else { long long templlong; - HDmemcpy(&templlong, vp, sizeof(long long)); + memcpy(&templlong, vp, sizeof(long long)); if (packed_bits_num) { if (packed_data_offset >= 8 * sizeof(long long)) templlong = 0; @@ -1544,10 +1544,10 @@ h5tools_escape(char *s /*in,out*/, size_t size) /*would overflow*/ return NULL; - HDmemmove(s + i + esc_size, s + i + 1, n - i); /*make room*/ - HDmemcpy(s + i, escape, esc_size); /*insert*/ - n += esc_size - 1; /* adjust total string size */ - i += esc_size; /* adjust string position */ + memmove(s + i + esc_size, s + i + 1, n - i); /*make room*/ + memcpy(s + i, escape, esc_size); /*insert*/ + n += esc_size - 1; /* adjust total string size */ + i += esc_size; /* adjust string position */ } } @@ -1609,11 +1609,11 @@ h5tools_str_replace(const char *string, const char *substr, const char *replacem free(oldstr); return NULL; } - HDmemcpy(newstr, oldstr, (size_t)(tok - oldstr)); - HDmemcpy(newstr + (tok - oldstr), replacement, HDstrlen(replacement)); - HDmemcpy(newstr + (tok - oldstr) + HDstrlen(replacement), tok + HDstrlen(substr), - HDstrlen(oldstr) - HDstrlen(substr) - (size_t)(tok - oldstr)); - HDmemset(newstr + HDstrlen(oldstr) - HDstrlen(substr) + HDstrlen(replacement), 0, 1); + memcpy(newstr, oldstr, (size_t)(tok - oldstr)); + memcpy(newstr + (tok - oldstr), replacement, HDstrlen(replacement)); + memcpy(newstr + (tok - oldstr) + HDstrlen(replacement), tok + HDstrlen(substr), + HDstrlen(oldstr) - HDstrlen(substr) - (size_t)(tok - oldstr)); + memset(newstr + HDstrlen(oldstr) - HDstrlen(substr) + HDstrlen(replacement), 0, 1); /* move back head right after the last replacement */ head = newstr + (tok - oldstr) + HDstrlen(replacement); free(oldstr); diff --git a/tools/lib/h5tools_utils.c b/tools/lib/h5tools_utils.c index 37a9568..baff559 100644 --- a/tools/lib/h5tools_utils.c +++ b/tools/lib/h5tools_utils.c @@ -784,7 +784,7 @@ add_obj(table_t *table, const H5O_token_t *obj_token, const char *objname, hbool u = table->nobjs++; /* Set information about object */ - HDmemcpy(&table->objs[u].obj_token, obj_token, sizeof(H5O_token_t)); + memcpy(&table->objs[u].obj_token, obj_token, sizeof(H5O_token_t)); table->objs[u].objname = HDstrdup(objname); table->objs[u].recorded = record; table->objs[u].displayed = 0; @@ -927,7 +927,7 @@ H5tools_get_symlink_info(hid_t file_id, const char *linkpath, h5tool_link_info_t } /* end if */ /* set target obj type to return */ - HDmemcpy(&link_info->obj_token, &trg_oinfo.token, sizeof(H5O_token_t)); + memcpy(&link_info->obj_token, &trg_oinfo.token, sizeof(H5O_token_t)); link_info->trg_type = trg_oinfo.type; link_info->fileno = trg_oinfo.fileno; } /* end if */ @@ -1180,7 +1180,7 @@ h5tools_populate_ros3_fapl(H5FD_ros3_fapl_t *fa, const char **values) ret_value = 0; goto done; } - HDmemcpy(fa->aws_region, values[0], (HDstrlen(values[0]) + 1)); + memcpy(fa->aws_region, values[0], (HDstrlen(values[0]) + 1)); if (show_progress) { printf(" aws_region set\n"); } @@ -1192,7 +1192,7 @@ h5tools_populate_ros3_fapl(H5FD_ros3_fapl_t *fa, const char **values) ret_value = 0; goto done; } - HDmemcpy(fa->secret_id, values[1], (HDstrlen(values[1]) + 1)); + memcpy(fa->secret_id, values[1], (HDstrlen(values[1]) + 1)); if (show_progress) { printf(" secret_id set\n"); } @@ -1204,7 +1204,7 @@ h5tools_populate_ros3_fapl(H5FD_ros3_fapl_t *fa, const char **values) ret_value = 0; goto done; } - HDmemcpy(fa->secret_key, values[2], (HDstrlen(values[2]) + 1)); + memcpy(fa->secret_key, values[2], (HDstrlen(values[2]) + 1)); if (show_progress) { printf(" secret_key set\n"); } diff --git a/tools/lib/h5trav.c b/tools/lib/h5trav.c index 060a33b..5ae379e 100644 --- a/tools/lib/h5trav.c +++ b/tools/lib/h5trav.c @@ -125,7 +125,7 @@ trav_token_add(trav_addr_t *visited, H5O_token_t *token, const char *path) /* Append it */ idx = visited->nused++; - HDmemcpy(&visited->objs[idx].token, token, sizeof(H5O_token_t)); + memcpy(&visited->objs[idx].token, token, sizeof(H5O_token_t)); visited->objs[idx].path = HDstrdup(path); } /* end trav_token_add() */ @@ -354,7 +354,7 @@ trav_fileinfo_add(trav_info_t *info, hid_t loc_id) else H5Oget_info3(loc_id, &oinfo, H5O_INFO_BASIC); - HDmemcpy(&info->paths[idx].obj_token, &oinfo.token, sizeof(H5O_token_t)); + memcpy(&info->paths[idx].obj_token, &oinfo.token, sizeof(H5O_token_t)); info->paths[idx].fileno = oinfo.fileno; } /* end trav_fileinfo_add() */ @@ -381,7 +381,7 @@ trav_info_visit_obj(const char *path, const H5O_info2_t *oinfo, const char H5_AT /* set object addr and fileno. These are for checking same object */ info_p = (trav_info_t *)udata; idx = info_p->nused - 1; - HDmemcpy(&info_p->paths[idx].obj_token, &oinfo->token, sizeof(H5O_token_t)); + memcpy(&info_p->paths[idx].obj_token, &oinfo->token, sizeof(H5O_token_t)); info_p->paths[idx].fileno = oinfo->fileno; return (0); @@ -658,7 +658,7 @@ trav_table_add(trav_table_t *table, const char *path, const H5O_info2_t *oinfo) new_obj = table->nobjs++; if (oinfo) - HDmemcpy(&table->objs[new_obj].obj_token, &oinfo->token, sizeof(H5O_token_t)); + memcpy(&table->objs[new_obj].obj_token, &oinfo->token, sizeof(H5O_token_t)); else /* Set token to 'undefined' values */ table->objs[new_obj].obj_token = H5O_TOKEN_UNDEF; diff --git a/tools/src/h5copy/h5copy.c b/tools/src/h5copy/h5copy.c index c2fd41a..2b28df3 100644 --- a/tools/src/h5copy/h5copy.c +++ b/tools/src/h5copy/h5copy.c @@ -217,7 +217,7 @@ main(int argc, char *argv[]) h5tools_init(); /* init linkinfo struct */ - HDmemset(&linkinfo, 0, sizeof(h5tool_link_info_t)); + memset(&linkinfo, 0, sizeof(h5tool_link_info_t)); /* Check for no command line parameters */ if (argc == 1) { diff --git a/tools/src/h5diff/h5diff_common.c b/tools/src/h5diff/h5diff_common.c index 0e34bc4..4854534 100644 --- a/tools/src/h5diff/h5diff_common.c +++ b/tools/src/h5diff/h5diff_common.c @@ -122,7 +122,7 @@ parse_command_line(int argc, const char *const *argv, const char **fname1, const H5TOOLS_START_DEBUG(" "); /* process the command-line */ - HDmemset(opts, 0, sizeof(diff_opt_t)); + memset(opts, 0, sizeof(diff_opt_t)); /* assume equal contents initially */ opts->contents = 1; diff --git a/tools/src/h5diff/ph5diff_main.c b/tools/src/h5diff/ph5diff_main.c index 807add3..efac3cb 100644 --- a/tools/src/h5diff/ph5diff_main.c +++ b/tools/src/h5diff/ph5diff_main.c @@ -181,7 +181,7 @@ ph5diff_worker(int nID) char out_data[PRINT_DATA_MAX_SIZE]; int tmp; - HDmemset(out_data, 0, PRINT_DATA_MAX_SIZE); + memset(out_data, 0, PRINT_DATA_MAX_SIZE); i = 0; rewind(overflow_file); @@ -191,7 +191,7 @@ ph5diff_worker(int nID) MPI_Send(out_data, PRINT_DATA_MAX_SIZE, MPI_BYTE, 0, MPI_TAG_PRINT_DATA, MPI_COMM_WORLD); i = 0; - HDmemset(out_data, 0, PRINT_DATA_MAX_SIZE); + memset(out_data, 0, PRINT_DATA_MAX_SIZE); } } @@ -204,7 +204,7 @@ ph5diff_worker(int nID) } fflush(stdout); - HDmemset(outBuff, 0, OUTBUFF_SIZE); + memset(outBuff, 0, OUTBUFF_SIZE); outBuffOffset = 0; MPI_Send(&diffs, sizeof(diffs), MPI_BYTE, 0, MPI_TAG_TOK_RETURN, MPI_COMM_WORLD); @@ -253,7 +253,7 @@ print_manager_output(void) } fflush(stdout); - HDmemset(outBuff, 0, OUTBUFF_SIZE); + memset(outBuff, 0, OUTBUFF_SIZE); outBuffOffset = 0; } else if ((outBuffOffset > 0) && !g_Parallel) { diff --git a/tools/src/h5dump/h5dump.c b/tools/src/h5dump/h5dump.c index 31671b0..db13a83 100644 --- a/tools/src/h5dump/h5dump.c +++ b/tools/src/h5dump/h5dump.c @@ -595,7 +595,7 @@ parse_mask_list(const char *h_list) /* sanity check */ if (h_list) { - HDmemset(packed_mask, 0, sizeof(packed_mask)); + memset(packed_mask, 0, sizeof(packed_mask)); packed_bits_num = 0; /* scan in pair of offset,length separated by commas. */ diff --git a/tools/src/h5dump/h5dump_ddl.c b/tools/src/h5dump/h5dump_ddl.c index c15bd26..da9093c 100644 --- a/tools/src/h5dump/h5dump_ddl.c +++ b/tools/src/h5dump/h5dump_ddl.c @@ -48,7 +48,7 @@ dump_datatype(hid_t type) h5tools_context_t ctx; /* print context */ h5tool_format_t *outputformat = &h5tools_dataformat; - HDmemset(&ctx, 0, sizeof(ctx)); + memset(&ctx, 0, sizeof(ctx)); ctx.indent_level = dump_indent / COL; ctx.cur_column = dump_indent; @@ -72,7 +72,7 @@ dump_dataspace(hid_t space) h5tools_context_t ctx; /* print context */ h5tool_format_t *outputformat = &h5tools_dataformat; - HDmemset(&ctx, 0, sizeof(ctx)); + memset(&ctx, 0, sizeof(ctx)); ctx.indent_level = dump_indent / COL; ctx.cur_column = dump_indent; @@ -99,7 +99,7 @@ dump_attr_cb(hid_t oid, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED * hid_t attr_id; herr_t ret = SUCCEED; - HDmemset(&ctx, 0, sizeof(ctx)); + memset(&ctx, 0, sizeof(ctx)); ctx.indent_level = dump_indent / COL; ctx.cur_column = dump_indent; ctx.display_index = dump_opts.display_ai; @@ -163,9 +163,9 @@ dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5_ATT hsize_t curr_pos = 0; /* total data element position */ /* setup */ - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&buffer, 0, sizeof(h5tools_str_t)); - HDmemset(&ctx, 0, sizeof(ctx)); + memset(&ctx, 0, sizeof(ctx)); ctx.indent_level = dump_indent / COL; ctx.cur_column = dump_indent; @@ -634,9 +634,9 @@ dump_named_datatype(hid_t tid, const char *name) h5tool_format_t string_dataformat; /* setup */ - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&buffer, 0, sizeof(h5tools_str_t)); - HDmemset(&ctx, 0, sizeof(ctx)); + memset(&ctx, 0, sizeof(ctx)); ctx.indent_level = dump_indent / COL; ctx.cur_column = dump_indent; @@ -790,9 +790,9 @@ dump_group(hid_t gid, const char *name) } /* setup */ - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&buffer, 0, sizeof(h5tools_str_t)); - HDmemset(&ctx, 0, sizeof(ctx)); + memset(&ctx, 0, sizeof(ctx)); ctx.indent_level = dump_indent / COL; ctx.cur_column = dump_indent; @@ -925,7 +925,7 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset) h5tools_str_t buffer; /* string into which to render */ hsize_t curr_pos = 0; /* total data element position */ - HDmemset(&ctx, 0, sizeof(ctx)); + memset(&ctx, 0, sizeof(ctx)); ctx.indent_level = dump_indent / COL; ctx.cur_column = dump_indent; @@ -958,7 +958,7 @@ dump_dataset(hid_t did, const char *name, struct subset_t *sset) } /* setup */ - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&buffer, 0, sizeof(h5tools_str_t)); ctx.need_prefix = TRUE; h5tools_simple_prefix(rawoutstream, outputformat, &ctx, (hsize_t)0, 0); @@ -1112,7 +1112,7 @@ dump_data(hid_t obj_id, int obj_data, struct subset_t *sset, int display_index) string_dataformat.do_escape = dump_opts.display_escape; outputformat = &string_dataformat; - HDmemset(&ctx, 0, sizeof(ctx)); + memset(&ctx, 0, sizeof(ctx)); ctx.indent_level = dump_indent / COL; ctx.cur_column = dump_indent; ctx.sset = sset; @@ -1344,7 +1344,7 @@ attr_search(hid_t oid, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *a else { size_t buffer_space = w - 1; - HDmemset(obj_name, '\0', w); + memset(obj_name, '\0', w); if (op_name[0] != '/') { HDstrncat(obj_name, buf, buffer_space); buffer_space -= MIN(buffer_space, u); @@ -1554,7 +1554,7 @@ handle_attributes(hid_t fid, const char *attr, void H5_ATTR_UNUSED *data, int H5 } /* end else */ dump_indent += COL; - HDmemset(&ctx, 0, sizeof(ctx)); + memset(&ctx, 0, sizeof(ctx)); ctx.indent_level = dump_indent / COL; ctx.cur_column = dump_indent; ctx.display_index = dump_opts.display_ai; @@ -1582,7 +1582,7 @@ handle_attributes(hid_t fid, const char *attr, void H5_ATTR_UNUSED *data, int H5 /* handle error case: cannot open the object with the attribute */ if ((oid = H5Oopen(fid, obj_name, H5P_DEFAULT)) < 0) { /* setup */ - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&buffer, 0, sizeof(h5tools_str_t)); ctx.need_prefix = TRUE; diff --git a/tools/src/h5dump/h5dump_xml.c b/tools/src/h5dump/h5dump_xml.c index 4ead4c0..cb279e3 100644 --- a/tools/src/h5dump/h5dump_xml.c +++ b/tools/src/h5dump/h5dump_xml.c @@ -140,9 +140,9 @@ xml_dump_all_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void H5 hsize_t curr_pos = 0; /* total data element position */ /* setup */ - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&buffer, 0, sizeof(h5tools_str_t)); - HDmemset(&ctx, 0, sizeof(ctx)); + memset(&ctx, 0, sizeof(ctx)); ctx.indent_level = dump_indent / COL; ctx.cur_column = dump_indent; @@ -873,9 +873,9 @@ xml_print_datatype(hid_t type, unsigned in_group) hsize_t curr_pos = 0; /* total data element position */ /* setup */ - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&buffer, 0, sizeof(h5tools_str_t)); - HDmemset(&ctx, 0, sizeof(ctx)); + memset(&ctx, 0, sizeof(ctx)); ctx.indent_level = dump_indent / COL; ctx.cur_column = dump_indent; @@ -1570,9 +1570,9 @@ xml_dump_datatype(hid_t type) hsize_t curr_pos = 0; /* total data element position */ /* setup */ - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&buffer, 0, sizeof(h5tools_str_t)); - HDmemset(&ctx, 0, sizeof(ctx)); + memset(&ctx, 0, sizeof(ctx)); ctx.indent_level = dump_indent / COL; ctx.cur_column = dump_indent; @@ -1704,9 +1704,9 @@ xml_dump_dataspace(hid_t space) H5S_class_t space_type = H5Sget_simple_extent_type(space); /* setup */ - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&buffer, 0, sizeof(h5tools_str_t)); - HDmemset(&ctx, 0, sizeof(ctx)); + memset(&ctx, 0, sizeof(ctx)); ctx.indent_level = dump_indent / COL; ctx.cur_column = dump_indent; @@ -1875,13 +1875,13 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED *sset, h5tool_format_t *outputformat = &xml_dataformat; h5tool_format_t string_dataformat; - HDmemset(&ctx, 0, sizeof(ctx)); + memset(&ctx, 0, sizeof(ctx)); ctx.indent_level = dump_indent / COL; ctx.cur_column = dump_indent; /* Print all the values. */ /* setup */ - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&buffer, 0, sizeof(h5tools_str_t)); string_dataformat = *outputformat; @@ -1935,7 +1935,7 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED *sset, status = xml_print_strs(obj_id, DATASET_DATA); else { h5tools_context_t datactx; - HDmemset(&datactx, 0, sizeof(datactx)); + memset(&datactx, 0, sizeof(datactx)); datactx.need_prefix = TRUE; datactx.indent_level = ctx.indent_level; datactx.cur_column = ctx.cur_column; @@ -1965,7 +1965,7 @@ xml_dump_data(hid_t obj_id, int obj_data, struct subset_t H5_ATTR_UNUSED *sset, } else { h5tools_context_t datactx; - HDmemset(&datactx, 0, sizeof(datactx)); + memset(&datactx, 0, sizeof(datactx)); datactx.need_prefix = TRUE; datactx.indent_level = ctx.indent_level; datactx.cur_column = ctx.cur_column; @@ -2044,9 +2044,9 @@ xml_dump_attr(hid_t attr, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED char *t_aname = xml_escape_the_name(attr_name); /* setup */ - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&buffer, 0, sizeof(h5tools_str_t)); - HDmemset(&ctx, 0, sizeof(ctx)); + memset(&ctx, 0, sizeof(ctx)); ctx.indent_level = dump_indent / COL; ctx.cur_column = dump_indent; @@ -2375,9 +2375,9 @@ xml_dump_named_datatype(hid_t type, const char *name) HDstrcat(tmp, name); /* setup */ - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&buffer, 0, sizeof(h5tools_str_t)); - HDmemset(&ctx, 0, sizeof(ctx)); + memset(&ctx, 0, sizeof(ctx)); ctx.indent_level = dump_indent / COL; ctx.cur_column = dump_indent; @@ -2594,9 +2594,9 @@ xml_dump_group(hid_t gid, const char *name) } /* setup */ - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&buffer, 0, sizeof(h5tools_str_t)); - HDmemset(&ctx, 0, sizeof(ctx)); + memset(&ctx, 0, sizeof(ctx)); ctx.indent_level = dump_indent / COL; ctx.cur_column = dump_indent; @@ -2998,9 +2998,9 @@ xml_print_refs(hid_t did, int source) refbuf = (H5R_ref_t *)((void *)buf); /* setup */ - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&buffer, 0, sizeof(h5tools_str_t)); - HDmemset(&ctx, 0, sizeof(ctx)); + memset(&ctx, 0, sizeof(ctx)); ctx.indent_level = dump_indent / COL; ctx.cur_column = dump_indent; @@ -3154,9 +3154,9 @@ xml_print_strs(hid_t did, int source) } /* setup */ - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&buffer, 0, sizeof(h5tools_str_t)); - HDmemset(&ctx, 0, sizeof(ctx)); + memset(&ctx, 0, sizeof(ctx)); ctx.indent_level = dump_indent / COL; ctx.cur_column = dump_indent; @@ -3269,9 +3269,9 @@ check_filters(hid_t dcpl) hsize_t curr_pos = 0; /* total data element position */ /* setup */ - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&buffer, 0, sizeof(h5tools_str_t)); - HDmemset(&ctx, 0, sizeof(ctx)); + memset(&ctx, 0, sizeof(ctx)); ctx.indent_level = dump_indent / COL; ctx.cur_column = dump_indent; @@ -3410,9 +3410,9 @@ xml_dump_fill_value(hid_t dcpl, hid_t type) hsize_t curr_pos = 0; /* total data element position */ /* setup */ - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&buffer, 0, sizeof(h5tools_str_t)); - HDmemset(&ctx, 0, sizeof(ctx)); + memset(&ctx, 0, sizeof(ctx)); ctx.indent_level = dump_indent / COL; ctx.cur_column = dump_indent; @@ -3787,9 +3787,9 @@ xml_dump_dataset(hid_t did, const char *name, struct subset_t H5_ATTR_UNUSED *ss HDstrcat(tmp, name); /* setup */ - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&buffer, 0, sizeof(h5tools_str_t)); - HDmemset(&ctx, 0, sizeof(ctx)); + memset(&ctx, 0, sizeof(ctx)); ctx.indent_level = dump_indent / COL; ctx.cur_column = dump_indent; @@ -4378,9 +4378,9 @@ xml_print_enum(hid_t type) hsize_t curr_pos = 0; /* total data element position */ /* setup */ - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&buffer, 0, sizeof(h5tools_str_t)); - HDmemset(&ctx, 0, sizeof(ctx)); + memset(&ctx, 0, sizeof(ctx)); ctx.indent_level = dump_indent / COL; ctx.cur_column = dump_indent; @@ -4514,13 +4514,13 @@ xml_print_enum(hid_t type) else if (H5T_SGN_NONE == H5Tget_sign(native)) { unsigned long long copy; - HDmemcpy(©, value + i * dst_size, sizeof(copy)); + memcpy(©, value + i * dst_size, sizeof(copy)); h5tools_str_append(&buffer, "%llu", copy); } else { long long copy; - HDmemcpy(©, value + i * dst_size, sizeof(copy)); + memcpy(©, value + i * dst_size, sizeof(copy)); h5tools_str_append(&buffer, "%lld", copy); } h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, diff --git a/tools/src/h5ls/h5ls.c b/tools/src/h5ls/h5ls.c index 7388075..ed81210 100644 --- a/tools/src/h5ls/h5ls.c +++ b/tools/src/h5ls/h5ls.c @@ -957,13 +957,13 @@ print_enum_type(h5tools_str_t *buffer, hid_t type, int ind) else if (H5T_SGN_NONE == H5Tget_sign(native)) { unsigned long long copy; - HDmemcpy(©, value + i * dst_size, sizeof(copy)); + memcpy(©, value + i * dst_size, sizeof(copy)); h5tools_str_append(buffer, "%llu", copy); } else { long long copy; - HDmemcpy(©, value + i * dst_size, sizeof(copy)); + memcpy(©, value + i * dst_size, sizeof(copy)); h5tools_str_append(buffer, "%lld", copy); } } @@ -1324,8 +1324,8 @@ dump_dataset_values(hid_t dset) f_type = H5Dget_type(dset); space = H5Dget_space(dset); - HDmemset(&ctx, 0, sizeof(ctx)); - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&ctx, 0, sizeof(ctx)); + memset(&buffer, 0, sizeof(h5tools_str_t)); outputformat = *info; outputformat.line_1st = NULL; @@ -1493,8 +1493,8 @@ dump_attribute_values(hid_t attr) f_type = H5Aget_type(attr); space = H5Aget_space(attr); - HDmemset(&ctx, 0, sizeof(ctx)); - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&ctx, 0, sizeof(ctx)); + memset(&buffer, 0, sizeof(h5tools_str_t)); outputformat = *info; outputformat.line_1st = NULL; @@ -1666,8 +1666,8 @@ list_attr(hid_t obj, const char *attr_name, const H5A_info_t H5_ATTR_UNUSED *ain H5TOOLS_START_DEBUG(" "); - HDmemset(&ctx, 0, sizeof(ctx)); - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&ctx, 0, sizeof(ctx)); + memset(&buffer, 0, sizeof(h5tools_str_t)); ctx.indent_level = 2; ctx.cur_column = (size_t)curr_pos; @@ -1772,8 +1772,8 @@ dataset_list1(hid_t dset) h5tools_context_t ctx; /* print context */ h5tool_format_t *info = &ls_dataformat; - HDmemset(&ctx, 0, sizeof(ctx)); - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&ctx, 0, sizeof(ctx)); + memset(&buffer, 0, sizeof(h5tools_str_t)); h5tools_str_reset(&buffer); @@ -1844,8 +1844,8 @@ dataset_list2(hid_t dset, const char H5_ATTR_UNUSED *name) h5tools_context_t ctx; /* print context */ h5tool_format_t *info = &ls_dataformat; - HDmemset(&ctx, 0, sizeof(ctx)); - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&ctx, 0, sizeof(ctx)); + memset(&buffer, 0, sizeof(h5tools_str_t)); h5tools_str_reset(&buffer); @@ -2051,8 +2051,8 @@ datatype_list2(hid_t type, const char H5_ATTR_UNUSED *name) h5tools_context_t ctx; /* print context */ h5tool_format_t *info = &ls_dataformat; - HDmemset(&ctx, 0, sizeof(ctx)); - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&ctx, 0, sizeof(ctx)); + memset(&buffer, 0, sizeof(h5tools_str_t)); h5tools_str_reset(&buffer); @@ -2088,8 +2088,8 @@ list_obj(const char *name, const H5O_info2_t *oinfo, const char *first_seen, voi H5TOOLS_START_DEBUG(" "); - HDmemset(&ctx, 0, sizeof(ctx)); - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&ctx, 0, sizeof(ctx)); + memset(&buffer, 0, sizeof(h5tools_str_t)); h5tools_str_reset(&buffer); @@ -2266,13 +2266,13 @@ list_lnk(const char *name, const H5L_info2_t *linfo, void *_iter) h5tools_context_t ctx; /* print context */ h5tool_format_t *info = &ls_dataformat; - HDmemset(&ctx, 0, sizeof(ctx)); - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&ctx, 0, sizeof(ctx)); + memset(&buffer, 0, sizeof(h5tools_str_t)); h5tools_str_reset(&buffer); /* init linkinfo struct */ - HDmemset(&lnk_info, 0, sizeof(h5tool_link_info_t)); + memset(&lnk_info, 0, sizeof(h5tool_link_info_t)); /* if verbose, make H5tools_get_symlink_info() display more */ if (verbose_g) @@ -2452,8 +2452,8 @@ visit_obj(hid_t file, const char *oname, iter_t *iter) h5tools_context_t ctx; /* print context */ h5tool_format_t *info = &ls_dataformat; - HDmemset(&ctx, 0, sizeof(ctx)); - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&ctx, 0, sizeof(ctx)); + memset(&buffer, 0, sizeof(h5tools_str_t)); h5tools_str_reset(&buffer); @@ -2684,8 +2684,8 @@ main(int argc, char *argv[]) h5tools_init(); /* Initialize fapl info structs */ - HDmemset(&vol_info, 0, sizeof(h5tools_vol_info_t)); - HDmemset(&vfd_info, 0, sizeof(h5tools_vfd_info_t)); + memset(&vol_info, 0, sizeof(h5tools_vol_info_t)); + memset(&vfd_info, 0, sizeof(h5tools_vfd_info_t)); /* Build object display table */ DISPATCH(H5O_TYPE_GROUP, "Group", NULL, NULL); @@ -3095,8 +3095,8 @@ main(int argc, char *argv[]) h5tools_context_t ctx; /* print context */ h5tool_format_t *info = &ls_dataformat; - HDmemset(&ctx, 0, sizeof(ctx)); - HDmemset(&buffer, 0, sizeof(h5tools_str_t)); + memset(&ctx, 0, sizeof(ctx)); + memset(&buffer, 0, sizeof(h5tools_str_t)); h5tools_str_reset(&buffer); print_obj_name(&buffer, &iter, oname, "**NOT FOUND**"); diff --git a/tools/src/h5perf/pio_engine.c b/tools/src/h5perf/pio_engine.c index 34101af..9b2c1c2 100644 --- a/tools/src/h5perf/pio_engine.c +++ b/tools/src/h5perf/pio_engine.c @@ -385,7 +385,7 @@ pio_create_filename(iotype iot, const char *base_name, char *fullname, size_t si if (!base_name || !fullname || size < 1) return NULL; - HDmemset(fullname, 0, size); + memset(fullname, 0, size); switch (iot) { case POSIXIO: @@ -594,7 +594,7 @@ do_write(results *res, file_descr *fd, parameters *parms, long ndsets, off_t nby /* Prepare buffer for verifying data */ if (parms->verify) - HDmemset(buffer, pio_mpi_rank_g + 1, buf_size * blk_size); + memset(buffer, pio_mpi_rank_g + 1, buf_size * blk_size); } /* end else */ /* Calculate the total number of bytes (bytes_count) to be diff --git a/tools/src/h5perf/pio_perf.c b/tools/src/h5perf/pio_perf.c index 295b580..76a9be5 100644 --- a/tools/src/h5perf/pio_perf.c +++ b/tools/src/h5perf/pio_perf.c @@ -1275,7 +1275,7 @@ parse_command_line(int argc, const char *const *argv) char buf[10]; int i; - HDmemset(buf, '\0', sizeof(buf)); + memset(buf, '\0', sizeof(buf)); for (i = 0; *end != '\0' && *end != ','; ++end) if (isalnum(*end) && i < 10) @@ -1328,7 +1328,7 @@ parse_command_line(int argc, const char *const *argv) char buf[10]; int i; - HDmemset(buf, '\0', sizeof(buf)); + memset(buf, '\0', sizeof(buf)); for (i = 0; *end != '\0' && *end != ','; ++end) if (HDisalnum(*end) && i < 10) diff --git a/tools/src/h5perf/sio_engine.c b/tools/src/h5perf/sio_engine.c index 3979cca..849238f 100644 --- a/tools/src/h5perf/sio_engine.c +++ b/tools/src/h5perf/sio_engine.c @@ -1148,10 +1148,10 @@ set_vfd(parameters *param) char arr[H5FD_MEM_NTYPES][1024]; } *sv = NULL; - 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/src/h5perf/sio_perf.c b/tools/src/h5perf/sio_perf.c index 6fd3760..0a3850e 100644 --- a/tools/src/h5perf/sio_perf.c +++ b/tools/src/h5perf/sio_perf.c @@ -849,7 +849,7 @@ parse_command_line(int argc, const char *const *argv) while (end && *end != '\0') { char buf[10]; - HDmemset(buf, '\0', sizeof(buf)); + memset(buf, '\0', sizeof(buf)); for (i = 0; *end != '\0' && *end != ','; ++end) if (HDisalnum(*end) && i < 10) @@ -889,7 +889,7 @@ parse_command_line(int argc, const char *const *argv) while (end && *end != '\0') { char buf[10]; - HDmemset(buf, '\0', sizeof(buf)); + memset(buf, '\0', sizeof(buf)); for (i = 0; *end != '\0' && *end != ','; ++end) if (HDisalnum(*end) && i < 10) @@ -915,7 +915,7 @@ parse_command_line(int argc, const char *const *argv) while (end && *end != '\0') { char buf[10]; - HDmemset(buf, '\0', sizeof(buf)); + memset(buf, '\0', sizeof(buf)); for (i = 0; *end != '\0' && *end != ','; ++end) if (HDisalnum(*end) && i < 10) @@ -972,7 +972,7 @@ parse_command_line(int argc, const char *const *argv) while (end && *end != '\0') { char buf[10]; - HDmemset(buf, '\0', sizeof(buf)); + memset(buf, '\0', sizeof(buf)); for (i = 0; *end != '\0' && *end != ','; ++end) if (HDisalnum(*end) && i < 10) @@ -1041,7 +1041,7 @@ parse_command_line(int argc, const char *const *argv) while (end && *end != '\0') { char buf[10]; - HDmemset(buf, '\0', sizeof(buf)); + memset(buf, '\0', sizeof(buf)); for (i = 0; *end != '\0' && *end != ','; ++end) if (HDisalnum(*end) && i < 10) @@ -1068,7 +1068,7 @@ parse_command_line(int argc, const char *const *argv) while (end && *end != '\0') { char buf[10]; - HDmemset(buf, '\0', sizeof(buf)); + memset(buf, '\0', sizeof(buf)); for (i = 0; *end != '\0' && *end != ','; ++end) if (HDisalnum(*end) && i < 10) 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 */ diff --git a/tools/src/h5stat/h5stat.c b/tools/src/h5stat/h5stat.c index 9a60cd8..f9ca18a 100644 --- a/tools/src/h5stat/h5stat.c +++ b/tools/src/h5stat/h5stat.c @@ -1606,7 +1606,7 @@ main(int argc, char *argv[]) /* Initialize h5tools lib */ h5tools_init(); - HDmemset(&iter, 0, sizeof(iter)); + memset(&iter, 0, sizeof(iter)); if (parse_command_line(argc, (const char *const *)argv, &hand) < 0) goto done; diff --git a/tools/src/misc/h5debug.c b/tools/src/misc/h5debug.c index 3edf93c..fa93244 100644 --- a/tools/src/misc/h5debug.c +++ b/tools/src/misc/h5debug.c @@ -310,7 +310,7 @@ main(int argc, char *argv[]) addr = (haddr_t)strtoll(argv[2], NULL, 0); /* Extra arguments for primary data structure */ - HDmemset(extra, 0, sizeof(extra)); + memset(extra, 0, sizeof(extra)); if (argc > 3) { /* Number of extra arguments */ extra_count = argc - 3; @@ -335,25 +335,25 @@ main(int argc, char *argv[]) exit_value = 3; goto done; } - if (!HDmemcmp(sig, H5F_SIGNATURE, (size_t)H5F_SIGNATURE_LEN)) { + if (!memcmp(sig, H5F_SIGNATURE, (size_t)H5F_SIGNATURE_LEN)) { /* * Debug the file's super block. */ status = H5F_debug(f, stdout, 0, VCOL); } - else if (!HDmemcmp(sig, H5HL_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { + else if (!memcmp(sig, H5HL_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { /* * Debug a local heap. */ status = H5HL_debug(f, addr, stdout, 0, VCOL); } - else if (!HDmemcmp(sig, H5HG_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { + else if (!memcmp(sig, H5HG_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { /* * Debug a global heap collection. */ status = H5HG_debug(f, addr, stdout, 0, VCOL); } - else if (!HDmemcmp(sig, H5G_NODE_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { + else if (!memcmp(sig, H5G_NODE_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { /* * Debug a symbol table node. */ @@ -368,7 +368,7 @@ main(int argc, char *argv[]) status = H5G_node_debug(f, addr, stdout, 0, VCOL, extra[0]); } - else if (!HDmemcmp(sig, H5B_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { + else if (!memcmp(sig, H5B_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { /* * Debug a B-tree. B-trees are debugged through the B-tree * subclass. The subclass identifier is the byte immediately @@ -447,7 +447,7 @@ main(int argc, char *argv[]) goto done; } } - else if (!HDmemcmp(sig, H5B2_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { + else if (!memcmp(sig, H5B2_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { /* * Debug a v2 B-tree header. */ @@ -465,7 +465,7 @@ main(int argc, char *argv[]) status = H5B2__hdr_debug(f, addr, stdout, 0, VCOL, cls, (haddr_t)extra[0]); } - else if (!HDmemcmp(sig, H5B2_INT_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { + else if (!memcmp(sig, H5B2_INT_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { /* * Debug a v2 B-tree internal node. */ @@ -501,7 +501,7 @@ main(int argc, char *argv[]) status = H5B2__int_debug(f, addr, stdout, 0, VCOL, cls, extra[0], (unsigned)extra[1], (unsigned)extra[2], (haddr_t)extra[3]); } - else if (!HDmemcmp(sig, H5B2_LEAF_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { + else if (!memcmp(sig, H5B2_LEAF_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { /* * Debug a v2 B-tree leaf node. */ @@ -535,13 +535,13 @@ main(int argc, char *argv[]) status = H5B2__leaf_debug(f, addr, stdout, 0, VCOL, cls, extra[0], (unsigned)extra[1], (haddr_t)extra[2]); } - else if (!HDmemcmp(sig, H5HF_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { + else if (!memcmp(sig, H5HF_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { /* * Debug a fractal heap header. */ status = H5HF_hdr_debug(f, addr, stdout, 0, VCOL); } - else if (!HDmemcmp(sig, H5HF_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { + else if (!memcmp(sig, H5HF_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { /* * Debug a fractal heap direct block. */ @@ -560,7 +560,7 @@ main(int argc, char *argv[]) status = H5HF_dblock_debug(f, addr, stdout, 0, VCOL, extra[0], (size_t)extra[1]); } - else if (!HDmemcmp(sig, H5HF_IBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { + else if (!memcmp(sig, H5HF_IBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { /* * Debug a fractal heap indirect block. */ @@ -578,14 +578,14 @@ main(int argc, char *argv[]) status = H5HF_iblock_debug(f, addr, stdout, 0, VCOL, extra[0], (unsigned)extra[1]); } - else if (!HDmemcmp(sig, H5FS_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { + else if (!memcmp(sig, H5FS_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { /* * Debug a free space header. */ status = H5FS_debug(f, addr, stdout, 0, VCOL); } - else if (!HDmemcmp(sig, H5FS_SINFO_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { + else if (!memcmp(sig, H5FS_SINFO_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { /* * Debug free space serialized sections. */ @@ -603,14 +603,14 @@ main(int argc, char *argv[]) status = H5FS_sects_debug(f, addr, stdout, 0, VCOL, extra[0], extra[1]); } - else if (!HDmemcmp(sig, H5SM_TABLE_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { + else if (!memcmp(sig, H5SM_TABLE_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { /* * Debug shared message master table. */ status = H5SM_table_debug(f, addr, stdout, 0, VCOL, UINT_MAX, UINT_MAX); } - else if (!HDmemcmp(sig, H5SM_LIST_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { + else if (!memcmp(sig, H5SM_LIST_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { /* * Debug shared message list index. */ @@ -627,7 +627,7 @@ main(int argc, char *argv[]) status = H5SM_list_debug(f, addr, stdout, 0, VCOL, (haddr_t)extra[0]); } - else if (!HDmemcmp(sig, H5EA_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { + else if (!memcmp(sig, H5EA_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { /* * Debug an extensible array header. */ @@ -648,7 +648,7 @@ main(int argc, char *argv[]) status = H5EA__hdr_debug(f, addr, stdout, 0, VCOL, cls, extra[0]); } - else if (!HDmemcmp(sig, H5EA_IBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { + else if (!memcmp(sig, H5EA_IBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { /* * Debug an extensible array index block. */ @@ -669,7 +669,7 @@ main(int argc, char *argv[]) status = H5EA__iblock_debug(f, addr, stdout, 0, VCOL, cls, extra[0], extra[1]); } - else if (!HDmemcmp(sig, H5EA_SBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { + else if (!memcmp(sig, H5EA_SBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { /* * Debug an extensible array super block. */ @@ -689,7 +689,7 @@ main(int argc, char *argv[]) status = H5EA__sblock_debug(f, addr, stdout, 0, VCOL, cls, extra[0], (unsigned)extra[1], extra[2]); } - else if (!HDmemcmp(sig, H5EA_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { + else if (!memcmp(sig, H5EA_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { /* * Debug an extensible array data block. */ @@ -710,7 +710,7 @@ main(int argc, char *argv[]) status = H5EA__dblock_debug(f, addr, stdout, 0, VCOL, cls, extra[0], (size_t)extra[1], extra[2]); } - else if (!HDmemcmp(sig, H5FA_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { + else if (!memcmp(sig, H5FA_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { /* * Debug a fixed array header. */ @@ -730,7 +730,7 @@ main(int argc, char *argv[]) status = H5FA__hdr_debug(f, addr, stdout, 0, VCOL, cls, extra[0]); } - else if (!HDmemcmp(sig, H5FA_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { + else if (!memcmp(sig, H5FA_DBLOCK_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { /* * Debug a fixed array data block. */ @@ -751,7 +751,7 @@ main(int argc, char *argv[]) status = H5FA__dblock_debug(f, addr, stdout, 0, VCOL, cls, extra[0], extra[1]); } - else if (!HDmemcmp(sig, H5O_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { + else if (!memcmp(sig, H5O_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC)) { /* * Debug v2 object header (which have signatures). */ diff --git a/tools/src/misc/h5mkgrp.c b/tools/src/misc/h5mkgrp.c index 0848096..31deb8b 100644 --- a/tools/src/misc/h5mkgrp.c +++ b/tools/src/misc/h5mkgrp.c @@ -148,8 +148,8 @@ parse_command_line(int argc, const char *const *argv, mkgrp_opt_t *options) } /* Initialize fapl info structs */ - HDmemset(&vol_info, 0, sizeof(h5tools_vol_info_t)); - HDmemset(&vfd_info, 0, sizeof(h5tools_vfd_info_t)); + memset(&vol_info, 0, sizeof(h5tools_vol_info_t)); + memset(&vfd_info, 0, sizeof(h5tools_vfd_info_t)); /* Parse command line options */ while ((opt = H5_get_option(argc, argv, s_opts, l_opts)) != EOF) { @@ -292,7 +292,7 @@ main(int argc, char *argv[]) h5tools_init(); /* Initialize the parameters */ - HDmemset(¶ms_g, 0, sizeof(params_g)); + memset(¶ms_g, 0, sizeof(params_g)); /* Create file access property list */ if ((params_g.fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0) { 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); } } diff --git a/utils/mirror_vfd/mirror_server.c b/utils/mirror_vfd/mirror_server.c index 8ef7b9d..3bf075a 100644 --- a/utils/mirror_vfd/mirror_server.c +++ b/utils/mirror_vfd/mirror_server.c @@ -177,8 +177,8 @@ parse_args(int argc, char **argv, struct op_args *args_out) args_out->verbosity = MIRROR_LOG_DEFAULT_VERBOSITY; /* Preset empty strings */ - HDmemset(args_out->log_path, 0, PATH_MAX + 1); - HDmemset(args_out->writer_log_path, 0, PATH_MAX + 1); + memset(args_out->log_path, 0, PATH_MAX + 1); + memset(args_out->writer_log_path, 0, PATH_MAX + 1); if (argv == NULL || *argv == NULL) { mirror_log(NULL, V_ERR, "invalid argv pointer"); diff --git a/utils/mirror_vfd/mirror_server_stop.c b/utils/mirror_vfd/mirror_server_stop.c index 8877f3d..52dea08 100644 --- a/utils/mirror_vfd/mirror_server_stop.c +++ b/utils/mirror_vfd/mirror_server_stop.c @@ -146,7 +146,7 @@ send_shutdown(struct mshs_opts *opts) target_addr.sin_family = AF_INET; target_addr.sin_port = htons((uint16_t)opts->portno); target_addr.sin_addr.s_addr = inet_addr(opts->ip); - HDmemset(target_addr.sin_zero, 0, sizeof(target_addr.sin_zero)); + memset(target_addr.sin_zero, 0, sizeof(target_addr.sin_zero)); if (connect(live_socket, (struct sockaddr *)&target_addr, (socklen_t)sizeof(target_addr)) < 0) { printf("ERROR connect() (%d)\n%s\n", errno, HDstrerror(errno)); diff --git a/utils/mirror_vfd/mirror_writer.c b/utils/mirror_vfd/mirror_writer.c index 644fc77..2acc166 100644 --- a/utils/mirror_vfd/mirror_writer.c +++ b/utils/mirror_vfd/mirror_writer.c @@ -194,7 +194,7 @@ session_init(struct mirror_writer_opts *opts) session->reply.pub.version = H5FD_MIRROR_XMIT_CURR_VERSION; session->reply.pub.op = H5FD_MIRROR_OP_REPLY; session->reply.pub.session_token = 0; - HDmemset(session->reply.message, 0, H5FD_MIRROR_STATUS_MESSAGE_MAX); + memset(session->reply.message, 0, H5FD_MIRROR_STATUS_MESSAGE_MAX); /* Options-derived population */ @@ -358,7 +358,7 @@ reply_ok(struct mirror_session *session) mirror_log(session->loginfo, V_ALL, "reply_ok()"); reply->status = H5FD_MIRROR_STATUS_OK; - HDmemset(reply->message, 0, H5FD_MIRROR_STATUS_MESSAGE_MAX); + memset(reply->message, 0, H5FD_MIRROR_STATUS_MESSAGE_MAX); return _xmit_reply(session); } /* end reply_ok() */ @@ -820,7 +820,7 @@ receive_communique(struct mirror_session *session, struct sock_comm *comm) mirror_log(session->loginfo, V_INFO, "receive_communique()"); - HDmemset(comm->raw, 0, comm->raw_size); + memset(comm->raw, 0, comm->raw_size); comm->recd_die = 0; mirror_log(session->loginfo, V_INFO, "ready to receive"); /* TODO */ diff --git a/utils/tools/h5dwalk/h5dwalk.c b/utils/tools/h5dwalk/h5dwalk.c index f8aa472..256ac45 100644 --- a/utils/tools/h5dwalk/h5dwalk.c +++ b/utils/tools/h5dwalk/h5dwalk.c @@ -299,8 +299,8 @@ distribute_separator_add(struct distribute_option *option, uint64_t separator) pos = low; if (pos < count) - HDmemmove(&option->separators[low + 1], &option->separators[low], - sizeof(*option->separators) * (uint64_t)(count - pos)); + memmove(&option->separators[low + 1], &option->separators[low], + sizeof(*option->separators) * (uint64_t)(count - pos)); option->separators[pos] = separator; return 0; @@ -1175,7 +1175,7 @@ MFU_PRED_EXEC(mfu_flist flist, uint64_t idx, void *arg) argv[k++] = HDstrdup(toolname); - HDmemset(cmdline, 0, sizeof(cmdline)); + memset(cmdline, 0, sizeof(cmdline)); buf += HDstrlen(toolname) + 1; /* Reconstruct the command line that the user provided for the h5tool */ for (k = 1; k < count; k++) { @@ -1184,7 +1184,7 @@ MFU_PRED_EXEC(mfu_flist flist, uint64_t idx, void *arg) mfu_flist flist_arg; void *check_ptr[2] = {NULL, NULL}; - HDmemcpy(check_ptr, &buf[1], sizeof(void *)); + memcpy(check_ptr, &buf[1], sizeof(void *)); flist_arg = (mfu_flist)check_ptr[0]; /* +2 (see below) accounts for the '&' and the trailing zero pad */ @@ -1607,10 +1607,10 @@ main(int argc, char *argv[]) *ptr++ = '&'; /* Select which argument list should be used */ if (k == 0) { - HDmemcpy(ptr, &flist1, sizeof(void *)); + memcpy(ptr, &flist1, sizeof(void *)); } if (k == 1) { - HDmemcpy(ptr, &flist2, sizeof(void *)); + memcpy(ptr, &flist2, sizeof(void *)); } ptr += sizeof(mfu_flist *); k++; |