Strip HD prefix from string/char C API calls (#3540)

* Strip HD prefix from string/char C API calls

* HD(f)(put|get)(s|c)
* HDstr*
* HDv*printf
* HD(s)(print|scan)f
* HDperror

But NOT:

* HDstrcase*
* HDvasprintf
* HDstrtok_r
* HDstrndup

As those are not C99 and have portability work-around
implementations. They will be handled later.

* Fix th5_system.c screwup

1 files changed, 45 insertions, 45 deletions

diff --git a/test/unlink.c b/test/unlink.c
index 4c4b9cf..ae8da98 100644
--- a/test/unlink.c
+++ b/test/unlink.c
@@ -165,12 +165,12 @@ test_many(hid_t file)
     /* Create a bunch of names and unlink them in order */
     TESTING("forward unlink");
     for (i = 0; i < how_many; i++) {
-        HDsnprintf(name, sizeof(name), "obj_%05d", i);
+        snprintf(name, sizeof(name), "obj_%05d", i);
         if (H5Lcreate_hard(work, "/test_many_foo", H5L_SAME_LOC, name, H5P_DEFAULT, H5P_DEFAULT) < 0)
             FAIL_STACK_ERROR;
     } /* end for */
     for (i = 0; i < how_many; i++) {
-        HDsnprintf(name, sizeof(name), "obj_%05d", i);
+        snprintf(name, sizeof(name), "obj_%05d", i);
         if (H5Ldelete(work, name, H5P_DEFAULT) < 0)
             FAIL_STACK_ERROR;
     } /* end for */
@@ -179,12 +179,12 @@ test_many(hid_t file)
     /* Create a bunch of names and unlink them in reverse order */
     TESTING("backward unlink");
     for (i = 0; i < how_many; i++) {
-        HDsnprintf(name, sizeof(name), "obj_%05d", i);
+        snprintf(name, sizeof(name), "obj_%05d", i);
         if (H5Lcreate_hard(work, "/test_many_foo", H5L_SAME_LOC, name, H5P_DEFAULT, H5P_DEFAULT) < 0)
             FAIL_STACK_ERROR;
     } /* end for */
     for (i = (how_many - 1); i >= 0; --i) {
-        HDsnprintf(name, sizeof(name), "obj_%05d", i);
+        snprintf(name, sizeof(name), "obj_%05d", i);
         if (H5Ldelete(work, name, H5P_DEFAULT) < 0)
             FAIL_STACK_ERROR;
     } /* end for */
@@ -193,15 +193,15 @@ test_many(hid_t file)
     /* Create a bunch of names and unlink them from both directions */
     TESTING("inward unlink");
     for (i = 0; i < how_many; i++) {
-        HDsnprintf(name, sizeof(name), "obj_%05d", i);
+        snprintf(name, sizeof(name), "obj_%05d", i);
         if (H5Lcreate_hard(work, "/test_many_foo", H5L_SAME_LOC, name, H5P_DEFAULT, H5P_DEFAULT) < 0)
             FAIL_STACK_ERROR;
     } /* end for */
     for (i = 0; i < how_many; i++) {
         if (i % 2)
-            HDsnprintf(name, sizeof(name), "obj_%05d", how_many - (1 + i / 2));
+            snprintf(name, sizeof(name), "obj_%05d", how_many - (1 + i / 2));
         else
-            HDsnprintf(name, sizeof(name), "obj_%05d", i / 2);
+            snprintf(name, sizeof(name), "obj_%05d", i / 2);
         if (H5Ldelete(work, name, H5P_DEFAULT) < 0)
             FAIL_STACK_ERROR;
     } /* end for */
@@ -210,15 +210,15 @@ test_many(hid_t file)
     /* Create a bunch of names and unlink them from the midle */
     TESTING("outward unlink");
     for (i = 0; i < how_many; i++) {
-        HDsnprintf(name, sizeof(name), "obj_%05d", i);
+        snprintf(name, sizeof(name), "obj_%05d", i);
         if (H5Lcreate_hard(work, "/test_many_foo", H5L_SAME_LOC, name, H5P_DEFAULT, H5P_DEFAULT) < 0)
             FAIL_STACK_ERROR;
     } /* end for */
     for (i = (how_many - 1); i >= 0; --i) {
         if (i % 2)
-            HDsnprintf(name, sizeof(name), "obj_%05d", how_many - (1 + i / 2));
+            snprintf(name, sizeof(name), "obj_%05d", how_many - (1 + i / 2));
         else
-            HDsnprintf(name, sizeof(name), "obj_%05d", i / 2);
+            snprintf(name, sizeof(name), "obj_%05d", i / 2);
         if (H5Ldelete(work, name, H5P_DEFAULT) < 0)
             FAIL_STACK_ERROR;
     } /* end for */
@@ -485,7 +485,7 @@ check_new_move(hid_t fapl)
     /* Check soft links */
     if (H5Lget_val(file, "group2/soft", linkval, sizeof(linkval), H5P_DEFAULT) < 0)
         FAIL_STACK_ERROR;
-    if (HDstrcmp(linkval, "/group1/group_move") != 0)
+    if (strcmp(linkval, "/group1/group_move") != 0)
         FAIL_PUTS_ERROR("    Soft link test failed. Wrong link value");
 
     /* Cleanup */
@@ -545,7 +545,7 @@ test_filespace(hid_t fapl)
     size_t rdcc_nbytes;
     double rdcc_w0;
 
-    HDputs("Testing file space gets reused:");
+    puts("Testing file space gets reused:");
 
     /* Open file */
     h5_fixname(FILENAME[4], fapl, filename, sizeof filename);
@@ -902,7 +902,7 @@ test_filespace(hid_t fapl)
     /* Alternate adding attributes to each one */
     for (u = 0; u < FILESPACE_NATTR; u++) {
         /* Set the name of the attribute to create */
-        HDsnprintf(objname, sizeof(objname), "%s %u", ATTRNAME, u);
+        snprintf(objname, sizeof(objname), "%s %u", ATTRNAME, u);
 
         /* Create an attribute on the first dataset */
         if ((attr = H5Acreate2(dataset, objname, H5T_NATIVE_INT, attr_space, H5P_DEFAULT, H5P_DEFAULT)) < 0)
@@ -1034,7 +1034,7 @@ test_filespace(hid_t fapl)
 
     /* Create a many groups to remove */
     for (u = 0; u < UNLINK_NGROUPS; u++) {
-        HDsnprintf(objname, sizeof(objname), "%s %u", GROUPNAME, u);
+        snprintf(objname, sizeof(objname), "%s %u", GROUPNAME, u);
         if ((group = H5Gcreate2(file, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             FAIL_STACK_ERROR;
         if (H5Gclose(group) < 0)
@@ -1044,7 +1044,7 @@ test_filespace(hid_t fapl)
     /* Remove the all the groups */
     /* (Remove them in reverse order just to make file size calculation easier -QAK) */
     for (u = UNLINK_NGROUPS; u > 0; u--) {
-        HDsnprintf(objname, sizeof(objname), "%s %u", GROUPNAME, (u - 1));
+        snprintf(objname, sizeof(objname), "%s %u", GROUPNAME, (u - 1));
         if (H5Ldelete(file, objname, H5P_DEFAULT) < 0)
             FAIL_STACK_ERROR;
     } /* end for */
@@ -1112,21 +1112,21 @@ test_filespace(hid_t fapl)
     /* Create a complex group hierarchy to remove */
     for (u = 0; u < FILESPACE_TOP_GROUPS; u++) {
         /* Create group */
-        HDsnprintf(objname, sizeof(objname), "%s %u", GROUPNAME, u);
+        snprintf(objname, sizeof(objname), "%s %u", GROUPNAME, u);
         if ((group = H5Gcreate2(file, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             FAIL_STACK_ERROR;
 
         /* Create nested groups inside top groups */
         for (v = 0; v < FILESPACE_NESTED_GROUPS; v++) {
             /* Create group */
-            HDsnprintf(objname, sizeof(objname), "%s %u", GROUP2NAME, v);
+            snprintf(objname, sizeof(objname), "%s %u", GROUP2NAME, v);
             if ((group2 = H5Gcreate2(group, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
                 FAIL_STACK_ERROR;
 
             /* Create datasets inside nested groups */
             for (w = 0; w < FILESPACE_NDATASETS; w++) {
                 /* Create & close a dataset */
-                HDsnprintf(objname, sizeof(objname), "%s %u", DATASETNAME, w);
+                snprintf(objname, sizeof(objname), "%s %u", DATASETNAME, w);
                 if ((dataset = H5Dcreate2(group2, objname, H5T_NATIVE_INT, space, H5P_DEFAULT, H5P_DEFAULT,
                                           H5P_DEFAULT)) < 0)
                     FAIL_STACK_ERROR;
@@ -1148,21 +1148,21 @@ test_filespace(hid_t fapl)
     /* (Remove them in reverse order just to make file size calculation easier -QAK) */
     for (u = FILESPACE_TOP_GROUPS; u > 0; u--) {
         /* Open group */
-        HDsnprintf(objname, sizeof(objname), "%s %u", GROUPNAME, (u - 1));
+        snprintf(objname, sizeof(objname), "%s %u", GROUPNAME, (u - 1));
         if ((group = H5Gopen2(file, objname, H5P_DEFAULT)) < 0)
             FAIL_STACK_ERROR;
 
         /* Open nested groups inside top groups */
         for (v = 0; v < FILESPACE_NESTED_GROUPS; v++) {
             /* Create group */
-            HDsnprintf(objname, sizeof(objname), "%s %u", GROUP2NAME, v);
+            snprintf(objname, sizeof(objname), "%s %u", GROUP2NAME, v);
             if ((group2 = H5Gopen2(group, objname, H5P_DEFAULT)) < 0)
                 FAIL_STACK_ERROR;
 
             /* Remove datasets inside nested groups */
             for (w = 0; w < FILESPACE_NDATASETS; w++) {
                 /* Remove dataset */
-                HDsnprintf(objname, sizeof(objname), "%s %u", DATASETNAME, w);
+                snprintf(objname, sizeof(objname), "%s %u", DATASETNAME, w);
                 if (H5Ldelete(group2, objname, H5P_DEFAULT) < 0)
                     FAIL_STACK_ERROR;
             } /* end for */
@@ -1172,7 +1172,7 @@ test_filespace(hid_t fapl)
                 FAIL_STACK_ERROR;
 
             /* Remove nested group */
-            HDsnprintf(objname, sizeof(objname), "%s %u", GROUP2NAME, v);
+            snprintf(objname, sizeof(objname), "%s %u", GROUP2NAME, v);
             if (H5Ldelete(group, objname, H5P_DEFAULT) < 0)
                 FAIL_STACK_ERROR;
         } /* end for */
@@ -1182,7 +1182,7 @@ test_filespace(hid_t fapl)
             FAIL_STACK_ERROR;
 
         /* Remove top group */
-        HDsnprintf(objname, sizeof(objname), "%s %u", GROUPNAME, (u - 1));
+        snprintf(objname, sizeof(objname), "%s %u", GROUPNAME, (u - 1));
         if (H5Ldelete(file, objname, H5P_DEFAULT) < 0)
             FAIL_STACK_ERROR;
     } /* end for */
@@ -1461,7 +1461,7 @@ test_create_unlink(const char *msg, hid_t fapl)
 
     /* Create a many groups to remove */
     for (u = 0; u < UNLINK_NGROUPS; u++) {
-        HDsnprintf(groupname, sizeof(groupname), "%s %u", GROUPNAME, u);
+        snprintf(groupname, sizeof(groupname), "%s %u", GROUPNAME, u);
         if ((group = H5Gcreate2(file, groupname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) {
             H5_FAILED();
             printf("group %s creation failed\n", groupname);
@@ -1476,7 +1476,7 @@ test_create_unlink(const char *msg, hid_t fapl)
 
     /* Remove the all the groups */
     for (u = 0; u < UNLINK_NGROUPS; u++) {
-        HDsnprintf(groupname, sizeof(groupname), "%s %u", GROUPNAME, u);
+        snprintf(groupname, sizeof(groupname), "%s %u", GROUPNAME, u);
         if (H5Ldelete(file, groupname, H5P_DEFAULT) < 0) {
             H5_FAILED();
             printf("Unlinking group %s failed\n", groupname);
@@ -1665,7 +1665,7 @@ delete_node(hid_t pid, hid_t id)
         return (-1);
 
     /* If this object is the right-most child, try opening the previous object */
-    if (HDstrcmp(name, "/Zone81") == 0) {
+    if (strcmp(name, "/Zone81") == 0) {
         hid_t gid;
 
         if ((gid = H5Gopen2(pid, "/Zone80", H5P_DEFAULT)) < 0)
@@ -1709,7 +1709,7 @@ test_unlink_rightleaf(hid_t fid)
 
     /* Create all the groups */
     for (n = 0; n < ngroups; n++) {
-        HDsnprintf(name, sizeof(name), "Zone%d", n + 1);
+        snprintf(name, sizeof(name), "Zone%d", n + 1);
         if ((gids[n] = H5Gcreate2(rootid, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             TEST_ERROR;
     } /* end for */
@@ -1718,7 +1718,7 @@ test_unlink_rightleaf(hid_t fid)
     for (n = 0; n < ngroups; n++) {
         if (delete_node(rootid, gids[n]) < 0)
             TEST_ERROR;
-        HDsnprintf(name, sizeof(name), "Zone%d", n + 1);
+        snprintf(name, sizeof(name), "Zone%d", n + 1);
         if ((gids[n] = H5Gcreate2(rootid, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             TEST_ERROR;
     } /* end for */
@@ -1793,7 +1793,7 @@ test_unlink_rightnode(hid_t fid)
 
     /* Create all the groups */
     for (n = 0; n < ngroups; n++) {
-        HDsnprintf(name, sizeof(name), "ZoneB%d", n + 1);
+        snprintf(name, sizeof(name), "ZoneB%d", n + 1);
         if ((gids[n] = H5Gcreate2(rootid, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             FAIL_STACK_ERROR;
     } /* end for */
@@ -1880,7 +1880,7 @@ test_unlink_middlenode(hid_t fid)
 
     /* Create all the groups */
     for (n = 0; n < ngroups; n++) {
-        HDsnprintf(name, sizeof(name), "ZoneC%d", n + 1);
+        snprintf(name, sizeof(name), "ZoneC%d", n + 1);
         if ((gids[n] = H5Gcreate2(rootid, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             FAIL_STACK_ERROR;
     } /* end for */
@@ -2587,7 +2587,7 @@ test_full_group_compact(hid_t fapl)
 
     /* Create several objects to link to */
     for (u = 0; u < FULL_GROUP_NUM_KEEP; u++) {
-        HDsnprintf(objname, sizeof(objname), "keep %u\n", u);
+        snprintf(objname, sizeof(objname), "keep %u\n", u);
         if ((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             FAIL_STACK_ERROR;
         if (H5Gclose(gid2) < 0)
@@ -2624,15 +2624,15 @@ test_full_group_compact(hid_t fapl)
 
     /* Create hard links to objects in group to keep */
     for (u = 0; u < FULL_GROUP_NUM_KEEP; u++) {
-        HDsnprintf(objname, sizeof(objname), "/keep/keep %u\n", u);
-        HDsnprintf(objname2, sizeof(objname2), "keep %u\n", u);
+        snprintf(objname, sizeof(objname), "/keep/keep %u\n", u);
+        snprintf(objname2, sizeof(objname2), "keep %u\n", u);
         if (H5Lcreate_hard(file_id, objname, gid, objname2, H5P_DEFAULT, H5P_DEFAULT) < 0)
             FAIL_STACK_ERROR;
     } /* end for */
 
     /* Create several objects to delete */
     for (u = 0; u < FULL_GROUP_NUM_DELETE_COMPACT; u++) {
-        HDsnprintf(objname, sizeof(objname), "delete %u\n", u);
+        snprintf(objname, sizeof(objname), "delete %u\n", u);
         if ((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             FAIL_STACK_ERROR;
         if (H5Gclose(gid2) < 0)
@@ -2653,7 +2653,7 @@ test_full_group_compact(hid_t fapl)
 
     /* Check reference count on objects to keep */
     for (u = 0; u < FULL_GROUP_NUM_KEEP; u++) {
-        HDsnprintf(objname, sizeof(objname), "/keep/keep %u\n", u);
+        snprintf(objname, sizeof(objname), "/keep/keep %u\n", u);
         if (H5Oget_info_by_name3(file_id, objname, &oi, H5O_INFO_BASIC, H5P_DEFAULT) < 0)
             FAIL_STACK_ERROR;
         if (oi.rc != 2)
@@ -2674,7 +2674,7 @@ test_full_group_compact(hid_t fapl)
 
     /* Check reference count on objects to keep */
     for (u = 0; u < FULL_GROUP_NUM_KEEP; u++) {
-        HDsnprintf(objname, sizeof(objname), "/keep/keep %u\n", u);
+        snprintf(objname, sizeof(objname), "/keep/keep %u\n", u);
         if (H5Oget_info_by_name3(file_id, objname, &oi, H5O_INFO_BASIC, H5P_DEFAULT) < 0)
             FAIL_STACK_ERROR;
         if (oi.rc != 1)
@@ -2746,7 +2746,7 @@ test_full_group_dense(hid_t fapl)
 
     /* Create several objects to link to */
     for (u = 0; u < FULL_GROUP_NUM_KEEP; u++) {
-        HDsnprintf(objname, sizeof(objname), "keep %u\n", u);
+        snprintf(objname, sizeof(objname), "keep %u\n", u);
         if ((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             FAIL_STACK_ERROR;
         if (H5Gclose(gid2) < 0)
@@ -2798,15 +2798,15 @@ test_full_group_dense(hid_t fapl)
 
     /* Create hard links to objects in group to keep */
     for (u = 0; u < FULL_GROUP_NUM_KEEP; u++) {
-        HDsnprintf(objname, sizeof(objname), "/keep/keep %u\n", u);
-        HDsnprintf(objname2, sizeof(objname2), "keep %u\n", u);
+        snprintf(objname, sizeof(objname), "/keep/keep %u\n", u);
+        snprintf(objname2, sizeof(objname2), "keep %u\n", u);
         if (H5Lcreate_hard(file_id, objname, gid, objname2, H5P_DEFAULT, H5P_DEFAULT) < 0)
             FAIL_STACK_ERROR;
     } /* end for */
 
     /* Create several objects to delete */
     for (u = 0; u < FULL_GROUP_NUM_DELETE_DENSE; u++) {
-        HDsnprintf(objname, sizeof(objname), "delete %u\n", u);
+        snprintf(objname, sizeof(objname), "delete %u\n", u);
         if ((gid2 = H5Gcreate2(gid, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
             FAIL_STACK_ERROR;
         if (H5Gclose(gid2) < 0)
@@ -2827,7 +2827,7 @@ test_full_group_dense(hid_t fapl)
 
     /* Check reference count on objects to keep */
     for (u = 0; u < FULL_GROUP_NUM_KEEP; u++) {
-        HDsnprintf(objname, sizeof(objname), "/keep/keep %u\n", u);
+        snprintf(objname, sizeof(objname), "/keep/keep %u\n", u);
         if (H5Oget_info_by_name3(file_id, objname, &oi, H5O_INFO_BASIC, H5P_DEFAULT) < 0)
             FAIL_STACK_ERROR;
         if (oi.rc != 2)
@@ -2848,7 +2848,7 @@ test_full_group_dense(hid_t fapl)
 
     /* Check reference count on objects to keep */
     for (u = 0; u < FULL_GROUP_NUM_KEEP; u++) {
-        HDsnprintf(objname, sizeof(objname), "/keep/keep %u\n", u);
+        snprintf(objname, sizeof(objname), "/keep/keep %u\n", u);
         if (H5Oget_info_by_name3(file_id, objname, &oi, H5O_INFO_BASIC, H5P_DEFAULT) < 0)
             FAIL_STACK_ERROR;
         if (oi.rc != 1)
@@ -2926,11 +2926,11 @@ main(void)
 
         /* Set the FAPL for the type of format */
         if (new_format) {
-            HDputs("\nTesting with new group format:");
+            puts("\nTesting with new group format:");
             my_fapl = fapl2;
         } /* end if */
         else {
-            HDputs("Testing with old group format:");
+            puts("Testing with old group format:");
             my_fapl = fapl;
         } /* end else */
 
@@ -3017,7 +3017,7 @@ main(void)
         exit(EXIT_FAILURE);
     }
 
-    HDputs("All unlink tests passed.");
+    puts("All unlink tests passed.");
 
     h5_cleanup(FILENAME, fapl);