diff options
Diffstat (limited to 'test/links.c')
-rw-r--r-- | test/links.c | 789 |
1 files changed, 394 insertions, 395 deletions
diff --git a/test/links.c b/test/links.c index 188711f..d707430 100644 --- a/test/links.c +++ b/test/links.c @@ -400,9 +400,9 @@ const H5L_class_t UD_plist_class[1] = {{ static void fix_ext_filename(char *path_name, char *cwd, const char *file_name) { - HDstrcpy(path_name, cwd); - HDstrcat(path_name, "/"); - HDstrcat(path_name, file_name); + strcpy(path_name, cwd); + strcat(path_name, "/"); + strcat(path_name, file_name); } /*------------------------------------------------------------------------- @@ -650,8 +650,8 @@ cklinks(hid_t fapl, bool new_format) FAIL_STACK_ERROR; if (token_cmp) { H5_FAILED(); - HDputs(" Hard link test failed. Link seems not to point to the "); - HDputs(" expected file location."); + puts(" Hard link test failed. Link seems not to point to the "); + puts(" expected file location."); TEST_ERROR; } /* end if */ if (H5Lexists(file, "/", H5P_DEFAULT) != true) @@ -671,7 +671,7 @@ cklinks(hid_t fapl, bool new_format) H5E_END_TRY if (status >= 0) { H5_FAILED(); - HDputs(" H5Lexists() should have failed for a path with missing components."); + puts(" H5Lexists() should have failed for a path with missing components."); TEST_ERROR; } /* end if */ H5E_BEGIN_TRY @@ -681,7 +681,7 @@ cklinks(hid_t fapl, bool new_format) H5E_END_TRY if (status >= 0) { H5_FAILED(); - HDputs(" H5Lexists() should have failed for a path with missing components."); + puts(" H5Lexists() should have failed for a path with missing components."); TEST_ERROR; } /* end if */ @@ -697,15 +697,15 @@ cklinks(hid_t fapl, bool new_format) FAIL_STACK_ERROR; if (token_cmp) { H5_FAILED(); - HDputs(" Soft link test failed. Link seems not to point to the "); - HDputs(" expected file location."); + puts(" Soft link test failed. Link seems not to point to the "); + puts(" expected file location."); TEST_ERROR; } /* end if */ if (H5Lget_val(file, "grp1/soft", linkval, sizeof linkval, H5P_DEFAULT) < 0) FAIL_STACK_ERROR; - if (HDstrcmp(linkval, "/d1") != 0) { + if (strcmp(linkval, "/d1") != 0) { H5_FAILED(); - HDputs(" Soft link test failed. Wrong link value"); + puts(" Soft link test failed. Wrong link value"); TEST_ERROR; } /* end if */ if (H5Lexists(file, "grp1/soft", H5P_DEFAULT) != true) @@ -719,7 +719,7 @@ cklinks(hid_t fapl, bool new_format) H5E_END_TRY if (status >= 0) { H5_FAILED(); - HDputs(" H5Oget_info_by_name() should have failed for a dangling link."); + puts(" H5Oget_info_by_name() should have failed for a dangling link."); TEST_ERROR; } /* end if */ if (H5Lget_info2(file, "grp1/dangle", &linfo, H5P_DEFAULT) < 0) @@ -734,9 +734,9 @@ cklinks(hid_t fapl, bool new_format) printf(" %d: Can't retrieve link value\n", __LINE__); TEST_ERROR; } /* end if */ - if (HDstrcmp(linkval, "foobar") != 0) { + if (strcmp(linkval, "foobar") != 0) { H5_FAILED(); - HDputs(" Dangling link test failed. Wrong link value"); + puts(" Dangling link test failed. Wrong link value"); TEST_ERROR; } /* end if */ if (H5Lexists(file, "grp1/dangle", H5P_DEFAULT) != true) @@ -750,7 +750,7 @@ cklinks(hid_t fapl, bool new_format) H5E_END_TRY if (status >= 0) { H5_FAILED(); - HDputs(" H5Oget_info_by_name() should have failed for a recursive link."); + puts(" H5Oget_info_by_name() should have failed for a recursive link."); TEST_ERROR; } /* end if */ if (H5Lget_info2(file, "grp1/recursive", &linfo, H5P_DEFAULT) < 0) @@ -765,9 +765,9 @@ cklinks(hid_t fapl, bool new_format) printf(" %d: Can't retrieve link value\n", __LINE__); TEST_ERROR; } /* end if */ - if (HDstrcmp(linkval, "/grp1/recursive") != 0) { + if (strcmp(linkval, "/grp1/recursive") != 0) { H5_FAILED(); - HDputs(" Recursive link test failed. Wrong link value"); + puts(" Recursive link test failed. Wrong link value"); TEST_ERROR; } /* end if */ @@ -835,8 +835,8 @@ ck_new_links(hid_t fapl, bool new_format) TEST_ERROR; if (token_cmp1 || token_cmp2) { H5_FAILED(); - HDputs(" Hard link test failed. Link seems not to point to the "); - HDputs(" expected file location."); + puts(" Hard link test failed. Link seems not to point to the "); + puts(" expected file location."); TEST_ERROR; } @@ -1064,7 +1064,7 @@ toomany(hid_t fapl, bool new_format) /* Check name */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/hard21") != 0) + if (strcmp(objname, "/hard21") != 0) TEST_ERROR; /* Create object in hard-linked group */ @@ -1087,7 +1087,7 @@ toomany(hid_t fapl, bool new_format) H5E_END_TRY if (gid >= 0) { H5_FAILED(); - HDputs(" Should have failed for sequence of too many nested links."); + puts(" Should have failed for sequence of too many nested links."); TEST_ERROR; } /* end if */ @@ -1098,7 +1098,7 @@ toomany(hid_t fapl, bool new_format) /* Check name */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/soft16") != 0) + if (strcmp(objname, "/soft16") != 0) TEST_ERROR; /* Create object using soft links */ @@ -1436,7 +1436,7 @@ test_move(hid_t fapl, bool new_format) H5E_END_TRY if (moved_grp >= 0) { H5_FAILED(); - HDputs(" Group still in original location?"); + puts(" Group still in original location?"); TEST_ERROR; } /* end if */ @@ -1969,7 +1969,7 @@ test_deprec(hid_t fapl, bool new_format) FAIL_STACK_ERROR; if (H5Gget_comment(file_id, "group1", sizeof(tmpstr), tmpstr) < 0) FAIL_STACK_ERROR; - if (HDstrcmp(tmpstr, "comment") != 0) + if (strcmp(tmpstr, "comment") != 0) TEST_ERROR; /* Create links using H5Glink and H5Glink2 */ @@ -1985,7 +1985,7 @@ test_deprec(hid_t fapl, bool new_format) /* Test getting the names for objects */ if (H5Gget_objname_by_idx(group1_id, (hsize_t)0, tmpstr, sizeof(tmpstr)) < 0) FAIL_STACK_ERROR; - if (HDstrcmp(tmpstr, "link_to_group2") != 0) + if (strcmp(tmpstr, "link_to_group2") != 0) TEST_ERROR; H5E_BEGIN_TRY { @@ -2024,8 +2024,8 @@ test_deprec(hid_t fapl, bool new_format) 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."); + puts(" Hard link test failed. Link seems not to point to the "); + puts(" expected file location."); TEST_ERROR; } /* end if */ @@ -2037,8 +2037,8 @@ test_deprec(hid_t fapl, bool new_format) 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."); + puts(" Hard link test failed. Link seems not to point to the "); + puts(" expected file location."); TEST_ERROR; } /* end if */ @@ -2047,12 +2047,12 @@ test_deprec(hid_t fapl, bool new_format) FAIL_STACK_ERROR; if (sb_soft1.type != H5G_LINK) TEST_ERROR; - if (sb_soft1.linklen != HDstrlen("link_to_group1") + 1) + if (sb_soft1.linklen != strlen("link_to_group1") + 1) TEST_ERROR; if (H5Gget_linkval(group2_id, "soft_link_to_group1", sb_soft1.linklen, tmpstr) < 0) FAIL_STACK_ERROR; - if (HDstrcmp("link_to_group1", tmpstr) != 0) + if (strcmp("link_to_group1", tmpstr) != 0) TEST_ERROR; /* Test non-existing links with H5Gget_objinfo */ @@ -2068,12 +2068,12 @@ test_deprec(hid_t fapl, bool new_format) FAIL_STACK_ERROR; if (sb_soft2.type != H5G_LINK) TEST_ERROR; - if (sb_soft2.linklen != HDstrlen("dangle") + 1) + if (sb_soft2.linklen != strlen("dangle") + 1) TEST_ERROR; if (H5Gget_linkval(group2_id, "dangle_soft_link", sb_soft2.linklen, tmpstr) < 0) FAIL_STACK_ERROR; - if (HDstrcmp("dangle", tmpstr) != 0) + if (strcmp("dangle", tmpstr) != 0) TEST_ERROR; /* Test H5Gmove and H5Gmove2 */ @@ -2170,8 +2170,8 @@ cklinks_deprec(hid_t fapl, bool new_format) } /* end if */ if (H5_addr_ne(oinfo1.addr, oinfo2.addr)) { H5_FAILED(); - HDputs(" Hard link test failed. Link seems not to point to the "); - HDputs(" expected file location."); + puts(" Hard link test failed. Link seems not to point to the "); + puts(" expected file location."); TEST_ERROR; } /* end if */ if (H5Lexists(file, "/", H5P_DEFAULT) != true) @@ -2191,7 +2191,7 @@ cklinks_deprec(hid_t fapl, bool new_format) H5E_END_TRY if (exists >= 0) { H5_FAILED(); - HDputs(" H5Lexists() should have failed for a path with missing components."); + puts(" H5Lexists() should have failed for a path with missing components."); TEST_ERROR; } /* end if */ H5E_BEGIN_TRY @@ -2201,7 +2201,7 @@ cklinks_deprec(hid_t fapl, bool new_format) H5E_END_TRY if (exists >= 0) { H5_FAILED(); - HDputs(" H5Lexists() should have failed for a path with missing components."); + puts(" H5Lexists() should have failed for a path with missing components."); TEST_ERROR; } /* end if */ @@ -2215,15 +2215,15 @@ cklinks_deprec(hid_t fapl, bool new_format) } /* end if */ if (H5_addr_ne(oinfo1.addr, oinfo2.addr)) { H5_FAILED(); - HDputs(" Soft link test failed. Link seems not to point to the "); - HDputs(" expected file location."); + puts(" Soft link test failed. Link seems not to point to the "); + puts(" expected file location."); TEST_ERROR; } /* end if */ if (H5Lget_val(file, "grp1/soft", linkval, sizeof linkval, H5P_DEFAULT) < 0) FAIL_STACK_ERROR; - if (HDstrcmp(linkval, "/d1") != 0) { + if (strcmp(linkval, "/d1") != 0) { H5_FAILED(); - HDputs(" Soft link test failed. Wrong link value"); + puts(" Soft link test failed. Wrong link value"); TEST_ERROR; } /* end if */ if (H5Lexists(file, "grp1/soft", H5P_DEFAULT) != true) @@ -2237,7 +2237,7 @@ cklinks_deprec(hid_t fapl, bool new_format) H5E_END_TRY if (status >= 0) { H5_FAILED(); - HDputs(" H5Oget_info_by_name() should have failed for a dangling link."); + puts(" H5Oget_info_by_name() should have failed for a dangling link."); TEST_ERROR; } /* end if */ if (H5Lget_info1(file, "grp1/dangle", &linfo, H5P_DEFAULT) < 0) @@ -2252,9 +2252,9 @@ cklinks_deprec(hid_t fapl, bool new_format) printf(" %d: Can't retrieve link value\n", __LINE__); TEST_ERROR; } /* end if */ - if (HDstrcmp(linkval, "foobar") != 0) { + if (strcmp(linkval, "foobar") != 0) { H5_FAILED(); - HDputs(" Dangling link test failed. Wrong link value"); + puts(" Dangling link test failed. Wrong link value"); TEST_ERROR; } /* end if */ if (H5Lexists(file, "grp1/dangle", H5P_DEFAULT) != true) @@ -2268,7 +2268,7 @@ cklinks_deprec(hid_t fapl, bool new_format) H5E_END_TRY if (status >= 0) { H5_FAILED(); - HDputs(" H5Oget_info_by_name() should have failed for a recursive link."); + puts(" H5Oget_info_by_name() should have failed for a recursive link."); TEST_ERROR; } /* end if */ if (H5Lget_info1(file, "grp1/recursive", &linfo, H5P_DEFAULT) < 0) @@ -2283,9 +2283,9 @@ cklinks_deprec(hid_t fapl, bool new_format) printf(" %d: Can't retrieve link value\n", __LINE__); TEST_ERROR; } /* end if */ - if (HDstrcmp(linkval, "/grp1/recursive") != 0) { + if (strcmp(linkval, "/grp1/recursive") != 0) { H5_FAILED(); - HDputs(" Recursive link test failed. Wrong link value"); + puts(" Recursive link test failed. Wrong link value"); TEST_ERROR; } /* end if */ @@ -2813,21 +2813,21 @@ external_link_root_deprec(hid_t fapl, bool new_format) goto error; if (H5L_TYPE_EXTERNAL != linfo.type) { H5_FAILED(); - HDputs(" Unexpected object type - should have been an external link"); + puts(" Unexpected object type - should have been an external link"); goto error; } if (H5Lget_val(fid, "ext_link", objname, sizeof(objname), H5P_DEFAULT) < 0) TEST_ERROR; if (H5Lunpack_elink_val(objname, linfo.u.val_size, NULL, &file, &path) < 0) TEST_ERROR; - if (HDstrcmp(file, filename1) != 0) { + if (strcmp(file, filename1) != 0) { H5_FAILED(); - HDputs(" External link file name incorrect"); + puts(" External link file name incorrect"); goto error; } - if (HDstrcmp(path, "/") != 0) { + if (strcmp(path, "/") != 0) { H5_FAILED(); - HDputs(" External link path incorrect"); + puts(" External link path incorrect"); goto error; } @@ -2841,21 +2841,21 @@ external_link_root_deprec(hid_t fapl, bool new_format) goto error; if (H5L_TYPE_EXTERNAL != linfo.type) { H5_FAILED(); - HDputs(" Unexpected object type - should have been an external link"); + puts(" Unexpected object type - should have been an external link"); goto error; } if (H5Lget_val(fid, "ext_link", objname, sizeof(objname), H5P_DEFAULT) < 0) TEST_ERROR; if (H5Lunpack_elink_val(objname, linfo.u.val_size, NULL, &file, &path) < 0) TEST_ERROR; - if (HDstrcmp(file, filename1) != 0) { + if (strcmp(file, filename1) != 0) { H5_FAILED(); - HDputs(" External link file name incorrect"); + puts(" External link file name incorrect"); goto error; } - if (HDstrcmp(path, "/") != 0) { + if (strcmp(path, "/") != 0) { H5_FAILED(); - HDputs(" External link path incorrect"); + puts(" External link path incorrect"); goto error; } @@ -2872,7 +2872,7 @@ external_link_root_deprec(hid_t fapl, bool new_format) /* Check name */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/") != 0) + if (strcmp(objname, "/") != 0) TEST_ERROR; /* Create object in external file */ @@ -2917,11 +2917,11 @@ external_link_root_deprec(hid_t fapl, bool new_format) /* Check names */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/new_group") != 0) + if (strcmp(objname, "/new_group") != 0) TEST_ERROR; if (H5Iget_name(gid2, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/newer_group") != 0) + if (strcmp(objname, "/newer_group") != 0) TEST_ERROR; /* Close opened objects */ @@ -3019,11 +3019,11 @@ external_link_query_deprec(hid_t fapl, bool new_format) /* Get size of buffer for external link */ if (H5Lget_info1(fid, "src", &li, H5P_DEFAULT) < 0) TEST_ERROR; - if (li.u.val_size != (1 + (HDstrlen(filename2) + 1) + (HDstrlen("/dst") + 1))) + if (li.u.val_size != (1 + (strlen(filename2) + 1) + (strlen("/dst") + 1))) TEST_ERROR; if (H5L_TYPE_EXTERNAL != li.type) { H5_FAILED(); - HDputs(" Unexpected link class - should have been an external link"); + puts(" Unexpected link class - should have been an external link"); goto error; } @@ -3052,11 +3052,11 @@ external_link_query_deprec(hid_t fapl, bool new_format) /* Get size of buffer for external link */ if (H5Lget_info1(fid, "src", &li, H5P_DEFAULT) < 0) TEST_ERROR; - if (li.u.val_size != (1 + (HDstrlen(filename2) + 1) + (HDstrlen("/dst") + 1))) + if (li.u.val_size != (1 + (strlen(filename2) + 1) + (strlen("/dst") + 1))) TEST_ERROR; if (H5L_TYPE_EXTERNAL != li.type) { H5_FAILED(); - HDputs(" Unexpected link class - should have been an external link"); + puts(" Unexpected link class - should have been an external link"); goto error; } @@ -3069,9 +3069,9 @@ external_link_query_deprec(hid_t fapl, bool new_format) TEST_ERROR; /* Compare the file and object names */ - if (HDstrcmp(file_name, filename2) != 0) + if (strcmp(file_name, filename2) != 0) TEST_ERROR; - if (HDstrcmp(object_name, "/dst") != 0) + if (strcmp(object_name, "/dst") != 0) TEST_ERROR; /* Query information about object that external link points to */ @@ -3079,7 +3079,7 @@ external_link_query_deprec(hid_t fapl, bool new_format) FAIL_STACK_ERROR; if (H5O_TYPE_GROUP != oi.type) { H5_FAILED(); - HDputs(" Unexpected object type - should have been a group"); + puts(" Unexpected object type - should have been a group"); goto error; } @@ -3267,7 +3267,7 @@ external_link_closing_deprec(hid_t fapl, bool new_format) FAIL_STACK_ERROR; if (H5Oget_comment_by_name(fid1, "elink/elink/elink/group1_moved", buf, sizeof(buf), H5P_DEFAULT) < 0) FAIL_STACK_ERROR; - if (HDstrcmp(buf, "comment") != 0) + if (strcmp(buf, "comment") != 0) TEST_ERROR; /* Test H5*open */ @@ -3686,7 +3686,7 @@ ud_hard_links_deprec(hid_t fapl) /* Check name */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/group") != 0) + if (strcmp(objname, "/group") != 0) TEST_ERROR; /* Create object in group */ @@ -3706,7 +3706,7 @@ ud_hard_links_deprec(hid_t fapl) /* Check name */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/group/new_group") != 0) + if (strcmp(objname, "/group/new_group") != 0) TEST_ERROR; /* Close opened object */ @@ -3721,7 +3721,7 @@ ud_hard_links_deprec(hid_t fapl) TEST_ERROR; if (UD_HARD_TYPE != li.type) { H5_FAILED(); - HDputs(" Unexpected link class - should have been a UD hard link"); + puts(" Unexpected link class - should have been a UD hard link"); goto error; } /* end if */ @@ -3869,7 +3869,7 @@ ud_link_reregister_deprec(hid_t fapl) /* Check name */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/" REREG_TARGET_NAME) != 0) + if (strcmp(objname, "/" REREG_TARGET_NAME) != 0) TEST_ERROR; /* Create object in group */ @@ -3889,7 +3889,7 @@ ud_link_reregister_deprec(hid_t fapl) /* Check name */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/rereg_target/new_group") != 0) + if (strcmp(objname, "/rereg_target/new_group") != 0) TEST_ERROR; /* Close opened object */ @@ -4026,14 +4026,14 @@ ud_callbacks_deprec(hid_t fapl, bool new_format) TEST_ERROR; if (UD_CB_TYPE != li.type) { H5_FAILED(); - HDputs(" Unexpected link class - should have been a UD hard link"); + puts(" Unexpected link class - should have been a UD hard link"); goto error; } /* Fill the query buffer */ if (H5Lget_val(fid, UD_CB_LINK_NAME, query_buf, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) FAIL_STACK_ERROR; - if (HDstrcmp(query_buf, "query succeeded") != 0) + if (strcmp(query_buf, "query succeeded") != 0) TEST_ERROR; /* Move the link */ @@ -4233,7 +4233,7 @@ lapl_nlinks_deprec(hid_t fapl, bool new_format) /* Check name */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/soft17") != 0) + if (strcmp(objname, "/soft17") != 0) TEST_ERROR; /* Create group using soft link */ @@ -4266,7 +4266,7 @@ lapl_nlinks_deprec(hid_t fapl, bool new_format) H5E_END_TRY if (gid >= 0) { H5_FAILED(); - HDputs(" Should have failed for sequence of too many nested links."); + puts(" Should have failed for sequence of too many nested links."); goto error; } @@ -4277,7 +4277,7 @@ lapl_nlinks_deprec(hid_t fapl, bool new_format) /* Check name */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/soft4") != 0) + if (strcmp(objname, "/soft4") != 0) TEST_ERROR; /* Test other functions that should use a LAPL */ @@ -4597,7 +4597,7 @@ corder_create_compact_deprec(hid_t fapl) /* Create several links, but keep group in compact form */ for (u = 0; u < max_compact; u++) { - HDsnprintf(objname, sizeof(objname), "filler %u", u); + snprintf(objname, sizeof(objname), "filler %u", u); if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; if (H5Gclose(group_id2) < 0) @@ -4650,7 +4650,7 @@ corder_create_compact_deprec(hid_t fapl) H5L_info1_t linfo; /* Link information */ /* Retrieve information for link */ - HDsnprintf(objname, sizeof(objname), "filler %u", u); + snprintf(objname, sizeof(objname), "filler %u", u); if (H5Lget_info1(group_id, objname, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -4741,7 +4741,7 @@ corder_create_dense_deprec(hid_t fapl) /* Create several links, up to limit of compact form */ for (u = 0; u < max_compact; u++) { - HDsnprintf(objname, sizeof(objname), "filler %u", u); + snprintf(objname, sizeof(objname), "filler %u", u); if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; if (H5Gclose(group_id2) < 0) @@ -4759,7 +4759,7 @@ corder_create_dense_deprec(hid_t fapl) } /* end for */ /* Create another link, to push group into dense form */ - HDsnprintf(objname, sizeof(objname), "filler %u", max_compact); + snprintf(objname, sizeof(objname), "filler %u", max_compact); if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; if (H5Gclose(group_id2) < 0) @@ -4813,7 +4813,7 @@ corder_create_dense_deprec(hid_t fapl) H5L_info1_t linfo; /* Link information */ /* Retrieve information for link */ - HDsnprintf(objname, sizeof(objname), "filler %u", u); + snprintf(objname, sizeof(objname), "filler %u", u); if (H5Lget_info1(group_id, objname, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -4868,7 +4868,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, b H5L_info1_t linfo; /* Link info struct */ /* Make link value for increasing/native order queries */ - HDsnprintf(valname, sizeof(valname), "value %02u", (unsigned)n); + snprintf(valname, sizeof(valname), "value %02u", (unsigned)n); /* Verify the link information for first link, in increasing creation order */ memset(&linfo, 0, sizeof(linfo)); @@ -4891,7 +4891,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, b 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; - if (HDstrcmp(valname, tmpval) != 0) + if (strcmp(valname, tmpval) != 0) TEST_ERROR; } /* end if */ @@ -4900,7 +4900,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, b 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; - if (HDstrcmp(linkname, tmpname) != 0) + if (strcmp(linkname, tmpname) != 0) TEST_ERROR; /* Don't test "native" order if there is no creation order index, since @@ -4930,7 +4930,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, b 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; - if (HDstrcmp(valname, tmpval) != 0) + if (strcmp(valname, tmpval) != 0) TEST_ERROR; } /* end if */ @@ -4939,7 +4939,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, b 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; - if (HDstrcmp(linkname, tmpname) != 0) + if (strcmp(linkname, tmpname) != 0) TEST_ERROR; } /* end if */ @@ -4964,7 +4964,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, b 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; - if (HDstrcmp(valname, tmpval) != 0) + if (strcmp(valname, tmpval) != 0) TEST_ERROR; } /* end if */ @@ -4973,7 +4973,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, b 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; - if (HDstrcmp(linkname, tmpname) != 0) + if (strcmp(linkname, tmpname) != 0) TEST_ERROR; /* Verify the link information for first link, in increasing link name order */ @@ -4996,7 +4996,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, b 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; - if (HDstrcmp(valname, tmpval) != 0) + if (strcmp(valname, tmpval) != 0) TEST_ERROR; } /* end if */ @@ -5005,7 +5005,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, b 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; - if (HDstrcmp(linkname, tmpname) != 0) + if (strcmp(linkname, tmpname) != 0) TEST_ERROR; /* Don't test "native" order queries on link name order, since there's not @@ -5032,7 +5032,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, b 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; - if (HDstrcmp(valname, tmpval) != 0) + if (strcmp(valname, tmpval) != 0) TEST_ERROR; } /* end if */ @@ -5041,7 +5041,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, b 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; - if (HDstrcmp(linkname, tmpname) != 0) + if (strcmp(linkname, tmpname) != 0) TEST_ERROR; /* Success */ @@ -5145,7 +5145,7 @@ link_info_by_idx_deprec(hid_t fapl) /* Create several links, up to limit of compact form */ for (u = 0; u < max_compact; u++) { /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Check for creating hard or soft link */ if (hard_link) { @@ -5160,7 +5160,7 @@ link_info_by_idx_deprec(hid_t fapl) } /* end if */ else { /* Make value for link */ - HDsnprintf(valname, sizeof(valname), "value %02u", u); + snprintf(valname, sizeof(valname), "value %02u", u); /* Create soft link */ if (H5Lcreate_soft(valname, group_id, objname, H5P_DEFAULT, H5P_DEFAULT) < 0) @@ -5205,7 +5205,7 @@ link_info_by_idx_deprec(hid_t fapl) /* Create more links, to push group into dense form */ for (; u < (max_compact * 2); u++) { /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Check for creating hard or soft link */ if (hard_link) { @@ -5220,7 +5220,7 @@ link_info_by_idx_deprec(hid_t fapl) } /* end if */ else { /* Make value for link */ - HDsnprintf(valname, sizeof(valname), "value %02u", u); + snprintf(valname, sizeof(valname), "value %02u", u); /* Create soft link */ if (H5Lcreate_soft(valname, group_id, objname, H5P_DEFAULT, H5P_DEFAULT) < 0) @@ -5337,7 +5337,7 @@ link_info_by_idx_old_deprec(hid_t fapl) /* Create several links */ for (u = 0; u < CORDER_NLINKS; u++) { /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Check for creating hard or soft link */ if (hard_link) { @@ -5358,7 +5358,7 @@ link_info_by_idx_old_deprec(hid_t fapl) } /* end if */ else { /* Make value for link */ - HDsnprintf(valname, sizeof(valname), "value %02u", u); + snprintf(valname, sizeof(valname), "value %02u", u); /* Create soft link */ if (H5Lcreate_soft(valname, group_id, objname, H5P_DEFAULT, H5P_DEFAULT) < 0) @@ -5371,10 +5371,10 @@ link_info_by_idx_old_deprec(hid_t fapl) unsigned dec_u = CORDER_NLINKS - (u + 1); /* Decreasing mapped index */ /* Make link name for increasing/native order queries */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Make link value for increasing/native order queries */ - HDsnprintf(valname, sizeof(valname), "value %02u", u); + snprintf(valname, sizeof(valname), "value %02u", u); /* Verify link information (in increasing order) */ if (hard_link) { @@ -5388,7 +5388,7 @@ link_info_by_idx_old_deprec(hid_t fapl) if (H5Lget_val_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)u, tmpval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; - if (HDstrcmp(valname, tmpval) != 0) + if (strcmp(valname, tmpval) != 0) TEST_ERROR; } /* end else */ @@ -5396,7 +5396,7 @@ link_info_by_idx_old_deprec(hid_t fapl) if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; - if (HDstrcmp(objname, tmpname) != 0) + if (strcmp(objname, tmpname) != 0) TEST_ERROR; /* Verify link information (in native order - native is increasing) */ @@ -5411,7 +5411,7 @@ link_info_by_idx_old_deprec(hid_t fapl) if (H5Lget_val_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_NATIVE, (hsize_t)u, tmpval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; - if (HDstrcmp(valname, tmpval) != 0) + if (strcmp(valname, tmpval) != 0) TEST_ERROR; } /* end else */ @@ -5419,14 +5419,14 @@ link_info_by_idx_old_deprec(hid_t fapl) if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_NATIVE, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; - if (HDstrcmp(objname, tmpname) != 0) + if (strcmp(objname, tmpname) != 0) TEST_ERROR; /* Make link name for decreasing order queries */ - HDsnprintf(objname, sizeof(objname), "filler %02u", dec_u); + snprintf(objname, sizeof(objname), "filler %02u", dec_u); /* Make link value for decreasing order queries */ - HDsnprintf(valname, sizeof(valname), "value %02u", dec_u); + snprintf(valname, sizeof(valname), "value %02u", dec_u); /* Verify link information (in decreasing order) */ if (hard_link) { @@ -5440,7 +5440,7 @@ link_info_by_idx_old_deprec(hid_t fapl) if (H5Lget_val_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, (hsize_t)u, tmpval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; - if (HDstrcmp(valname, tmpval) != 0) + if (strcmp(valname, tmpval) != 0) TEST_ERROR; } /* end else */ @@ -5448,7 +5448,7 @@ link_info_by_idx_old_deprec(hid_t fapl) if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; - if (HDstrcmp(objname, tmpname) != 0) + if (strcmp(objname, tmpname) != 0) TEST_ERROR; } /* end for */ @@ -5618,7 +5618,7 @@ delete_by_idx_deprec(hid_t fapl) hid_t group_id2; /* Group ID */ /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Create hard link, with group object */ if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < @@ -5671,10 +5671,10 @@ delete_by_idx_deprec(hid_t fapl) (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; if (order == H5_ITER_INC) - HDsnprintf(objname, sizeof(objname), "filler %02u", (u + 1)); + snprintf(objname, sizeof(objname), "filler %02u", (u + 1)); else - HDsnprintf(objname, sizeof(objname), "filler %02u", (max_compact - (u + 2))); - if (HDstrcmp(objname, tmpname) != 0) + snprintf(objname, sizeof(objname), "filler %02u", (max_compact - (u + 2))); + if (strcmp(objname, tmpname) != 0) TEST_ERROR; } /* end for */ @@ -5691,7 +5691,7 @@ delete_by_idx_deprec(hid_t fapl) hid_t group_id2; /* Group ID */ /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Create hard link, with group object */ if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < @@ -5745,10 +5745,10 @@ delete_by_idx_deprec(hid_t fapl) (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; if (order == H5_ITER_INC) - HDsnprintf(objname, sizeof(objname), "filler %02u", (u + 1)); + snprintf(objname, sizeof(objname), "filler %02u", (u + 1)); else - HDsnprintf(objname, sizeof(objname), "filler %02u", ((max_compact * 2) - (u + 2))); - if (HDstrcmp(objname, tmpname) != 0) + snprintf(objname, sizeof(objname), "filler %02u", ((max_compact * 2) - (u + 2))); + if (strcmp(objname, tmpname) != 0) TEST_ERROR; } /* end for */ @@ -5778,7 +5778,7 @@ delete_by_idx_deprec(hid_t fapl) hid_t group_id2; /* Group ID */ /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Create hard link, with group object */ if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < @@ -5823,11 +5823,11 @@ delete_by_idx_deprec(hid_t fapl) (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; if (order == H5_ITER_INC) - HDsnprintf(objname, sizeof(objname), "filler %02u", ((u * 2) + 1)); + snprintf(objname, sizeof(objname), "filler %02u", ((u * 2) + 1)); else - HDsnprintf(objname, sizeof(objname), "filler %02u", - ((max_compact * 2) - ((u * 2) + 2))); - if (HDstrcmp(objname, tmpname) != 0) + snprintf(objname, sizeof(objname), "filler %02u", + ((max_compact * 2) - ((u * 2) + 2))); + if (strcmp(objname, tmpname) != 0) TEST_ERROR; } /* end for */ @@ -5857,11 +5857,11 @@ delete_by_idx_deprec(hid_t fapl) (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; if (order == H5_ITER_INC) - HDsnprintf(objname, sizeof(objname), "filler %02u", ((u * 2) + 3)); + snprintf(objname, sizeof(objname), "filler %02u", ((u * 2) + 3)); else - HDsnprintf(objname, sizeof(objname), "filler %02u", - ((max_compact * 2) - ((u * 2) + 4))); - if (HDstrcmp(objname, tmpname) != 0) + snprintf(objname, sizeof(objname), "filler %02u", + ((max_compact * 2) - ((u * 2) + 4))); + if (strcmp(objname, tmpname) != 0) TEST_ERROR; } /* end for */ @@ -5964,7 +5964,7 @@ delete_by_idx_old_deprec(hid_t fapl) H5O_info1_t oi; /* Buffer for querying object's info */ /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Create group */ if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) @@ -6025,10 +6025,10 @@ delete_by_idx_old_deprec(hid_t fapl) (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; if (order == H5_ITER_INC) - HDsnprintf(objname, sizeof(objname), "filler %02u", (u + 1)); + snprintf(objname, sizeof(objname), "filler %02u", (u + 1)); else - HDsnprintf(objname, sizeof(objname), "filler %02u", dec_u); - if (HDstrcmp(objname, tmpname) != 0) + snprintf(objname, sizeof(objname), "filler %02u", dec_u); + if (strcmp(objname, tmpname) != 0) TEST_ERROR; } /* end for */ @@ -6056,7 +6056,7 @@ delete_by_idx_old_deprec(hid_t fapl) H5O_info1_t oi; /* Buffer for querying object's info */ /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Create group */ if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) @@ -6099,10 +6099,10 @@ delete_by_idx_old_deprec(hid_t fapl) (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; if (order == H5_ITER_INC) - HDsnprintf(objname, sizeof(objname), "filler %02u", ((u * 2) + 1)); + snprintf(objname, sizeof(objname), "filler %02u", ((u * 2) + 1)); else - HDsnprintf(objname, sizeof(objname), "filler %02u", dec_u); - if (HDstrcmp(objname, tmpname) != 0) + snprintf(objname, sizeof(objname), "filler %02u", dec_u); + if (strcmp(objname, tmpname) != 0) TEST_ERROR; } /* end for */ @@ -6133,10 +6133,10 @@ delete_by_idx_old_deprec(hid_t fapl) (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; if (order == H5_ITER_INC) - HDsnprintf(objname, sizeof(objname), "filler %02u", ((u * 2) + 3)); + snprintf(objname, sizeof(objname), "filler %02u", ((u * 2) + 3)); else - HDsnprintf(objname, sizeof(objname), "filler %02u", dec_u); - if (HDstrcmp(objname, tmpname) != 0) + snprintf(objname, sizeof(objname), "filler %02u", dec_u); + if (strcmp(objname, tmpname) != 0) TEST_ERROR; } /* end for */ @@ -6217,8 +6217,8 @@ link_iterate_deprec_cb(hid_t group_id, const char *link_name, const H5L_info1_t } /* end if */ /* Verify name of link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", (unsigned)my_info.corder); - if (HDstrcmp(link_name, objname) != 0) + snprintf(objname, sizeof(objname), "filler %02u", (unsigned)my_info.corder); + if (strcmp(link_name, objname) != 0) return H5_ITER_ERROR; /* Check if we've visited this link before */ @@ -6574,7 +6574,7 @@ link_iterate_deprec(hid_t fapl) hid_t group_id2; /* Group ID */ /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Create hard link, with group object */ if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < @@ -6607,7 +6607,7 @@ link_iterate_deprec(hid_t fapl) hid_t group_id2; /* Group ID */ /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Create hard link, with group object */ if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < @@ -6713,9 +6713,9 @@ link_iterate_old_deprec_cb(hid_t group_id, const char *link_name, const H5L_info } /* end if */ /* Verify name of link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", - (info ? (unsigned)op_data->curr : (unsigned)((op_data->ncalled - 1) + op_data->nskipped))); - if (HDstrcmp(link_name, objname) != 0) + snprintf(objname, sizeof(objname), "filler %02u", + (info ? (unsigned)op_data->curr : (unsigned)((op_data->ncalled - 1) + op_data->nskipped))); + if (strcmp(link_name, objname) != 0) return H5_ITER_ERROR; /* Check if we've visited this link before */ @@ -7006,7 +7006,7 @@ link_iterate_old_deprec(hid_t fapl) hid_t group_id2; /* Group ID */ /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Create hard link, with group object */ if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) @@ -7132,21 +7132,21 @@ external_link_root(hid_t fapl, bool new_format) goto error; if (H5L_TYPE_EXTERNAL != linfo.type) { H5_FAILED(); - HDputs(" Unexpected object type - should have been an external link"); + puts(" Unexpected object type - should have been an external link"); goto error; } if (H5Lget_val(fid, "ext_link", objname, sizeof(objname), H5P_DEFAULT) < 0) TEST_ERROR; if (H5Lunpack_elink_val(objname, linfo.u.val_size, NULL, &file, &path) < 0) TEST_ERROR; - if (HDstrcmp(file, filename1) != 0) { + if (strcmp(file, filename1) != 0) { H5_FAILED(); - HDputs(" External link file name incorrect"); + puts(" External link file name incorrect"); goto error; } - if (HDstrcmp(path, "/") != 0) { + if (strcmp(path, "/") != 0) { H5_FAILED(); - HDputs(" External link path incorrect"); + puts(" External link path incorrect"); goto error; } @@ -7160,21 +7160,21 @@ external_link_root(hid_t fapl, bool new_format) goto error; if (H5L_TYPE_EXTERNAL != linfo.type) { H5_FAILED(); - HDputs(" Unexpected object type - should have been an external link"); + puts(" Unexpected object type - should have been an external link"); goto error; } if (H5Lget_val(fid, "ext_link", objname, sizeof(objname), H5P_DEFAULT) < 0) TEST_ERROR; if (H5Lunpack_elink_val(objname, linfo.u.val_size, NULL, &file, &path) < 0) TEST_ERROR; - if (HDstrcmp(file, filename1) != 0) { + if (strcmp(file, filename1) != 0) { H5_FAILED(); - HDputs(" External link file name incorrect"); + puts(" External link file name incorrect"); goto error; } - if (HDstrcmp(path, "/") != 0) { + if (strcmp(path, "/") != 0) { H5_FAILED(); - HDputs(" External link path incorrect"); + puts(" External link path incorrect"); goto error; } @@ -7191,7 +7191,7 @@ external_link_root(hid_t fapl, bool new_format) /* Check name */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/") != 0) + if (strcmp(objname, "/") != 0) TEST_ERROR; /* Create object in external file */ @@ -7236,11 +7236,11 @@ external_link_root(hid_t fapl, bool new_format) /* Check names */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/new_group") != 0) + if (strcmp(objname, "/new_group") != 0) TEST_ERROR; if (H5Iget_name(gid2, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/newer_group") != 0) + if (strcmp(objname, "/newer_group") != 0) TEST_ERROR; /* Close opened objects */ @@ -7362,7 +7362,7 @@ external_link_path(hid_t fapl, bool new_format) /* Check name */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/A/B/C") != 0) + if (strcmp(objname, "/A/B/C") != 0) TEST_ERROR; /* Create object in external file */ @@ -7392,7 +7392,7 @@ external_link_path(hid_t fapl, bool new_format) /* Check name */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/A/B/C/new_group") != 0) + if (strcmp(objname, "/A/B/C/new_group") != 0) TEST_ERROR; /* Close opened object */ @@ -7534,7 +7534,7 @@ external_link_mult(hid_t fapl, bool new_format) /* Check name */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/A/B/C") != 0) + if (strcmp(objname, "/A/B/C") != 0) TEST_ERROR; /* Create object in external file */ @@ -7564,7 +7564,7 @@ external_link_mult(hid_t fapl, bool new_format) /* Check name */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/A/B/C/new_group") != 0) + if (strcmp(objname, "/A/B/C/new_group") != 0) TEST_ERROR; /* Close opened object */ @@ -7680,7 +7680,7 @@ external_link_self(hid_t fapl, bool new_format) /* Check name */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/X") != 0) + if (strcmp(objname, "/X") != 0) TEST_ERROR; /* Create object through external link */ @@ -7702,7 +7702,7 @@ external_link_self(hid_t fapl, bool new_format) /* Check name */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/X/new_group") != 0) + if (strcmp(objname, "/X/new_group") != 0) TEST_ERROR; /* Close opened object */ @@ -7882,7 +7882,7 @@ external_link_pingpong(hid_t fapl, bool new_format) /* Check name */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/final") != 0) + if (strcmp(objname, "/final") != 0) TEST_ERROR; /* Create object in external file */ @@ -7912,7 +7912,7 @@ external_link_pingpong(hid_t fapl, bool new_format) /* Check name */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/final/new_group") != 0) + if (strcmp(objname, "/final/new_group") != 0) TEST_ERROR; /* Close opened object */ @@ -8074,7 +8074,7 @@ external_link_toomany(hid_t fapl, bool new_format) /* Check name */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/final") != 0) + if (strcmp(objname, "/final") != 0) TEST_ERROR; /* Create object in external file */ @@ -8173,7 +8173,7 @@ external_link_dangling(hid_t fapl, bool new_format) H5E_END_TRY if (gid >= 0) { H5_FAILED(); - HDputs(" Should have failed for sequence of too many nested links."); + puts(" Should have failed for sequence of too many nested links."); goto error; } @@ -8185,7 +8185,7 @@ external_link_dangling(hid_t fapl, bool new_format) H5E_END_TRY if (gid >= 0) { H5_FAILED(); - HDputs(" Should have failed for sequence of too many nested links."); + puts(" Should have failed for sequence of too many nested links."); goto error; } @@ -8197,7 +8197,7 @@ external_link_dangling(hid_t fapl, bool new_format) H5E_END_TRY if (status >= 0) { H5_FAILED(); - HDputs( + puts( " Retrieving name of object by index through dangling file external link should have failed."); } /* end if */ @@ -8298,7 +8298,7 @@ external_link_prefix(hid_t fapl, bool new_format) /* should be able to find the target file from pathnames set via H5Pset_elink_prefix() */ if (gid < 0) { H5_FAILED(); - HDputs(" Should have found the file in tmp_links directory."); + puts(" Should have found the file in tmp_links directory."); goto error; } @@ -8395,7 +8395,7 @@ external_link_abs_mainpath(hid_t fapl, bool new_format) /* should be able to find the target file from absolute path set for main file */ if (gid < 0) { H5_FAILED(); - HDputs(" Should have found the file in tmp_links directory."); + puts(" Should have found the file in tmp_links directory."); goto error; } @@ -8483,7 +8483,7 @@ external_link_rel_mainpath(hid_t fapl, bool new_format) /* should be able to find the target file from the main file's relative pathname */ if (gid < 0) { H5_FAILED(); - HDputs(" Should have found the file in current working directory"); + puts(" Should have found the file in current working directory"); goto error; } @@ -8576,7 +8576,7 @@ external_link_cwd(hid_t fapl, bool new_format) /* should be able to find the target file from the current working directory */ if (gid < 0) { H5_FAILED(); - HDputs(" Should have found the file in current working directory"); + puts(" Should have found the file in current working directory"); goto error; } @@ -8674,7 +8674,7 @@ external_link_abstar(hid_t fapl, bool new_format) /* should be able to find the target file with absolute path */ if (gid < 0) { H5_FAILED(); - HDputs(" Should have found the file in tmp_links directory."); + puts(" Should have found the file in tmp_links directory."); goto error; } @@ -8772,7 +8772,7 @@ external_link_abstar_cur(hid_t fapl, bool new_format) /* should be able to find the target file from main file's current working directory */ if (gid < 0) { H5_FAILED(); - HDputs(" Should have found the file in current working directory."); + puts(" Should have found the file in current working directory."); goto error; } @@ -8853,7 +8853,7 @@ external_link_reltar(hid_t fapl, bool new_format) /* Open object through external link */ if ((gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT)) < 0) { H5_FAILED(); - HDputs(" Should have found the file in tmp_links directory."); + puts(" Should have found the file in tmp_links directory."); goto error; } /* end if */ @@ -8953,7 +8953,7 @@ external_link_chdir(hid_t fapl, bool new_format) */ if (gid < 0) { H5_FAILED(); - HDputs(" Should have found the file in tmp_links directory."); + puts(" Should have found the file in tmp_links directory."); goto error; } @@ -9056,27 +9056,27 @@ external_set_elink_fapl1(hid_t fapl, bool new_format) memb_map[H5FD_MEM_GHEAP] = H5FD_MEM_GHEAP; memb_map[H5FD_MEM_LHEAP] = H5FD_MEM_LHEAP; - HDsnprintf(sv[H5FD_MEM_SUPER], sizeof(sv[H5FD_MEM_SUPER]), "%%s-%c.h5", 's'); + snprintf(sv[H5FD_MEM_SUPER], sizeof(sv[H5FD_MEM_SUPER]), "%%s-%c.h5", 's'); memb_name[H5FD_MEM_SUPER] = sv[H5FD_MEM_SUPER]; memb_addr[H5FD_MEM_SUPER] = 0; - HDsnprintf(sv[H5FD_MEM_BTREE], sizeof(sv[H5FD_MEM_BTREE]), "%%s-%c.h5", 'b'); + snprintf(sv[H5FD_MEM_BTREE], sizeof(sv[H5FD_MEM_BTREE]), "%%s-%c.h5", 'b'); memb_name[H5FD_MEM_BTREE] = sv[H5FD_MEM_BTREE]; memb_addr[H5FD_MEM_BTREE] = HADDR_MAX / 6; - HDsnprintf(sv[H5FD_MEM_DRAW], sizeof(sv[H5FD_MEM_DRAW]), "%%s-%c.h5", 'r'); + snprintf(sv[H5FD_MEM_DRAW], sizeof(sv[H5FD_MEM_DRAW]), "%%s-%c.h5", 'r'); memb_name[H5FD_MEM_DRAW] = sv[H5FD_MEM_DRAW]; memb_addr[H5FD_MEM_DRAW] = HADDR_MAX / 3; - HDsnprintf(sv[H5FD_MEM_GHEAP], sizeof(sv[H5FD_MEM_GHEAP]), "%%s-%c.h5", 'g'); + snprintf(sv[H5FD_MEM_GHEAP], sizeof(sv[H5FD_MEM_GHEAP]), "%%s-%c.h5", 'g'); memb_name[H5FD_MEM_GHEAP] = sv[H5FD_MEM_GHEAP]; memb_addr[H5FD_MEM_GHEAP] = HADDR_MAX / 2; - HDsnprintf(sv[H5FD_MEM_LHEAP], sizeof(sv[H5FD_MEM_LHEAP]), "%%s-%c.h5", 'l'); + snprintf(sv[H5FD_MEM_LHEAP], sizeof(sv[H5FD_MEM_LHEAP]), "%%s-%c.h5", 'l'); memb_name[H5FD_MEM_LHEAP] = sv[H5FD_MEM_LHEAP]; memb_addr[H5FD_MEM_LHEAP] = (HADDR_MAX / 3) * 2; - HDsnprintf(sv[H5FD_MEM_OHDR], sizeof(sv[H5FD_MEM_OHDR]), "%%s-%c.h5", 'o'); + snprintf(sv[H5FD_MEM_OHDR], sizeof(sv[H5FD_MEM_OHDR]), "%%s-%c.h5", 'o'); memb_name[H5FD_MEM_OHDR] = sv[H5FD_MEM_OHDR]; memb_addr[H5FD_MEM_OHDR] = (HADDR_MAX / 6) * 5; @@ -9134,7 +9134,7 @@ external_set_elink_fapl1(hid_t fapl, bool new_format) /* should succeed in opening the target object A in the current working directory */ if (oidA < 0) { H5_FAILED(); - HDputs(" Should succeed in opening family target file A in current working directory"); + puts(" Should succeed in opening family target file A in current working directory"); goto error; } @@ -9150,7 +9150,7 @@ external_set_elink_fapl1(hid_t fapl, bool new_format) /* should succeed in opening the target object B in the current working directory */ if (oidB < 0) { H5_FAILED(); - HDputs(" Should succeed in opening multi target file B in current working directory"); + puts(" Should succeed in opening multi target file B in current working directory"); goto error; } @@ -9341,7 +9341,7 @@ external_set_elink_fapl2(hid_t fapl, bool new_format) did = H5Dopen2(fid, "ext_link", dapl_id); if (did < 0) { H5_FAILED(); - HDputs(" Should succeed in opening the target dataset"); + puts(" Should succeed in opening the target dataset"); goto error; } @@ -9846,13 +9846,13 @@ external_set_elink_cb_cb(const char *parent_file, const char *parent_group, cons set_elink_cb_t *op_data = (set_elink_cb_t *)_op_data; /* Verify file and object names are correct */ - if (HDstrcmp(parent_file, op_data->parent_file) != 0) + if (strcmp(parent_file, op_data->parent_file) != 0) return FAIL; - if (HDstrcmp(parent_group, "/group1") != 0) + if (strcmp(parent_group, "/group1") != 0) return FAIL; - if (HDstrcmp(target_file, op_data->target_file) != 0) + if (strcmp(target_file, op_data->target_file) != 0) return FAIL; - if (HDstrcmp(target_obj, "/") != 0) + if (strcmp(target_obj, "/") != 0) return FAIL; /* Set flags to be read-write */ @@ -10124,9 +10124,9 @@ external_link_win1(hid_t fapl, bool new_format) TEST_ERROR; /* set up name for target link: "/CWD/tmp_links/extlinks10" */ - HDstrcpy(tmpname, &cwdpath[2]); /* stripped the drive letter to make it rel drive but absolute path */ - HDstrcat(tmpname, "/"); - HDstrcat(tmpname, FILENAME[30]); + strcpy(tmpname, &cwdpath[2]); /* stripped the drive letter to make it rel drive but absolute path */ + strcat(tmpname, "/"); + strcat(tmpname, FILENAME[30]); h5_fixname(tmpname, fapl, filename2, sizeof filename2); /* set up name for target file: "extlinks10" */ @@ -10162,7 +10162,7 @@ external_link_win1(hid_t fapl, bool new_format) /* should be able to find the target file via main file's CWD*/ if (gid < 0) { H5_FAILED(); - HDputs(" Should have found the file in CWD."); + puts(" Should have found the file in CWD."); goto error; } @@ -10220,10 +10220,9 @@ external_link_win2(hid_t fapl, bool new_format) TEST_ERROR; /* set up name for target link: "/CWD/tmp_links/extlinks11" */ - HDstrcpy(tmpname, - &cwdpath[2]); /* stripped the drive letter to make it relative drive but absolute path */ - HDstrcat(tmpname, "/"); - HDstrcat(tmpname, FILENAME[31]); + strcpy(tmpname, &cwdpath[2]); /* stripped the drive letter to make it relative drive but absolute path */ + strcat(tmpname, "/"); + strcat(tmpname, FILENAME[31]); h5_fixname(tmpname, fapl, filename2, sizeof filename2); /* set up name for target file: "tmp_links/extlinks11" */ @@ -10259,7 +10258,7 @@ external_link_win2(hid_t fapl, bool new_format) /* should be able to find the target file directly */ if (gid < 0) { H5_FAILED(); - HDputs(" Should have found the file in tmp_links."); + puts(" Should have found the file in tmp_links."); goto error; } @@ -10317,7 +10316,7 @@ external_link_win3(hid_t fapl, bool new_format) /* set up name for target link: "<drive-letter>:tmp_links/extlinks12" */ drive = HDgetdrive(); - HDsnprintf(tmpname, sizeof(tmpname), "%c:%s", (drive + 'A' - 1), FILENAME[32]); + snprintf(tmpname, sizeof(tmpname), "%c:%s", (drive + 'A' - 1), FILENAME[32]); h5_fixname(tmpname, fapl, filename2, sizeof filename2); /* set up name for target file: "tmp_links/extlinks12" */ @@ -10353,7 +10352,7 @@ external_link_win3(hid_t fapl, bool new_format) /* should be able to find the target file directly */ if (gid < 0) { H5_FAILED(); - HDputs(" Should have found the file in tmp_links."); + puts(" Should have found the file in tmp_links."); goto error; } @@ -10404,11 +10403,11 @@ external_link_win4(hid_t fapl, bool new_format) /* set up name for main file: "<drive-letter>:tmp_links/extlinks0" */ drive = HDgetdrive(); - HDsnprintf(tmpname, sizeof(tmpname), "%c:%s", (drive + 'A' - 1), FILENAME[13]); + snprintf(tmpname, sizeof(tmpname), "%c:%s", (drive + 'A' - 1), FILENAME[13]); h5_fixname(tmpname, fapl, filename1, sizeof filename1); /* set up name for target link: "<drive-letter>:extlinks13" */ - HDsnprintf(tmpname, sizeof(tmpname), "%c:%s", (drive + 'A' - 1), FILENAME[33]); + snprintf(tmpname, sizeof(tmpname), "%c:%s", (drive + 'A' - 1), FILENAME[33]); h5_fixname(tmpname, fapl, filename2, sizeof filename2); /* set up name for target file: "tmp_links/extlinks13" */ @@ -10444,7 +10443,7 @@ external_link_win4(hid_t fapl, bool new_format) /* should be able to find the target file via main file's absolute drive/relative path */ if (gid < 0) { H5_FAILED(); - HDputs(" Should have found the file in CWD."); + puts(" Should have found the file in CWD."); goto error; } @@ -10503,13 +10502,13 @@ external_link_win5(hid_t fapl, bool new_format) drive += 1; /* set up name for main file: "/CWD/extlinks0" */ - HDstrcpy(tmpname, &cwdpath[2]); /* stripped the drive letter to make it rel drive but absolute path */ - HDstrcat(tmpname, "/"); - HDstrcat(tmpname, FILENAME[12]); + strcpy(tmpname, &cwdpath[2]); /* stripped the drive letter to make it rel drive but absolute path */ + strcat(tmpname, "/"); + strcat(tmpname, FILENAME[12]); h5_fixname(tmpname, fapl, filename1, sizeof filename1); /* set up name for target link: "<drive-letter+1>:tmp_links/extlinks14" */ - HDsnprintf(tmpname, sizeof(tmpname), "%c:%s", (drive + 'A' - 1), FILENAME[35]); + snprintf(tmpname, sizeof(tmpname), "%c:%s", (drive + 'A' - 1), FILENAME[35]); h5_fixname(tmpname, fapl, filename2, sizeof filename2); /* set up name for target file: "tmp_links/extlinks14" */ @@ -10545,7 +10544,7 @@ external_link_win5(hid_t fapl, bool new_format) /* should be able to find the target file via main file's rel drive/abs path */ if (gid < 0) { H5_FAILED(); - HDputs(" Should have found the file in CWD."); + puts(" Should have found the file in CWD."); goto error; } @@ -10607,7 +10606,7 @@ external_link_win6(hid_t fapl, bool new_format) h5_fixname(FILENAME[12], fapl, filename1, sizeof filename1); /* set up name for target link: "<drive-letter+1>:tmp_links/extlinks15" */ - HDsnprintf(tmpname, sizeof(tmpname), "%c:%s", (drive + 'A' - 1), FILENAME[36]); + snprintf(tmpname, sizeof(tmpname), "%c:%s", (drive + 'A' - 1), FILENAME[36]); h5_fixname(tmpname, fapl, filename2, sizeof filename2); /* set up name for target file: "tmp/extlinks15" */ @@ -10643,7 +10642,7 @@ external_link_win6(hid_t fapl, bool new_format) /* should be able to find the target file via target file's rel path in current drive */ if (gid < 0) { H5_FAILED(); - HDputs(" Should have found the file in tmp_links."); + puts(" Should have found the file in tmp_links."); goto error; } @@ -10700,9 +10699,9 @@ external_link_win7(hid_t fapl, bool new_format) TEST_ERROR; /* set up name for target link: "\\127.0.0.1\c$/tmp_links/extlinks10" */ - HDstrcpy(tmpname, "\\\\127.0.0.1\\c$"); /* absolute path */ - HDstrcat(tmpname, "/"); - HDstrcat(tmpname, FILENAME[30]); + strcpy(tmpname, "\\\\127.0.0.1\\c$"); /* absolute path */ + strcat(tmpname, "/"); + strcat(tmpname, FILENAME[30]); h5_fixname(tmpname, fapl, filename2, sizeof filename2); /* set up name for target file: "extlinks15" */ @@ -10738,7 +10737,7 @@ external_link_win7(hid_t fapl, bool new_format) /* should be able to find the target file via main file's local host/main drive*/ if (gid < 0) { H5_FAILED(); - HDputs(" Should have found the file in local host/main drive."); + puts(" Should have found the file in local host/main drive."); goto error; } @@ -10802,7 +10801,7 @@ external_link_win8(hid_t fapl, bool new_format) /* set up name for target link: "<drive-letter>:\CWD\extlinks10" */ drive = HDgetdrive(); - HDsnprintf(tmpname, sizeof(tmpname), "\\\\?\\%c:%s\\%s", (drive + 'A' - 1), &cwdpath[2], FILENAME[30]); + snprintf(tmpname, sizeof(tmpname), "\\\\?\\%c:%s\\%s", (drive + 'A' - 1), &cwdpath[2], FILENAME[30]); h5_fixname(tmpname, fapl, filename2, sizeof filename2); /* set up name for target file: "extlinks10" */ @@ -10838,7 +10837,7 @@ external_link_win8(hid_t fapl, bool new_format) /* should be able to find the target file directly */ if (gid < 0) { H5_FAILED(); - HDputs(" Should have found the file in tmp_links."); + puts(" Should have found the file in tmp_links."); goto error; } @@ -10895,9 +10894,9 @@ external_link_win9(hid_t fapl, bool new_format) TEST_ERROR; /* set up name for target link: "\\?\UNC\127.0.0.1\c$/tmp_links/extlinks10" */ - HDstrcpy(tmpname, "\\\\?\\UNC\127.0.0.1\\c$"); /* absolute path */ - HDstrcat(tmpname, "/"); - HDstrcat(tmpname, FILENAME[30]); + strcpy(tmpname, "\\\\?\\UNC\127.0.0.1\\c$"); /* absolute path */ + strcat(tmpname, "/"); + strcat(tmpname, FILENAME[30]); h5_fixname(tmpname, fapl, filename2, sizeof filename2); /* set up name for target file: "extlinks15" */ @@ -10933,7 +10932,7 @@ external_link_win9(hid_t fapl, bool new_format) /* should be able to find the target file via main file's local host/main drive*/ if (gid < 0) { H5_FAILED(); - HDputs(" Should have found the file in local host/main drive."); + puts(" Should have found the file in local host/main drive."); goto error; } @@ -11006,7 +11005,7 @@ external_link_recursive(hid_t fapl, bool new_format) H5E_END_TRY if (gid >= 0) { H5_FAILED(); - HDputs(" Should have failed for recursive external links."); + puts(" Should have failed for recursive external links."); goto error; } @@ -11070,11 +11069,11 @@ external_link_query(hid_t fapl, bool new_format) /* Get size of buffer for external link */ if (H5Lget_info2(fid, "src", &li, H5P_DEFAULT) < 0) TEST_ERROR; - if (li.u.val_size != (1 + (HDstrlen(filename2) + 1) + (HDstrlen("/dst") + 1))) + if (li.u.val_size != (1 + (strlen(filename2) + 1) + (strlen("/dst") + 1))) TEST_ERROR; if (H5L_TYPE_EXTERNAL != li.type) { H5_FAILED(); - HDputs(" Unexpected link class - should have been an external link"); + puts(" Unexpected link class - should have been an external link"); goto error; } @@ -11103,11 +11102,11 @@ external_link_query(hid_t fapl, bool new_format) /* Get size of buffer for external link */ if (H5Lget_info2(fid, "src", &li, H5P_DEFAULT) < 0) TEST_ERROR; - if (li.u.val_size != (1 + (HDstrlen(filename2) + 1) + (HDstrlen("/dst") + 1))) + if (li.u.val_size != (1 + (strlen(filename2) + 1) + (strlen("/dst") + 1))) TEST_ERROR; if (H5L_TYPE_EXTERNAL != li.type) { H5_FAILED(); - HDputs(" Unexpected link class - should have been an external link"); + puts(" Unexpected link class - should have been an external link"); goto error; } @@ -11120,9 +11119,9 @@ external_link_query(hid_t fapl, bool new_format) TEST_ERROR; /* Compare the file and object names */ - if (HDstrcmp(file_name, filename2) != 0) + if (strcmp(file_name, filename2) != 0) TEST_ERROR; - if (HDstrcmp(object_name, "/dst") != 0) + if (strcmp(object_name, "/dst") != 0) TEST_ERROR; /* Query information about object that external link points to */ @@ -11130,7 +11129,7 @@ external_link_query(hid_t fapl, bool new_format) FAIL_STACK_ERROR; if (H5O_TYPE_GROUP != oi.type) { H5_FAILED(); - HDputs(" Unexpected object type - should have been a group"); + puts(" Unexpected object type - should have been a group"); goto error; } @@ -11341,7 +11340,7 @@ external_link_unlink_dense(hid_t fapl, bool new_format) /* Create enough objects in the root group to change it into a "dense" group */ for (u = 0; u < max_compact; u++) { - HDsnprintf(objname, sizeof(objname), "filler %u", u); + snprintf(objname, sizeof(objname), "filler %u", u); if ((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; if (H5Gclose(gid2) < 0) @@ -11396,7 +11395,7 @@ external_link_unlink_dense(hid_t fapl, bool new_format) /* Remove enough objects in the root group to change it into a "compact" group */ for (u = 0; u < ((max_compact - min_dense) + 1); u++) { - HDsnprintf(objname, sizeof(objname), "filler %u", u); + snprintf(objname, sizeof(objname), "filler %u", u); if (H5Ldelete(gid, objname, H5P_DEFAULT) < 0) FAIL_STACK_ERROR; } /* end for */ @@ -11519,7 +11518,7 @@ external_link_move(hid_t fapl, bool new_format) /* Check name */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) FAIL_STACK_ERROR; - if (HDstrcmp(objname, "/dst") != 0) + if (strcmp(objname, "/dst") != 0) TEST_ERROR; /* Create object in external file */ @@ -11579,7 +11578,7 @@ external_link_move(hid_t fapl, bool new_format) /* Check name */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) FAIL_STACK_ERROR; - if (HDstrcmp(objname, "/dst") != 0) + if (strcmp(objname, "/dst") != 0) TEST_ERROR; /* Create object in external file */ @@ -11626,7 +11625,7 @@ external_link_move(hid_t fapl, bool new_format) /* Check name */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) FAIL_STACK_ERROR; - if (HDstrcmp(objname, "/dst") != 0) + if (strcmp(objname, "/dst") != 0) TEST_ERROR; /* Move external link back to original location */ @@ -11636,7 +11635,7 @@ external_link_move(hid_t fapl, bool new_format) /* Check name */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) FAIL_STACK_ERROR; - if (HDstrcmp(objname, "/dst") != 0) + if (strcmp(objname, "/dst") != 0) TEST_ERROR; /* Create object in external file */ @@ -11737,7 +11736,7 @@ external_link_ride(hid_t fapl, bool new_format) /* Create enough objects in the root group to change it into a "dense" group */ for (u = 0; u < (max_compact + 1); u++) { - HDsnprintf(objname, sizeof(objname), "filler %u", u); + snprintf(objname, sizeof(objname), "filler %u", u); if ((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; if (H5Gclose(gid2) < 0) @@ -11810,7 +11809,7 @@ external_link_ride(hid_t fapl, bool new_format) /* Check name */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/dst") != 0) + if (strcmp(objname, "/dst") != 0) TEST_ERROR; /* Create object in external file */ @@ -11831,7 +11830,7 @@ external_link_ride(hid_t fapl, bool new_format) /* Remove enough objects in the root group to change it into a "compact" group */ for (u = 0; u < ((max_compact - min_dense) + 3); u++) { - HDsnprintf(objname, sizeof(objname), "filler %u", u); + snprintf(objname, sizeof(objname), "filler %u", u); if (H5Ldelete(gid, objname, H5P_DEFAULT) < 0) FAIL_STACK_ERROR; } /* end for */ @@ -11859,7 +11858,7 @@ external_link_ride(hid_t fapl, bool new_format) /* Check name */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/dst") != 0) + if (strcmp(objname, "/dst") != 0) TEST_ERROR; /* Create object in external file */ @@ -12054,7 +12053,7 @@ external_link_closing(hid_t fapl, bool new_format) FAIL_STACK_ERROR; if (H5Oget_comment_by_name(fid1, "elink/elink/elink/group1_moved", buf, sizeof(buf), H5P_DEFAULT) < 0) FAIL_STACK_ERROR; - if (HDstrcmp(buf, "comment") != 0) + if (strcmp(buf, "comment") != 0) TEST_ERROR; /* Test H5*open */ @@ -12397,7 +12396,7 @@ external_link_strong(hid_t fapl, bool new_format) FAIL_STACK_ERROR; if (H5Iget_name(gid2, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/A/B/C") != 0) + if (strcmp(objname, "/A/B/C") != 0) TEST_ERROR; if (H5Gclose(gid2) < 0) TEST_ERROR; @@ -12471,11 +12470,11 @@ external_symlink(const char *env_h5_drvr, hid_t fapl, bool new_format) /* Skip test when using VFDs that can't provide a POSIX compatible file * descriptor. */ - have_posix_compat_vfd = (bool)(!HDstrcmp(env_h5_drvr, "sec2") || !HDstrcmp(env_h5_drvr, "core") || - !HDstrcmp(env_h5_drvr, "nomatch")); + have_posix_compat_vfd = (bool)(!strcmp(env_h5_drvr, "sec2") || !strcmp(env_h5_drvr, "core") || + !strcmp(env_h5_drvr, "nomatch")); if (!have_posix_compat_vfd) { SKIPPED(); - HDputs(" Current VFD doesn't support POSIX I/O calls"); + puts(" Current VFD doesn't support POSIX I/O calls"); return SUCCEED; } @@ -12716,7 +12715,7 @@ error: #else /* H5_HAVE_SYMLINK */ SKIPPED(); - HDputs(" Current file system or operating system doesn't support symbolic links"); + puts(" Current file system or operating system doesn't support symbolic links"); return SUCCEED; #endif /* H5_HAVE_SYMLINK */ @@ -13770,7 +13769,7 @@ external_link_public_macros(hid_t fapl, bool new_format) if (H5L_TYPE_EXTERNAL != linfo.type) { H5_FAILED(); - HDputs(" Unexpected object type - should have been an external link"); + puts(" Unexpected object type - should have been an external link"); goto error; } @@ -13780,22 +13779,22 @@ external_link_public_macros(hid_t fapl, bool new_format) if (H5Lunpack_elink_val(objname, linfo.u.val_size, &flags, &file, &path) < 0) TEST_ERROR; - if (HDstrcmp(file, filename1) != 0) { + if (strcmp(file, filename1) != 0) { H5_FAILED(); - HDputs(" External link file name incorrect"); + puts(" External link file name incorrect"); goto error; } - if (HDstrcmp(path, "/") != 0) { + if (strcmp(path, "/") != 0) { H5_FAILED(); - HDputs(" External link path incorrect"); + puts(" External link path incorrect"); goto error; } /* External link version & flags */ if (flags != ((H5L_EXT_VERSION << 4) | H5L_EXT_FLAGS_ALL)) { H5_FAILED(); - HDputs(" External link version or flags are incorrect"); + puts(" External link version or flags are incorrect"); goto error; } @@ -14070,7 +14069,7 @@ ud_hard_links(hid_t fapl) /* Check name */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/group") != 0) + if (strcmp(objname, "/group") != 0) TEST_ERROR; /* Create object in group */ @@ -14090,7 +14089,7 @@ ud_hard_links(hid_t fapl) /* Check name */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/group/new_group") != 0) + if (strcmp(objname, "/group/new_group") != 0) TEST_ERROR; /* Close opened object */ @@ -14105,7 +14104,7 @@ ud_hard_links(hid_t fapl) TEST_ERROR; if (UD_HARD_TYPE != li.type) { H5_FAILED(); - HDputs(" Unexpected link class - should have been a UD hard link"); + puts(" Unexpected link class - should have been a UD hard link"); goto error; } /* end if */ @@ -14281,7 +14280,7 @@ ud_link_reregister(hid_t fapl) /* Check name */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/" REREG_TARGET_NAME) != 0) + if (strcmp(objname, "/" REREG_TARGET_NAME) != 0) TEST_ERROR; /* Create object in group */ @@ -14301,7 +14300,7 @@ ud_link_reregister(hid_t fapl) /* Check name */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/rereg_target/new_group") != 0) + if (strcmp(objname, "/rereg_target/new_group") != 0) TEST_ERROR; /* Close opened object */ @@ -14390,9 +14389,9 @@ UD_cb_create(const char *link_name, hid_t loc_group, const void *udata, size_t u if (lcpl_id < 0) TEST_ERROR; - if (HDstrcmp(link_name, UD_CB_LINK_NAME) != 0 && HDstrcmp(link_name, NEW_UD_CB_LINK_NAME) != 0) + if (strcmp(link_name, UD_CB_LINK_NAME) != 0 && strcmp(link_name, NEW_UD_CB_LINK_NAME) != 0) TEST_ERROR; - if (HDstrcmp((const char *)udata, UD_CB_TARGET) != 0) + if (strcmp((const char *)udata, UD_CB_TARGET) != 0) TEST_ERROR; if (udata_size != UD_CB_TARGET_LEN) TEST_ERROR; @@ -14417,9 +14416,9 @@ UD_cb_traverse(const char *link_name, hid_t cur_group, const void *udata, size_t if (udata_size > 0 && !udata) TEST_ERROR; - if (HDstrcmp(link_name, UD_CB_LINK_NAME) != 0 && HDstrcmp(link_name, NEW_UD_CB_LINK_NAME) != 0) + if (strcmp(link_name, UD_CB_LINK_NAME) != 0 && strcmp(link_name, NEW_UD_CB_LINK_NAME) != 0) TEST_ERROR; - if (HDstrcmp((const char *)udata, UD_CB_TARGET) != 0) + if (strcmp((const char *)udata, UD_CB_TARGET) != 0) TEST_ERROR; if (udata_size != UD_CB_TARGET_LEN) TEST_ERROR; @@ -14444,9 +14443,9 @@ UD_cb_move(const char *new_name, hid_t new_loc, const void *udata, size_t udata_ if (udata_size > 0 && !udata) TEST_ERROR; - if (HDstrcmp(new_name, NEW_UD_CB_LINK_NAME) != 0) + if (strcmp(new_name, NEW_UD_CB_LINK_NAME) != 0) TEST_ERROR; - if (HDstrcmp((const char *)udata, UD_CB_TARGET) != 0) + if (strcmp((const char *)udata, UD_CB_TARGET) != 0) TEST_ERROR; if (udata_size != UD_CB_TARGET_LEN) TEST_ERROR; @@ -14468,9 +14467,9 @@ UD_cb_delete(const char *link_name, hid_t file, const void *udata, size_t udata_ if (udata_size > 0 && !udata) TEST_ERROR; - if (HDstrcmp(link_name, UD_CB_LINK_NAME) != 0 && HDstrcmp(link_name, NEW_UD_CB_LINK_NAME) != 0) + if (strcmp(link_name, UD_CB_LINK_NAME) != 0 && strcmp(link_name, NEW_UD_CB_LINK_NAME) != 0) TEST_ERROR; - if (HDstrcmp((const char *)udata, UD_CB_TARGET) != 0) + if (strcmp((const char *)udata, UD_CB_TARGET) != 0) TEST_ERROR; if (udata_size != UD_CB_TARGET_LEN) TEST_ERROR; @@ -14490,9 +14489,9 @@ UD_cb_query(const char *link_name, const void *udata, size_t udata_size, void *b if (udata_size > 0 && !udata) TEST_ERROR; - if (HDstrcmp(link_name, UD_CB_LINK_NAME) != 0) + if (strcmp(link_name, UD_CB_LINK_NAME) != 0) TEST_ERROR; - if (HDstrcmp((const char *)udata, UD_CB_TARGET) != 0) + if (strcmp((const char *)udata, UD_CB_TARGET) != 0) TEST_ERROR; if (udata_size != UD_CB_TARGET_LEN) TEST_ERROR; @@ -14500,7 +14499,7 @@ UD_cb_query(const char *link_name, const void *udata, size_t udata_size, void *b if (buf) { if (buf_size < 16) TEST_ERROR; - HDstrcpy((char *)buf, "query succeeded"); + strcpy((char *)buf, "query succeeded"); } /* end if */ /* There are 15 characters and a NULL in "query succeeded" */ @@ -14582,14 +14581,14 @@ ud_callbacks(hid_t fapl, bool new_format) TEST_ERROR; if (UD_CB_TYPE != li.type) { H5_FAILED(); - HDputs(" Unexpected link class - should have been a UD hard link"); + puts(" Unexpected link class - should have been a UD hard link"); goto error; } /* Fill the query buffer */ if (H5Lget_val(fid, UD_CB_LINK_NAME, query_buf, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) FAIL_STACK_ERROR; - if (HDstrcmp(query_buf, "query succeeded") != 0) + if (strcmp(query_buf, "query succeeded") != 0) TEST_ERROR; /* Move the link */ @@ -14767,7 +14766,7 @@ lapl_udata(hid_t fapl, bool new_format) /* Create a non-default lapl with a new property pointing to group a*/ if ((plist_id = H5Pcreate(H5P_LINK_ACCESS)) < 0) TEST_ERROR; - HDstrcpy(group_a_name, "group_a"); + strcpy(group_a_name, "group_a"); if (H5Pinsert2(plist_id, DEST_PROP_NAME, (size_t)NAME_BUF_SIZE, group_a_name, NULL, NULL, NULL, NULL, NULL, NULL) < 0) TEST_ERROR; @@ -14789,7 +14788,7 @@ lapl_udata(hid_t fapl, bool new_format) TEST_ERROR; /* Now use the same ud link to access group_b */ - HDstrcpy(group_b_name, "group_b"); + strcpy(group_b_name, "group_b"); if (H5Pset(plist_id, DEST_PROP_NAME, group_b_name) < 0) TEST_ERROR; @@ -14945,7 +14944,7 @@ UD_cbsucc_query(const char H5_ATTR_UNUSED *link_name, const void H5_ATTR_UNUSED */ if (buf != NULL && buf_size >= 8) - HDstrcpy((char *)buf, "succeed"); + strcpy((char *)buf, "succeed"); return 8; } /* end UD_cbsucc_query() */ @@ -15103,8 +15102,8 @@ ud_link_errors(hid_t fapl, bool new_format) H5E_END_TRY /* Create a user-defined link to the group. */ - HDstrcpy(group_name, "/group"); - if (H5Lcreate_ud(fid, "/ud_link", (H5L_type_t)UD_CBFAIL_TYPE, &group_name, HDstrlen(group_name) + 1, + strcpy(group_name, "/group"); + if (H5Lcreate_ud(fid, "/ud_link", (H5L_type_t)UD_CBFAIL_TYPE, &group_name, strlen(group_name) + 1, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR; @@ -15182,7 +15181,7 @@ ud_link_errors(hid_t fapl, bool new_format) TEST_ERROR; if (H5Lget_val(fid, "ud_link", query_buf, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) FAIL_STACK_ERROR; - if (HDstrcmp(query_buf, "succeed") != 0) + if (strcmp(query_buf, "succeed") != 0) TEST_ERROR; /* Moving and copying should both succeed */ @@ -15324,7 +15323,7 @@ lapl_nlinks(hid_t fapl, bool new_format) /* Check name */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/soft17") != 0) + if (strcmp(objname, "/soft17") != 0) TEST_ERROR; /* Create group using soft link */ @@ -15357,7 +15356,7 @@ lapl_nlinks(hid_t fapl, bool new_format) H5E_END_TRY if (gid >= 0) { H5_FAILED(); - HDputs(" Should have failed for sequence of too many nested links."); + puts(" Should have failed for sequence of too many nested links."); goto error; } @@ -15368,7 +15367,7 @@ lapl_nlinks(hid_t fapl, bool new_format) /* Check name */ if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0) TEST_ERROR; - if (HDstrcmp(objname, "/soft4") != 0) + if (strcmp(objname, "/soft4") != 0) TEST_ERROR; /* Test other functions that should use a LAPL */ @@ -15828,7 +15827,7 @@ visit_link_cb(hid_t H5_ATTR_UNUSED group_id, const char *name, const H5L_info2_t lvisit_ud_t *op_data = (lvisit_ud_t *)_op_data; /* Check for correct link information */ - if (HDstrcmp(op_data->info[op_data->idx].path, name) != 0) + if (strcmp(op_data->info[op_data->idx].path, name) != 0) return (H5_ITER_ERROR); if (op_data->info[op_data->idx].type != linfo->type) return (H5_ITER_ERROR); @@ -16019,7 +16018,7 @@ visit_obj_cb(hid_t H5_ATTR_UNUSED group_id, const char *name, const H5O_info2_t ovisit_ud_t *op_data = (ovisit_ud_t *)_op_data; /* Check for correct object information */ - if (HDstrcmp(op_data->info[op_data->idx].path, name) != 0) + if (strcmp(op_data->info[op_data->idx].path, name) != 0) return (H5_ITER_ERROR); if (op_data->info[op_data->idx].type != oinfo->type) return (H5_ITER_ERROR); @@ -16556,13 +16555,13 @@ link_filters(hid_t fapl, bool new_format) if (H5Pget_filter_by_id2(gcpl2, H5Z_FILTER_RESERVED + 42, &flags_out, &cd_nelmts, &cd_value_out, (size_t)24, name_out, &filter_config_out) < 0) TEST_ERROR; - if (flags_out != 0 || cd_value_out != cd_value || HDstrcmp(filter_class.name, name_out) != 0 || + if (flags_out != 0 || cd_value_out != cd_value || strcmp(filter_class.name, name_out) != 0 || filter_config_out != (H5Z_FILTER_CONFIG_ENCODE_ENABLED | H5Z_FILTER_CONFIG_DECODE_ENABLED)) TEST_ERROR; if (H5Pget_filter2(gcpl2, (unsigned)(nfilters - 1), &flags_out, &cd_nelmts, &cd_value_out, (size_t)24, name_out, &filter_config_out) < 0) TEST_ERROR; - if (flags_out != 0 || cd_value_out != cd_value || HDstrcmp(filter_class.name, name_out) != 0 || + if (flags_out != 0 || cd_value_out != cd_value || strcmp(filter_class.name, name_out) != 0 || filter_config_out != (H5Z_FILTER_CONFIG_ENCODE_ENABLED | H5Z_FILTER_CONFIG_DECODE_ENABLED)) TEST_ERROR; @@ -16573,7 +16572,7 @@ link_filters(hid_t fapl, bool new_format) if (H5Pget_filter_by_id2(gcpl2, H5Z_FILTER_RESERVED + 42, &flags_out, &cd_nelmts, &cd_value_out, (size_t)24, name_out, &filter_config_out) < 0) TEST_ERROR; - if (flags_out != 0 || cd_value_out != cd_value || HDstrcmp(filter_class.name, name_out) != 0 || + if (flags_out != 0 || cd_value_out != cd_value || strcmp(filter_class.name, name_out) != 0 || filter_config_out != (H5Z_FILTER_CONFIG_ENCODE_ENABLED | H5Z_FILTER_CONFIG_DECODE_ENABLED)) TEST_ERROR; @@ -17142,7 +17141,7 @@ corder_create_empty(hid_t fapl) H5E_END_TRY if (ret > 0) { H5_FAILED(); - HDputs( + puts( " H5Pset_link_create_order() should have failed for a creation order index with no tracking."); TEST_ERROR; } /* end if */ @@ -17283,7 +17282,7 @@ corder_create_compact(hid_t fapl) /* Create several links, but keep group in compact form */ for (u = 0; u < max_compact; u++) { - HDsnprintf(objname, sizeof(objname), "filler %u", u); + snprintf(objname, sizeof(objname), "filler %u", u); if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; if (H5Gclose(group_id2) < 0) @@ -17336,7 +17335,7 @@ corder_create_compact(hid_t fapl) H5L_info2_t linfo; /* Link information */ /* Retrieve information for link */ - HDsnprintf(objname, sizeof(objname), "filler %u", u); + snprintf(objname, sizeof(objname), "filler %u", u); if (H5Lget_info2(group_id, objname, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -17427,7 +17426,7 @@ corder_create_dense(hid_t fapl) /* Create several links, up to limit of compact form */ for (u = 0; u < max_compact; u++) { - HDsnprintf(objname, sizeof(objname), "filler %u", u); + snprintf(objname, sizeof(objname), "filler %u", u); if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; if (H5Gclose(group_id2) < 0) @@ -17445,7 +17444,7 @@ corder_create_dense(hid_t fapl) } /* end for */ /* Create another link, to push group into dense form */ - HDsnprintf(objname, sizeof(objname), "filler %u", max_compact); + snprintf(objname, sizeof(objname), "filler %u", max_compact); if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; if (H5Gclose(group_id2) < 0) @@ -17499,7 +17498,7 @@ corder_create_dense(hid_t fapl) H5L_info2_t linfo; /* Link information */ /* Retrieve information for link */ - HDsnprintf(objname, sizeof(objname), "filler %u", u); + snprintf(objname, sizeof(objname), "filler %u", u); if (H5Lget_info2(group_id, objname, &linfo, H5P_DEFAULT) < 0) TEST_ERROR; @@ -17614,7 +17613,7 @@ corder_transition(hid_t fapl) /* Create several links, up to limit of compact form */ for (u = 0; u < max_compact; u++) { - HDsnprintf(objname, sizeof(objname), "filler %u", u); + snprintf(objname, sizeof(objname), "filler %u", u); if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; if (H5Gclose(group_id2) < 0) @@ -17622,7 +17621,7 @@ corder_transition(hid_t fapl) } /* end for */ /* Create another link, to push group into dense form */ - HDsnprintf(objname, sizeof(objname), "filler %u", max_compact); + snprintf(objname, sizeof(objname), "filler %u", max_compact); if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; if (H5Gclose(group_id2) < 0) @@ -17644,7 +17643,7 @@ corder_transition(hid_t fapl) /* Delete several links from group, until it resumes compact form */ for (u = max_compact; u >= min_dense; u--) { - HDsnprintf(objname, sizeof(objname), "filler %u", u); + snprintf(objname, sizeof(objname), "filler %u", u); if (H5Ldelete(group_id, objname, H5P_DEFAULT) < 0) TEST_ERROR; @@ -17664,7 +17663,7 @@ corder_transition(hid_t fapl) } /* end for */ /* Delete another link, to push group into compact form */ - HDsnprintf(objname, sizeof(objname), "filler %u", (min_dense - 1)); + snprintf(objname, sizeof(objname), "filler %u", (min_dense - 1)); if (H5Ldelete(group_id, objname, H5P_DEFAULT) < 0) TEST_ERROR; @@ -17680,7 +17679,7 @@ corder_transition(hid_t fapl) /* Re-add links to get back into dense form */ for (u = (min_dense - 1); u < (max_compact + 1); u++) { - HDsnprintf(objname, sizeof(objname), "filler %u", u); + snprintf(objname, sizeof(objname), "filler %u", u); if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; if (H5Gclose(group_id2) < 0) @@ -17733,7 +17732,7 @@ corder_transition(hid_t fapl) /* Delete several links from group, until it resumes compact form */ for (u = max_compact; u >= min_dense; u--) { - HDsnprintf(objname, sizeof(objname), "filler %u", u); + snprintf(objname, sizeof(objname), "filler %u", u); if (H5Ldelete(group_id, objname, H5P_DEFAULT) < 0) TEST_ERROR; @@ -17753,7 +17752,7 @@ corder_transition(hid_t fapl) } /* end for */ /* Delete another link, to push group into compact form */ - HDsnprintf(objname, sizeof(objname), "filler %u", (min_dense - 1)); + snprintf(objname, sizeof(objname), "filler %u", (min_dense - 1)); if (H5Ldelete(group_id, objname, H5P_DEFAULT) < 0) TEST_ERROR; @@ -17769,7 +17768,7 @@ corder_transition(hid_t fapl) /* Re-add links to get back into dense form */ for (u = (min_dense - 1); u < (max_compact + 1); u++) { - HDsnprintf(objname, sizeof(objname), "filler %u", u); + snprintf(objname, sizeof(objname), "filler %u", u); if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; if (H5Gclose(group_id2) < 0) @@ -17792,11 +17791,11 @@ corder_transition(hid_t fapl) /* Delete all the links */ for (u = max_compact; u > 0; u--) { - HDsnprintf(objname, sizeof(objname), "filler %u", u); + snprintf(objname, sizeof(objname), "filler %u", u); if (H5Ldelete(group_id, objname, H5P_DEFAULT) < 0) TEST_ERROR; } /* end for */ - HDsnprintf(objname, sizeof(objname), "filler %u", (unsigned)0); + snprintf(objname, sizeof(objname), "filler %u", (unsigned)0); if (H5Ldelete(group_id, objname, H5P_DEFAULT) < 0) TEST_ERROR; @@ -17908,7 +17907,7 @@ corder_delete(hid_t fapl) /* Create links until the group is in dense form */ for (u = 0; u < max_compact * 2; u++) { - HDsnprintf(objname, sizeof(objname), "filler %u", u); + snprintf(objname, sizeof(objname), "filler %u", u); if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR; if (H5Gclose(group_id2) < 0) @@ -18001,7 +18000,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, bool har H5L_info2_t linfo; /* Link info struct */ /* Make link value for increasing/native order queries */ - HDsnprintf(valname, sizeof(valname), "value %02u", (unsigned)n); + snprintf(valname, sizeof(valname), "value %02u", (unsigned)n); /* Verify the link information for first link, in increasing creation order */ memset(&linfo, 0, sizeof(linfo)); @@ -18024,7 +18023,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, bool har 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; - if (HDstrcmp(valname, tmpval) != 0) + if (strcmp(valname, tmpval) != 0) TEST_ERROR; } /* end if */ @@ -18033,7 +18032,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, bool har 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; - if (HDstrcmp(linkname, tmpname) != 0) + if (strcmp(linkname, tmpname) != 0) TEST_ERROR; /* Don't test "native" order if there is no creation order index, since @@ -18063,7 +18062,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, bool har 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; - if (HDstrcmp(valname, tmpval) != 0) + if (strcmp(valname, tmpval) != 0) TEST_ERROR; } /* end if */ @@ -18072,7 +18071,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, bool har 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; - if (HDstrcmp(linkname, tmpname) != 0) + if (strcmp(linkname, tmpname) != 0) TEST_ERROR; } /* end if */ @@ -18097,7 +18096,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, bool har 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; - if (HDstrcmp(valname, tmpval) != 0) + if (strcmp(valname, tmpval) != 0) TEST_ERROR; } /* end if */ @@ -18106,7 +18105,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, bool har 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; - if (HDstrcmp(linkname, tmpname) != 0) + if (strcmp(linkname, tmpname) != 0) TEST_ERROR; /* Verify the link information for first link, in increasing link name order */ @@ -18129,7 +18128,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, bool har 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; - if (HDstrcmp(valname, tmpval) != 0) + if (strcmp(valname, tmpval) != 0) TEST_ERROR; } /* end if */ @@ -18138,7 +18137,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, bool har 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; - if (HDstrcmp(linkname, tmpname) != 0) + if (strcmp(linkname, tmpname) != 0) TEST_ERROR; /* Don't test "native" order queries on link name order, since there's not @@ -18165,7 +18164,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, bool har 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; - if (HDstrcmp(valname, tmpval) != 0) + if (strcmp(valname, tmpval) != 0) TEST_ERROR; } /* end if */ @@ -18174,7 +18173,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, bool har 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; - if (HDstrcmp(linkname, tmpname) != 0) + if (strcmp(linkname, tmpname) != 0) TEST_ERROR; /* Success */ @@ -18274,7 +18273,7 @@ link_info_by_idx(hid_t fapl) /* Create several links, up to limit of compact form */ for (u = 0; u < max_compact; u++) { /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Check for creating hard or soft link */ if (hard_link) { @@ -18289,7 +18288,7 @@ link_info_by_idx(hid_t fapl) } /* end if */ else { /* Make value for link */ - HDsnprintf(valname, sizeof(valname), "value %02u", u); + snprintf(valname, sizeof(valname), "value %02u", u); /* Create soft link */ if (H5Lcreate_soft(valname, group_id, objname, H5P_DEFAULT, H5P_DEFAULT) < 0) @@ -18334,7 +18333,7 @@ link_info_by_idx(hid_t fapl) /* Create more links, to push group into dense form */ for (; u < (max_compact * 2); u++) { /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Check for creating hard or soft link */ if (hard_link) { @@ -18349,7 +18348,7 @@ link_info_by_idx(hid_t fapl) } /* end if */ else { /* Make value for link */ - HDsnprintf(valname, sizeof(valname), "value %02u", u); + snprintf(valname, sizeof(valname), "value %02u", u); /* Create soft link */ if (H5Lcreate_soft(valname, group_id, objname, H5P_DEFAULT, H5P_DEFAULT) < 0) @@ -18477,7 +18476,7 @@ link_info_by_idx_old(hid_t fapl) /* Create several links */ for (u = 0; u < CORDER_NLINKS; u++) { /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Check for creating hard or soft link */ if (hard_link) { @@ -18499,7 +18498,7 @@ link_info_by_idx_old(hid_t fapl) } /* end if */ else { /* Make value for link */ - HDsnprintf(valname, sizeof(valname), "value %02u", u); + snprintf(valname, sizeof(valname), "value %02u", u); /* Create soft link */ if (H5Lcreate_soft(valname, group_id, objname, H5P_DEFAULT, H5P_DEFAULT) < 0) @@ -18512,10 +18511,10 @@ link_info_by_idx_old(hid_t fapl) unsigned dec_u = CORDER_NLINKS - (u + 1); /* Decreasing mapped index */ /* Make link name for increasing/native order queries */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Make link value for increasing/native order queries */ - HDsnprintf(valname, sizeof(valname), "value %02u", u); + snprintf(valname, sizeof(valname), "value %02u", u); /* Verify link information (in increasing order) */ if (hard_link) { @@ -18531,7 +18530,7 @@ link_info_by_idx_old(hid_t fapl) if (H5Lget_val_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)u, tmpval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; - if (HDstrcmp(valname, tmpval) != 0) + if (strcmp(valname, tmpval) != 0) TEST_ERROR; } /* end else */ @@ -18539,7 +18538,7 @@ link_info_by_idx_old(hid_t fapl) if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; - if (HDstrcmp(objname, tmpname) != 0) + if (strcmp(objname, tmpname) != 0) TEST_ERROR; /* Verify link information (in native order - native is increasing) */ @@ -18556,7 +18555,7 @@ link_info_by_idx_old(hid_t fapl) if (H5Lget_val_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_NATIVE, (hsize_t)u, tmpval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; - if (HDstrcmp(valname, tmpval) != 0) + if (strcmp(valname, tmpval) != 0) TEST_ERROR; } /* end else */ @@ -18564,14 +18563,14 @@ link_info_by_idx_old(hid_t fapl) if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_NATIVE, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; - if (HDstrcmp(objname, tmpname) != 0) + if (strcmp(objname, tmpname) != 0) TEST_ERROR; /* Make link name for decreasing order queries */ - HDsnprintf(objname, sizeof(objname), "filler %02u", dec_u); + snprintf(objname, sizeof(objname), "filler %02u", dec_u); /* Make link value for decreasing order queries */ - HDsnprintf(valname, sizeof(valname), "value %02u", dec_u); + snprintf(valname, sizeof(valname), "value %02u", dec_u); /* Verify link information (in decreasing order) */ if (hard_link) { @@ -18587,7 +18586,7 @@ link_info_by_idx_old(hid_t fapl) if (H5Lget_val_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, (hsize_t)u, tmpval, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; - if (HDstrcmp(valname, tmpval) != 0) + if (strcmp(valname, tmpval) != 0) TEST_ERROR; } /* end else */ @@ -18595,7 +18594,7 @@ link_info_by_idx_old(hid_t fapl) if (H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, (hsize_t)u, tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; - if (HDstrcmp(objname, tmpname) != 0) + if (strcmp(objname, tmpname) != 0) TEST_ERROR; } /* end for */ @@ -18765,7 +18764,7 @@ delete_by_idx(hid_t fapl) hid_t group_id2; /* Group ID */ /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Create hard link, with group object */ if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < @@ -18818,10 +18817,10 @@ delete_by_idx(hid_t fapl) (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; if (order == H5_ITER_INC) - HDsnprintf(objname, sizeof(objname), "filler %02u", (u + 1)); + snprintf(objname, sizeof(objname), "filler %02u", (u + 1)); else - HDsnprintf(objname, sizeof(objname), "filler %02u", (max_compact - (u + 2))); - if (HDstrcmp(objname, tmpname) != 0) + snprintf(objname, sizeof(objname), "filler %02u", (max_compact - (u + 2))); + if (strcmp(objname, tmpname) != 0) TEST_ERROR; } /* end for */ @@ -18838,7 +18837,7 @@ delete_by_idx(hid_t fapl) hid_t group_id2; /* Group ID */ /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Create hard link, with group object */ if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < @@ -18892,10 +18891,10 @@ delete_by_idx(hid_t fapl) (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; if (order == H5_ITER_INC) - HDsnprintf(objname, sizeof(objname), "filler %02u", (u + 1)); + snprintf(objname, sizeof(objname), "filler %02u", (u + 1)); else - HDsnprintf(objname, sizeof(objname), "filler %02u", ((max_compact * 2) - (u + 2))); - if (HDstrcmp(objname, tmpname) != 0) + snprintf(objname, sizeof(objname), "filler %02u", ((max_compact * 2) - (u + 2))); + if (strcmp(objname, tmpname) != 0) TEST_ERROR; } /* end for */ @@ -18925,7 +18924,7 @@ delete_by_idx(hid_t fapl) hid_t group_id2; /* Group ID */ /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Create hard link, with group object */ if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < @@ -18970,11 +18969,11 @@ delete_by_idx(hid_t fapl) (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; if (order == H5_ITER_INC) - HDsnprintf(objname, sizeof(objname), "filler %02u", ((u * 2) + 1)); + snprintf(objname, sizeof(objname), "filler %02u", ((u * 2) + 1)); else - HDsnprintf(objname, sizeof(objname), "filler %02u", - ((max_compact * 2) - ((u * 2) + 2))); - if (HDstrcmp(objname, tmpname) != 0) + snprintf(objname, sizeof(objname), "filler %02u", + ((max_compact * 2) - ((u * 2) + 2))); + if (strcmp(objname, tmpname) != 0) TEST_ERROR; } /* end for */ @@ -19004,11 +19003,11 @@ delete_by_idx(hid_t fapl) (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; if (order == H5_ITER_INC) - HDsnprintf(objname, sizeof(objname), "filler %02u", ((u * 2) + 3)); + snprintf(objname, sizeof(objname), "filler %02u", ((u * 2) + 3)); else - HDsnprintf(objname, sizeof(objname), "filler %02u", - ((max_compact * 2) - ((u * 2) + 4))); - if (HDstrcmp(objname, tmpname) != 0) + snprintf(objname, sizeof(objname), "filler %02u", + ((max_compact * 2) - ((u * 2) + 4))); + if (strcmp(objname, tmpname) != 0) TEST_ERROR; } /* end for */ @@ -19120,7 +19119,7 @@ delete_by_idx_old(hid_t fapl) H5O_info2_t oi; /* Buffer for querying object's info */ /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Create group */ if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) @@ -19186,10 +19185,10 @@ delete_by_idx_old(hid_t fapl) (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; if (order == H5_ITER_INC) - HDsnprintf(objname, sizeof(objname), "filler %02u", (u + 1)); + snprintf(objname, sizeof(objname), "filler %02u", (u + 1)); else - HDsnprintf(objname, sizeof(objname), "filler %02u", dec_u); - if (HDstrcmp(objname, tmpname) != 0) + snprintf(objname, sizeof(objname), "filler %02u", dec_u); + if (strcmp(objname, tmpname) != 0) TEST_ERROR; } /* end for */ @@ -19217,7 +19216,7 @@ delete_by_idx_old(hid_t fapl) H5O_info2_t oi; /* Buffer for querying object's info */ /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Create group */ if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) @@ -19265,10 +19264,10 @@ delete_by_idx_old(hid_t fapl) (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; if (order == H5_ITER_INC) - HDsnprintf(objname, sizeof(objname), "filler %02u", ((u * 2) + 1)); + snprintf(objname, sizeof(objname), "filler %02u", ((u * 2) + 1)); else - HDsnprintf(objname, sizeof(objname), "filler %02u", dec_u); - if (HDstrcmp(objname, tmpname) != 0) + snprintf(objname, sizeof(objname), "filler %02u", dec_u); + if (strcmp(objname, tmpname) != 0) TEST_ERROR; } /* end for */ @@ -19303,10 +19302,10 @@ delete_by_idx_old(hid_t fapl) (size_t)NAME_BUF_SIZE, H5P_DEFAULT) < 0) TEST_ERROR; if (order == H5_ITER_INC) - HDsnprintf(objname, sizeof(objname), "filler %02u", ((u * 2) + 3)); + snprintf(objname, sizeof(objname), "filler %02u", ((u * 2) + 3)); else - HDsnprintf(objname, sizeof(objname), "filler %02u", dec_u); - if (HDstrcmp(objname, tmpname) != 0) + snprintf(objname, sizeof(objname), "filler %02u", dec_u); + if (strcmp(objname, tmpname) != 0) TEST_ERROR; } /* end for */ @@ -19391,8 +19390,8 @@ link_iterate_cb(hid_t group_id, const char *link_name, const H5L_info2_t *info, } /* end if */ /* Verify name of link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", (unsigned)my_info.corder); - if (HDstrcmp(link_name, objname) != 0) + snprintf(objname, sizeof(objname), "filler %02u", (unsigned)my_info.corder); + if (strcmp(link_name, objname) != 0) return H5_ITER_ERROR; /* Check if we've visited this link before */ @@ -19759,7 +19758,7 @@ link_iterate(hid_t fapl) hid_t group_id2; /* Group ID */ /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Create hard link, with group object */ if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < @@ -19792,7 +19791,7 @@ link_iterate(hid_t fapl) hid_t group_id2; /* Group ID */ /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Create hard link, with group object */ if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < @@ -19902,9 +19901,9 @@ link_iterate_old_cb(hid_t group_id, const char *link_name, const H5L_info2_t *in } /* end if */ /* Verify name of link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", - (info ? (unsigned)op_data->curr : (unsigned)((op_data->ncalled - 1) + op_data->nskipped))); - if (HDstrcmp(link_name, objname) != 0) + snprintf(objname, sizeof(objname), "filler %02u", + (info ? (unsigned)op_data->curr : (unsigned)((op_data->ncalled - 1) + op_data->nskipped))); + if (strcmp(link_name, objname) != 0) return H5_ITER_ERROR; /* Check if we've visited this link before */ @@ -20203,7 +20202,7 @@ link_iterate_old(hid_t fapl) hid_t group_id2; /* Group ID */ /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Create hard link, with group object */ if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) @@ -20347,7 +20346,7 @@ open_by_idx_check(hid_t main_group_id, hid_t soft_group_id, hid_t mount_file_id, /* Mount a file over a group in main group */ mnt_idx = 2; - HDsnprintf(mntname, sizeof(mntname), "/%s/filler %02u", CORDER_GROUP_NAME, mnt_idx); + snprintf(mntname, sizeof(mntname), "/%s/filler %02u", CORDER_GROUP_NAME, mnt_idx); if (H5Fmount(main_group_id, mntname, mount_file_id, H5P_DEFAULT) < 0) TEST_ERROR; @@ -20524,7 +20523,7 @@ open_by_idx(hid_t fapl) hid_t group_id2; /* Group ID */ /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Create hard link, with group object */ if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < @@ -20541,7 +20540,7 @@ open_by_idx(hid_t fapl) TEST_ERROR; /* Create soft link in another group, to objects in main group */ - HDsnprintf(valname, sizeof(valname), "/%s/%s", CORDER_GROUP_NAME, objname); + snprintf(valname, sizeof(valname), "/%s/%s", CORDER_GROUP_NAME, objname); if (H5Lcreate_soft(valname, soft_group_id, objname, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR; } @@ -20568,7 +20567,7 @@ open_by_idx(hid_t fapl) hid_t group_id2; /* Group ID */ /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Create hard link, with group object */ if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < @@ -20585,7 +20584,7 @@ open_by_idx(hid_t fapl) TEST_ERROR; /* Create soft link in another group, to objects in main group */ - HDsnprintf(valname, sizeof(valname), "/%s/%s", CORDER_GROUP_NAME, objname); + snprintf(valname, sizeof(valname), "/%s/%s", CORDER_GROUP_NAME, objname); if (H5Lcreate_soft(valname, soft_group_id, objname, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR; } /* end for */ @@ -20728,7 +20727,7 @@ open_by_idx_check_old(hid_t main_group_id, hid_t soft_group_id, hid_t mount_file /* Mount a file over a group in main group */ mnt_idx = 2; - HDsnprintf(mntname, sizeof(mntname), "/%s/filler %02u", CORDER_GROUP_NAME, mnt_idx); + snprintf(mntname, sizeof(mntname), "/%s/filler %02u", CORDER_GROUP_NAME, mnt_idx); if (H5Fmount(main_group_id, mntname, mount_file_id, H5P_DEFAULT) < 0) TEST_ERROR; @@ -20839,7 +20838,7 @@ open_by_idx_old(hid_t fapl) hid_t group_id2; /* Group ID */ /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Create hard link, with group object */ if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) @@ -20855,7 +20854,7 @@ open_by_idx_old(hid_t fapl) TEST_ERROR; /* Create soft link in another group, to objects in main group */ - HDsnprintf(valname, sizeof(valname), "/%s/%s", CORDER_GROUP_NAME, objname); + snprintf(valname, sizeof(valname), "/%s/%s", CORDER_GROUP_NAME, objname); if (H5Lcreate_soft(valname, soft_group_id, objname, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR; } /* end for */ @@ -20949,7 +20948,7 @@ object_info_check(hid_t main_group_id, hid_t soft_group_id, H5_index_t idx_type, /* Open each object in group by name and check that it's the correct one */ for (u = 0; u < max_links; u++) { /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Query the object's information, by name */ if (H5Oget_info_by_name3(group_id, objname, &oinfo, H5O_INFO_BASIC | H5O_INFO_NUM_ATTRS, @@ -21148,7 +21147,7 @@ object_info(hid_t fapl) hid_t attr_id; /* Attribute ID */ /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Create hard link, with group object */ if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < @@ -21163,7 +21162,7 @@ object_info(hid_t fapl) /* Create attributes on new object */ for (v = 0; v < u; v++) { /* Make name for attribute */ - HDsnprintf(attrname, sizeof(attrname), "attr %02u", v); + snprintf(attrname, sizeof(attrname), "attr %02u", v); /* Create attribute */ if ((attr_id = H5Acreate2(group_id2, attrname, H5T_NATIVE_INT, space_id, H5P_DEFAULT, @@ -21180,7 +21179,7 @@ object_info(hid_t fapl) TEST_ERROR; /* Create soft link in another group, to objects in main group */ - HDsnprintf(valname, sizeof(valname), "/%s/%s", CORDER_GROUP_NAME, objname); + snprintf(valname, sizeof(valname), "/%s/%s", CORDER_GROUP_NAME, objname); if (H5Lcreate_soft(valname, soft_group_id, objname, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR; } /* end for */ @@ -21209,7 +21208,7 @@ object_info(hid_t fapl) hid_t attr_id; /* Attribute ID */ /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Create hard link, with group object */ if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < @@ -21224,7 +21223,7 @@ object_info(hid_t fapl) /* Create attributes on new object */ for (v = 0; v < u; v++) { /* Make name for attribute */ - HDsnprintf(attrname, sizeof(attrname), "attr %02u", v); + snprintf(attrname, sizeof(attrname), "attr %02u", v); /* Create attribute */ if ((attr_id = H5Acreate2(group_id2, attrname, H5T_NATIVE_INT, space_id, H5P_DEFAULT, @@ -21241,7 +21240,7 @@ object_info(hid_t fapl) TEST_ERROR; /* Create soft link in another group, to objects in main group */ - HDsnprintf(valname, sizeof(valname), "/%s/%s", CORDER_GROUP_NAME, objname); + snprintf(valname, sizeof(valname), "/%s/%s", CORDER_GROUP_NAME, objname); if (H5Lcreate_soft(valname, soft_group_id, objname, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR; } /* end for */ @@ -21338,7 +21337,7 @@ object_info_check_old(hid_t main_group_id, hid_t soft_group_id, H5_index_t idx_t int cmp_value; /* Token comparison value */ /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Query the object's information, by name */ if (H5Oget_info_by_name3(group_id, objname, &oinfo, H5O_INFO_BASIC | H5O_INFO_NUM_ATTRS, @@ -21466,7 +21465,7 @@ object_info_old(hid_t fapl) hid_t attr_id; /* Attribute ID */ /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Create hard link, with group object */ if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) @@ -21480,7 +21479,7 @@ object_info_old(hid_t fapl) /* Create attributes on new object */ for (v = 0; v < u; v++) { /* Make name for attribute */ - HDsnprintf(attrname, sizeof(attrname), "attr %02u", v); + snprintf(attrname, sizeof(attrname), "attr %02u", v); /* Create attribute */ if ((attr_id = H5Acreate2(group_id2, attrname, H5T_NATIVE_INT, space_id, H5P_DEFAULT, @@ -21497,7 +21496,7 @@ object_info_old(hid_t fapl) TEST_ERROR; /* Create soft link in another group, to objects in main group */ - HDsnprintf(valname, sizeof(valname), "/%s/%s", CORDER_GROUP_NAME, objname); + snprintf(valname, sizeof(valname), "/%s/%s", CORDER_GROUP_NAME, objname); if (H5Lcreate_soft(valname, soft_group_id, objname, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR; } /* end for */ @@ -21698,7 +21697,7 @@ group_info(hid_t fapl) hid_t group_id2, group_id3; /* Group IDs */ /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Create hard link, with group object */ if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) @@ -21743,7 +21742,7 @@ group_info(hid_t fapl) /* Create objects in new group created */ for (v = 0; v <= u; v++) { /* Make name for link */ - HDsnprintf(objname2, sizeof(objname2), "filler %02u", v); + snprintf(objname2, sizeof(objname2), "filler %02u", v); /* Create hard link, with group object */ if ((group_id3 = @@ -21854,7 +21853,7 @@ group_info(hid_t fapl) TEST_ERROR; /* Create soft link in another group, to objects in main group */ - HDsnprintf(valname, sizeof(valname), "/%s/%s", CORDER_GROUP_NAME, objname); + snprintf(valname, sizeof(valname), "/%s/%s", CORDER_GROUP_NAME, objname); if (H5Lcreate_soft(valname, soft_group_id, objname, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR; @@ -21890,7 +21889,7 @@ group_info(hid_t fapl) hid_t group_id2, group_id3; /* Group IDs */ /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Create hard link, with group object */ if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) @@ -21935,7 +21934,7 @@ group_info(hid_t fapl) /* Create objects in new group created */ for (v = 0; v <= u; v++) { /* Make name for link */ - HDsnprintf(objname2, sizeof(objname2), "filler %02u", v); + snprintf(objname2, sizeof(objname2), "filler %02u", v); /* Create hard link, with group object */ if ((group_id3 = @@ -22046,7 +22045,7 @@ group_info(hid_t fapl) TEST_ERROR; /* Create soft link in another group, to objects in main group */ - HDsnprintf(valname, sizeof(valname), "/%s/%s", CORDER_GROUP_NAME, objname); + snprintf(valname, sizeof(valname), "/%s/%s", CORDER_GROUP_NAME, objname); if (H5Lcreate_soft(valname, soft_group_id, objname, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR; @@ -22178,7 +22177,7 @@ group_info_old(hid_t fapl) hid_t group_id2, group_id3; /* Group IDs */ /* Make name for link */ - HDsnprintf(objname, sizeof(objname), "filler %02u", u); + snprintf(objname, sizeof(objname), "filler %02u", u); /* Create hard link, with group object */ if ((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) @@ -22223,7 +22222,7 @@ group_info_old(hid_t fapl) /* Create objects in new group created */ for (v = 0; v <= u; v++) { /* Make name for link */ - HDsnprintf(objname2, sizeof(objname2), "filler %02u", v); + snprintf(objname2, sizeof(objname2), "filler %02u", v); /* Create hard link, with group object */ if ((group_id3 = H5Gcreate2(group_id2, objname2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) @@ -22333,7 +22332,7 @@ group_info_old(hid_t fapl) TEST_ERROR; /* Create soft link in another group, to objects in main group */ - HDsnprintf(valname, sizeof(valname), "/%s/%s", CORDER_GROUP_NAME, objname); + snprintf(valname, sizeof(valname), "/%s/%s", CORDER_GROUP_NAME, objname); if (H5Lcreate_soft(valname, soft_group_id, objname, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR; @@ -22727,7 +22726,7 @@ main(void) #endif /* H5_NO_DEPRECATED_SYMBOLS */ /* Skip external link tests for splitter VFD, which has external link-related bugs */ - if (HDstrcmp(env_h5_drvr, "splitter")) { + if (strcmp(env_h5_drvr, "splitter")) { /* tests for external link */ /* Test external file cache first, so it sees the default efc setting on the fapl @@ -22954,6 +22953,6 @@ main(void) exit(EXIT_SUCCESS); error: - HDputs("*** TESTS FAILED ***"); + puts("*** TESTS FAILED ***"); exit(EXIT_FAILURE); } /* end main() */ |