Fixed all clang-tidy bugprone-suspicious-string-compare warnings (#451)

* Fixed all clang-tidy bugprone-suspicious-string-compare warnings

This change was generated entirely by clang-tidy itself.

* Reformat code with clang v10.0.1.

Co-authored-by: Larry Knox <lrknox@hdfgroup.org>

1 files changed, 131 insertions, 131 deletions

diff --git a/test/links.c b/test/links.c
index def3768..e519435 100644
--- a/test/links.c
+++ b/test/links.c
@@ -697,7 +697,7 @@ cklinks(hid_t fapl, hbool_t new_format)
     } /* end if */
     if (H5Lget_val(file, "grp1/soft", linkval, sizeof linkval, H5P_DEFAULT) < 0)
         FAIL_STACK_ERROR
-    if (HDstrcmp(linkval, "/d1")) {
+    if (HDstrcmp(linkval, "/d1") != 0) {
         H5_FAILED();
         HDputs("    Soft link test failed. Wrong link value");
         TEST_ERROR
@@ -728,7 +728,7 @@ cklinks(hid_t fapl, hbool_t new_format)
         HDprintf("    %d: Can't retrieve link value\n", __LINE__);
         TEST_ERROR
     } /* end if */
-    if (HDstrcmp(linkval, "foobar")) {
+    if (HDstrcmp(linkval, "foobar") != 0) {
         H5_FAILED();
         HDputs("    Dangling link test failed. Wrong link value");
         TEST_ERROR
@@ -759,7 +759,7 @@ cklinks(hid_t fapl, hbool_t new_format)
         HDprintf("    %d: Can't retrieve link value\n", __LINE__);
         TEST_ERROR
     } /* end if */
-    if (HDstrcmp(linkval, "/grp1/recursive")) {
+    if (HDstrcmp(linkval, "/grp1/recursive") != 0) {
         H5_FAILED();
         HDputs("   Recursive link test failed. Wrong link value");
         TEST_ERROR
@@ -1058,7 +1058,7 @@ toomany(hid_t fapl, hbool_t new_format)
     /* Check name */
     if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if (HDstrcmp(objname, "/hard21"))
+    if (HDstrcmp(objname, "/hard21") != 0)
         TEST_ERROR
 
     /* Create object in hard-linked group */
@@ -1089,7 +1089,7 @@ toomany(hid_t fapl, hbool_t new_format)
     /* Check name */
     if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if (HDstrcmp(objname, "/soft16"))
+    if (HDstrcmp(objname, "/soft16") != 0)
         TEST_ERROR
 
     /* Create object using soft links */
@@ -1955,7 +1955,7 @@ test_deprec(hid_t fapl, hbool_t new_format)
         FAIL_STACK_ERROR
     if (H5Gget_comment(file_id, "group1", sizeof(tmpstr), tmpstr) < 0)
         FAIL_STACK_ERROR
-    if (HDstrcmp(tmpstr, "comment"))
+    if (HDstrcmp(tmpstr, "comment") != 0)
         TEST_ERROR
 
     /* Create links using H5Glink and H5Glink2 */
@@ -1971,7 +1971,7 @@ test_deprec(hid_t fapl, hbool_t 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"))
+    if (HDstrcmp(tmpstr, "link_to_group2") != 0)
         TEST_ERROR
     H5E_BEGIN_TRY
     {
@@ -2008,7 +2008,7 @@ test_deprec(hid_t fapl, hbool_t new_format)
     if (H5Gget_objinfo(file_id, "/group1/link_to_group2", TRUE, &sb_hard2) < 0)
         FAIL_STACK_ERROR
 
-    if (HDmemcmp(&sb_hard1.objno, sb_hard2.objno, sizeof(sb_hard1.objno))) {
+    if (HDmemcmp(&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.");
@@ -2021,7 +2021,7 @@ test_deprec(hid_t fapl, hbool_t new_format)
     if (H5Gget_objinfo(file_id, "/group2/link_to_group1", TRUE, &sb_hard2) < 0)
         FAIL_STACK_ERROR
 
-    if (HDmemcmp(&sb_hard1.objno, sb_hard2.objno, sizeof(sb_hard1.objno))) {
+    if (HDmemcmp(&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.");
@@ -2038,7 +2038,7 @@ test_deprec(hid_t fapl, hbool_t new_format)
 
     if (H5Gget_linkval(group2_id, "soft_link_to_group1", sb_soft1.linklen, tmpstr) < 0)
         FAIL_STACK_ERROR
-    if (HDstrcmp("link_to_group1", tmpstr))
+    if (HDstrcmp("link_to_group1", tmpstr) != 0)
         TEST_ERROR
 
     /* Test non-existing links with H5Gget_objinfo */
@@ -2059,7 +2059,7 @@ test_deprec(hid_t fapl, hbool_t new_format)
 
     if (H5Gget_linkval(group2_id, "dangle_soft_link", sb_soft2.linklen, tmpstr) < 0)
         FAIL_STACK_ERROR
-    if (HDstrcmp("dangle", tmpstr))
+    if (HDstrcmp("dangle", tmpstr) != 0)
         TEST_ERROR
 
     /* Test H5Gmove and H5Gmove2 */
@@ -2200,7 +2200,7 @@ cklinks_deprec(hid_t fapl, hbool_t new_format)
     } /* end if */
     if (H5Lget_val(file, "grp1/soft", linkval, sizeof linkval, H5P_DEFAULT) < 0)
         FAIL_STACK_ERROR
-    if (HDstrcmp(linkval, "/d1")) {
+    if (HDstrcmp(linkval, "/d1") != 0) {
         H5_FAILED();
         HDputs("    Soft link test failed. Wrong link value");
         TEST_ERROR
@@ -2231,7 +2231,7 @@ cklinks_deprec(hid_t fapl, hbool_t new_format)
         HDprintf("    %d: Can't retrieve link value\n", __LINE__);
         TEST_ERROR
     } /* end if */
-    if (HDstrcmp(linkval, "foobar")) {
+    if (HDstrcmp(linkval, "foobar") != 0) {
         H5_FAILED();
         HDputs("    Dangling link test failed. Wrong link value");
         TEST_ERROR
@@ -2262,7 +2262,7 @@ cklinks_deprec(hid_t fapl, hbool_t new_format)
         HDprintf("    %d: Can't retrieve link value\n", __LINE__);
         TEST_ERROR
     } /* end if */
-    if (HDstrcmp(linkval, "/grp1/recursive")) {
+    if (HDstrcmp(linkval, "/grp1/recursive") != 0) {
         H5_FAILED();
         HDputs("   Recursive link test failed. Wrong link value");
         TEST_ERROR
@@ -2799,12 +2799,12 @@ external_link_root_deprec(hid_t fapl, hbool_t new_format)
         TEST_ERROR
     if (H5Lunpack_elink_val(objname, linfo.u.val_size, NULL, &file, &path) < 0)
         TEST_ERROR
-    if (HDstrcmp(file, filename1)) {
+    if (HDstrcmp(file, filename1) != 0) {
         H5_FAILED();
         HDputs("    External link file name incorrect");
         goto error;
     }
-    if (HDstrcmp(path, "/")) {
+    if (HDstrcmp(path, "/") != 0) {
         H5_FAILED();
         HDputs("    External link path incorrect");
         goto error;
@@ -2827,12 +2827,12 @@ external_link_root_deprec(hid_t fapl, hbool_t new_format)
         TEST_ERROR
     if (H5Lunpack_elink_val(objname, linfo.u.val_size, NULL, &file, &path) < 0)
         TEST_ERROR
-    if (HDstrcmp(file, filename1)) {
+    if (HDstrcmp(file, filename1) != 0) {
         H5_FAILED();
         HDputs("    External link file name incorrect");
         goto error;
     }
-    if (HDstrcmp(path, "/")) {
+    if (HDstrcmp(path, "/") != 0) {
         H5_FAILED();
         HDputs("    External link path incorrect");
         goto error;
@@ -2851,7 +2851,7 @@ external_link_root_deprec(hid_t fapl, hbool_t new_format)
     /* Check name */
     if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if (HDstrcmp(objname, "/"))
+    if (HDstrcmp(objname, "/") != 0)
         TEST_ERROR
 
     /* Create object in external file */
@@ -2896,11 +2896,11 @@ external_link_root_deprec(hid_t fapl, hbool_t new_format)
     /* Check names */
     if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if (HDstrcmp(objname, "/new_group"))
+    if (HDstrcmp(objname, "/new_group") != 0)
         TEST_ERROR
     if (H5Iget_name(gid2, objname, (size_t)NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if (HDstrcmp(objname, "/newer_group"))
+    if (HDstrcmp(objname, "/newer_group") != 0)
         TEST_ERROR
 
     /* Close opened objects */
@@ -3045,9 +3045,9 @@ external_link_query_deprec(hid_t fapl, hbool_t new_format)
         TEST_ERROR
 
     /* Compare the file and object names */
-    if (HDstrcmp(file_name, filename2))
+    if (HDstrcmp(file_name, filename2) != 0)
         TEST_ERROR
-    if (HDstrcmp(object_name, "/dst"))
+    if (HDstrcmp(object_name, "/dst") != 0)
         TEST_ERROR
 
     /* Query information about object that external link points to */
@@ -3241,7 +3241,7 @@ external_link_closing_deprec(hid_t fapl, hbool_t 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"))
+    if (HDstrcmp(buf, "comment") != 0)
         TEST_ERROR
 
     /* Test H5*open */
@@ -3658,7 +3658,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"))
+    if (HDstrcmp(objname, "/group") != 0)
         TEST_ERROR
 
     /* Create object in group */
@@ -3678,7 +3678,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"))
+    if (HDstrcmp(objname, "/group/new_group") != 0)
         TEST_ERROR
 
     /* Close opened object */
@@ -3841,7 +3841,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))
+    if (HDstrcmp(objname, "/" REREG_TARGET_NAME) != 0)
         TEST_ERROR
 
     /* Create object in group */
@@ -3861,7 +3861,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"))
+    if (HDstrcmp(objname, "/rereg_target/new_group") != 0)
         TEST_ERROR
 
     /* Close opened object */
@@ -4205,7 +4205,7 @@ lapl_nlinks_deprec(hid_t fapl, hbool_t new_format)
     /* Check name */
     if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if (HDstrcmp(objname, "/soft17"))
+    if (HDstrcmp(objname, "/soft17") != 0)
         TEST_ERROR
 
     /* Create group using soft link */
@@ -4246,7 +4246,7 @@ lapl_nlinks_deprec(hid_t fapl, hbool_t new_format)
     /* Check name */
     if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if (HDstrcmp(objname, "/soft4"))
+    if (HDstrcmp(objname, "/soft4") != 0)
         TEST_ERROR
 
     /* Test other functions that should use a LAPL */
@@ -4861,7 +4861,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h
         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))
+        if (HDstrcmp(valname, tmpval) != 0)
             TEST_ERROR
     } /* end if */
 
@@ -4870,7 +4870,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h
     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))
+    if (HDstrcmp(linkname, tmpname) != 0)
         TEST_ERROR
 
     /* Don't test "native" order if there is no creation order index, since
@@ -4900,7 +4900,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h
             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))
+            if (HDstrcmp(valname, tmpval) != 0)
                 TEST_ERROR
         } /* end if */
 
@@ -4909,7 +4909,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h
         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))
+        if (HDstrcmp(linkname, tmpname) != 0)
             TEST_ERROR
     } /* end if */
 
@@ -4934,7 +4934,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h
         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))
+        if (HDstrcmp(valname, tmpval) != 0)
             TEST_ERROR
     } /* end if */
 
@@ -4943,7 +4943,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h
     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))
+    if (HDstrcmp(linkname, tmpname) != 0)
         TEST_ERROR
 
     /* Verify the link information for first link, in increasing link name order */
@@ -4966,7 +4966,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h
         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))
+        if (HDstrcmp(valname, tmpval) != 0)
             TEST_ERROR
     } /* end if */
 
@@ -4975,7 +4975,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h
     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))
+    if (HDstrcmp(linkname, tmpname) != 0)
         TEST_ERROR
 
     /* Don't test "native" order queries on link name order, since there's not
@@ -5002,7 +5002,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h
         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))
+        if (HDstrcmp(valname, tmpval) != 0)
             TEST_ERROR
     } /* end if */
 
@@ -5011,7 +5011,7 @@ link_info_by_idx_check_deprec(hid_t group_id, const char *linkname, hsize_t n, h
     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))
+    if (HDstrcmp(linkname, tmpname) != 0)
         TEST_ERROR
 
     /* Success */
@@ -5358,7 +5358,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))
+                if (HDstrcmp(valname, tmpval) != 0)
                     TEST_ERROR
             } /* end else */
 
@@ -5366,7 +5366,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))
+            if (HDstrcmp(objname, tmpname) != 0)
                 TEST_ERROR
 
             /* Verify link information (in native order - native is increasing) */
@@ -5381,7 +5381,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))
+                if (HDstrcmp(valname, tmpval) != 0)
                     TEST_ERROR
             } /* end else */
 
@@ -5389,7 +5389,7 @@ 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))
+            if (HDstrcmp(objname, tmpname) != 0)
                 TEST_ERROR
 
             /* Make link name for decreasing order queries */
@@ -5410,7 +5410,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))
+                if (HDstrcmp(valname, tmpval) != 0)
                     TEST_ERROR
             } /* end else */
 
@@ -5418,7 +5418,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))
+            if (HDstrcmp(objname, tmpname) != 0)
                 TEST_ERROR
         } /* end for */
 
@@ -5644,7 +5644,7 @@ delete_by_idx_deprec(hid_t fapl)
                         HDsnprintf(objname, sizeof(objname), "filler %02u", (u + 1));
                     else
                         HDsnprintf(objname, sizeof(objname), "filler %02u", (max_compact - (u + 2)));
-                    if (HDstrcmp(objname, tmpname))
+                    if (HDstrcmp(objname, tmpname) != 0)
                         TEST_ERROR
                 } /* end for */
 
@@ -5718,7 +5718,7 @@ delete_by_idx_deprec(hid_t fapl)
                         HDsnprintf(objname, sizeof(objname), "filler %02u", (u + 1));
                     else
                         HDsnprintf(objname, sizeof(objname), "filler %02u", ((max_compact * 2) - (u + 2)));
-                    if (HDstrcmp(objname, tmpname))
+                    if (HDstrcmp(objname, tmpname) != 0)
                         TEST_ERROR
                 } /* end for */
 
@@ -5797,7 +5797,7 @@ delete_by_idx_deprec(hid_t fapl)
                     else
                         HDsnprintf(objname, sizeof(objname), "filler %02u",
                                    ((max_compact * 2) - ((u * 2) + 2)));
-                    if (HDstrcmp(objname, tmpname))
+                    if (HDstrcmp(objname, tmpname) != 0)
                         TEST_ERROR
                 } /* end for */
 
@@ -5831,7 +5831,7 @@ delete_by_idx_deprec(hid_t fapl)
                     else
                         HDsnprintf(objname, sizeof(objname), "filler %02u",
                                    ((max_compact * 2) - ((u * 2) + 4)));
-                    if (HDstrcmp(objname, tmpname))
+                    if (HDstrcmp(objname, tmpname) != 0)
                         TEST_ERROR
                 } /* end for */
 
@@ -5998,7 +5998,7 @@ delete_by_idx_old_deprec(hid_t fapl)
                 HDsnprintf(objname, sizeof(objname), "filler %02u", (u + 1));
             else
                 HDsnprintf(objname, sizeof(objname), "filler %02u", dec_u);
-            if (HDstrcmp(objname, tmpname))
+            if (HDstrcmp(objname, tmpname) != 0)
                 TEST_ERROR
         } /* end for */
 
@@ -6072,7 +6072,7 @@ delete_by_idx_old_deprec(hid_t fapl)
                 HDsnprintf(objname, sizeof(objname), "filler %02u", ((u * 2) + 1));
             else
                 HDsnprintf(objname, sizeof(objname), "filler %02u", dec_u);
-            if (HDstrcmp(objname, tmpname))
+            if (HDstrcmp(objname, tmpname) != 0)
                 TEST_ERROR
         } /* end for */
 
@@ -6106,7 +6106,7 @@ delete_by_idx_old_deprec(hid_t fapl)
                 HDsnprintf(objname, sizeof(objname), "filler %02u", ((u * 2) + 3));
             else
                 HDsnprintf(objname, sizeof(objname), "filler %02u", dec_u);
-            if (HDstrcmp(objname, tmpname))
+            if (HDstrcmp(objname, tmpname) != 0)
                 TEST_ERROR
         } /* end for */
 
@@ -6188,7 +6188,7 @@ link_iterate_deprec_cb(hid_t group_id, const char *link_name, const H5L_info1_t
 
     /* Verify name of link */
     HDsnprintf(objname, sizeof(objname), "filler %02u", (unsigned)my_info.corder);
-    if (HDstrcmp(link_name, objname))
+    if (HDstrcmp(link_name, objname) != 0)
         return H5_ITER_ERROR;
 
     /* Check if we've visited this link before */
@@ -6685,7 +6685,7 @@ link_iterate_old_deprec_cb(hid_t group_id, const char *link_name, const H5L_info
     /* 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))
+    if (HDstrcmp(link_name, objname) != 0)
         return H5_ITER_ERROR;
 
     /* Check if we've visited this link before */
@@ -7105,12 +7105,12 @@ external_link_root(hid_t fapl, hbool_t new_format)
         TEST_ERROR
     if (H5Lunpack_elink_val(objname, linfo.u.val_size, NULL, &file, &path) < 0)
         TEST_ERROR
-    if (HDstrcmp(file, filename1)) {
+    if (HDstrcmp(file, filename1) != 0) {
         H5_FAILED();
         HDputs("    External link file name incorrect");
         goto error;
     }
-    if (HDstrcmp(path, "/")) {
+    if (HDstrcmp(path, "/") != 0) {
         H5_FAILED();
         HDputs("    External link path incorrect");
         goto error;
@@ -7133,12 +7133,12 @@ external_link_root(hid_t fapl, hbool_t new_format)
         TEST_ERROR
     if (H5Lunpack_elink_val(objname, linfo.u.val_size, NULL, &file, &path) < 0)
         TEST_ERROR
-    if (HDstrcmp(file, filename1)) {
+    if (HDstrcmp(file, filename1) != 0) {
         H5_FAILED();
         HDputs("    External link file name incorrect");
         goto error;
     }
-    if (HDstrcmp(path, "/")) {
+    if (HDstrcmp(path, "/") != 0) {
         H5_FAILED();
         HDputs("    External link path incorrect");
         goto error;
@@ -7157,7 +7157,7 @@ external_link_root(hid_t fapl, hbool_t new_format)
     /* Check name */
     if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if (HDstrcmp(objname, "/"))
+    if (HDstrcmp(objname, "/") != 0)
         TEST_ERROR
 
     /* Create object in external file */
@@ -7202,11 +7202,11 @@ external_link_root(hid_t fapl, hbool_t new_format)
     /* Check names */
     if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if (HDstrcmp(objname, "/new_group"))
+    if (HDstrcmp(objname, "/new_group") != 0)
         TEST_ERROR
     if (H5Iget_name(gid2, objname, (size_t)NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if (HDstrcmp(objname, "/newer_group"))
+    if (HDstrcmp(objname, "/newer_group") != 0)
         TEST_ERROR
 
     /* Close opened objects */
@@ -7325,7 +7325,7 @@ external_link_path(hid_t fapl, hbool_t new_format)
     /* Check name */
     if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if (HDstrcmp(objname, "/A/B/C"))
+    if (HDstrcmp(objname, "/A/B/C") != 0)
         TEST_ERROR
 
     /* Create object in external file */
@@ -7355,7 +7355,7 @@ external_link_path(hid_t fapl, hbool_t 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"))
+    if (HDstrcmp(objname, "/A/B/C/new_group") != 0)
         TEST_ERROR
 
     /* Close opened object */
@@ -7497,7 +7497,7 @@ external_link_mult(hid_t fapl, hbool_t new_format)
     /* Check name */
     if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if (HDstrcmp(objname, "/A/B/C"))
+    if (HDstrcmp(objname, "/A/B/C") != 0)
         TEST_ERROR
 
     /* Create object in external file */
@@ -7527,7 +7527,7 @@ external_link_mult(hid_t fapl, hbool_t 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"))
+    if (HDstrcmp(objname, "/A/B/C/new_group") != 0)
         TEST_ERROR
 
     /* Close opened object */
@@ -7643,7 +7643,7 @@ external_link_self(hid_t fapl, hbool_t new_format)
     /* Check name */
     if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if (HDstrcmp(objname, "/X"))
+    if (HDstrcmp(objname, "/X") != 0)
         TEST_ERROR
 
     /* Create object through external link */
@@ -7665,7 +7665,7 @@ external_link_self(hid_t fapl, hbool_t new_format)
     /* Check name */
     if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if (HDstrcmp(objname, "/X/new_group"))
+    if (HDstrcmp(objname, "/X/new_group") != 0)
         TEST_ERROR
 
     /* Close opened object */
@@ -7850,7 +7850,7 @@ external_link_pingpong(hid_t fapl, hbool_t new_format)
     /* Check name */
     if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if (HDstrcmp(objname, "/final"))
+    if (HDstrcmp(objname, "/final") != 0)
         TEST_ERROR
 
     /* Create object in external file */
@@ -7880,7 +7880,7 @@ external_link_pingpong(hid_t fapl, hbool_t new_format)
     /* Check name */
     if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if (HDstrcmp(objname, "/final/new_group"))
+    if (HDstrcmp(objname, "/final/new_group") != 0)
         TEST_ERROR
 
     /* Close opened object */
@@ -8039,7 +8039,7 @@ external_link_toomany(hid_t fapl, hbool_t new_format)
     /* Check name */
     if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if (HDstrcmp(objname, "/final"))
+    if (HDstrcmp(objname, "/final") != 0)
         TEST_ERROR
 
     /* Create object in external file */
@@ -9753,13 +9753,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))
+    if (HDstrcmp(parent_file, op_data->parent_file) != 0)
         return FAIL;
-    if (HDstrcmp(parent_group, "/group1"))
+    if (HDstrcmp(parent_group, "/group1") != 0)
         return FAIL;
-    if (HDstrcmp(target_file, op_data->target_file))
+    if (HDstrcmp(target_file, op_data->target_file) != 0)
         return FAIL;
-    if (HDstrcmp(target_obj, "/"))
+    if (HDstrcmp(target_obj, "/") != 0)
         return FAIL;
 
     /* Set flags to be read-write */
@@ -10983,9 +10983,9 @@ external_link_query(hid_t fapl, hbool_t new_format)
         TEST_ERROR
 
     /* Compare the file and object names */
-    if (HDstrcmp(file_name, filename2))
+    if (HDstrcmp(file_name, filename2) != 0)
         TEST_ERROR
-    if (HDstrcmp(object_name, "/dst"))
+    if (HDstrcmp(object_name, "/dst") != 0)
         TEST_ERROR
 
     /* Query information about object that external link points to */
@@ -11382,7 +11382,7 @@ external_link_move(hid_t fapl, hbool_t new_format)
     /* Check name */
     if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0)
         FAIL_STACK_ERROR
-    if (HDstrcmp(objname, "/dst"))
+    if (HDstrcmp(objname, "/dst") != 0)
         TEST_ERROR
 
     /* Create object in external file */
@@ -11442,7 +11442,7 @@ external_link_move(hid_t fapl, hbool_t new_format)
     /* Check name */
     if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0)
         FAIL_STACK_ERROR
-    if (HDstrcmp(objname, "/dst"))
+    if (HDstrcmp(objname, "/dst") != 0)
         TEST_ERROR
 
     /* Create object in external file */
@@ -11489,7 +11489,7 @@ external_link_move(hid_t fapl, hbool_t new_format)
     /* Check name */
     if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0)
         FAIL_STACK_ERROR
-    if (HDstrcmp(objname, "/dst"))
+    if (HDstrcmp(objname, "/dst") != 0)
         TEST_ERROR
 
     /* Move external link back to original location */
@@ -11499,7 +11499,7 @@ external_link_move(hid_t fapl, hbool_t new_format)
     /* Check name */
     if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0)
         FAIL_STACK_ERROR
-    if (HDstrcmp(objname, "/dst"))
+    if (HDstrcmp(objname, "/dst") != 0)
         TEST_ERROR
 
     /* Create object in external file */
@@ -11673,7 +11673,7 @@ external_link_ride(hid_t fapl, hbool_t new_format)
     /* Check name */
     if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if (HDstrcmp(objname, "/dst"))
+    if (HDstrcmp(objname, "/dst") != 0)
         TEST_ERROR
 
     /* Create object in external file */
@@ -11722,7 +11722,7 @@ external_link_ride(hid_t fapl, hbool_t new_format)
     /* Check name */
     if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if (HDstrcmp(objname, "/dst"))
+    if (HDstrcmp(objname, "/dst") != 0)
         TEST_ERROR
 
     /* Create object in external file */
@@ -11915,7 +11915,7 @@ external_link_closing(hid_t fapl, hbool_t 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"))
+    if (HDstrcmp(buf, "comment") != 0)
         TEST_ERROR
 
     /* Test H5*open */
@@ -12258,7 +12258,7 @@ external_link_strong(hid_t fapl, hbool_t new_format)
         FAIL_STACK_ERROR
     if (H5Iget_name(gid2, objname, (size_t)NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if (HDstrcmp(objname, "/A/B/C"))
+    if (HDstrcmp(objname, "/A/B/C") != 0)
         TEST_ERROR
     if (H5Gclose(gid2) < 0)
         TEST_ERROR
@@ -13823,7 +13823,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"))
+    if (HDstrcmp(objname, "/group") != 0)
         TEST_ERROR
 
     /* Create object in group */
@@ -13843,7 +13843,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"))
+    if (HDstrcmp(objname, "/group/new_group") != 0)
         TEST_ERROR
 
     /* Close opened object */
@@ -14034,7 +14034,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))
+    if (HDstrcmp(objname, "/" REREG_TARGET_NAME) != 0)
         TEST_ERROR
 
     /* Create object in group */
@@ -14054,7 +14054,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"))
+    if (HDstrcmp(objname, "/rereg_target/new_group") != 0)
         TEST_ERROR
 
     /* Close opened object */
@@ -14143,9 +14143,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) && HDstrcmp(link_name, NEW_UD_CB_LINK_NAME))
+    if (HDstrcmp(link_name, UD_CB_LINK_NAME) != 0 && HDstrcmp(link_name, NEW_UD_CB_LINK_NAME) != 0)
         TEST_ERROR
-    if (HDstrcmp((const char *)udata, UD_CB_TARGET))
+    if (HDstrcmp((const char *)udata, UD_CB_TARGET) != 0)
         TEST_ERROR
     if (udata_size != UD_CB_TARGET_LEN)
         TEST_ERROR
@@ -14170,9 +14170,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) && HDstrcmp(link_name, NEW_UD_CB_LINK_NAME))
+    if (HDstrcmp(link_name, UD_CB_LINK_NAME) != 0 && HDstrcmp(link_name, NEW_UD_CB_LINK_NAME) != 0)
         TEST_ERROR
-    if (HDstrcmp((const char *)udata, UD_CB_TARGET))
+    if (HDstrcmp((const char *)udata, UD_CB_TARGET) != 0)
         TEST_ERROR
     if (udata_size != UD_CB_TARGET_LEN)
         TEST_ERROR
@@ -14197,9 +14197,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))
+    if (HDstrcmp(new_name, NEW_UD_CB_LINK_NAME) != 0)
         TEST_ERROR
-    if (HDstrcmp((const char *)udata, UD_CB_TARGET))
+    if (HDstrcmp((const char *)udata, UD_CB_TARGET) != 0)
         TEST_ERROR
     if (udata_size != UD_CB_TARGET_LEN)
         TEST_ERROR
@@ -14221,9 +14221,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) && HDstrcmp(link_name, NEW_UD_CB_LINK_NAME))
+    if (HDstrcmp(link_name, UD_CB_LINK_NAME) != 0 && HDstrcmp(link_name, NEW_UD_CB_LINK_NAME) != 0)
         TEST_ERROR
-    if (HDstrcmp((const char *)udata, UD_CB_TARGET))
+    if (HDstrcmp((const char *)udata, UD_CB_TARGET) != 0)
         TEST_ERROR
     if (udata_size != UD_CB_TARGET_LEN)
         TEST_ERROR
@@ -14243,9 +14243,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))
+    if (HDstrcmp(link_name, UD_CB_LINK_NAME) != 0)
         TEST_ERROR
-    if (HDstrcmp((const char *)udata, UD_CB_TARGET))
+    if (HDstrcmp((const char *)udata, UD_CB_TARGET) != 0)
         TEST_ERROR
     if (udata_size != UD_CB_TARGET_LEN)
         TEST_ERROR
@@ -15077,7 +15077,7 @@ lapl_nlinks(hid_t fapl, hbool_t new_format)
     /* Check name */
     if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if (HDstrcmp(objname, "/soft17"))
+    if (HDstrcmp(objname, "/soft17") != 0)
         TEST_ERROR
 
     /* Create group using soft link */
@@ -15118,7 +15118,7 @@ lapl_nlinks(hid_t fapl, hbool_t new_format)
     /* Check name */
     if (H5Iget_name(gid, objname, (size_t)NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if (HDstrcmp(objname, "/soft4"))
+    if (HDstrcmp(objname, "/soft4") != 0)
         TEST_ERROR
 
     /* Test other functions that should use a LAPL */
@@ -15572,7 +15572,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))
+    if (HDstrcmp(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);
@@ -15763,7 +15763,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))
+    if (HDstrcmp(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);
@@ -16297,13 +16297,13 @@ link_filters(hid_t fapl, hbool_t 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) ||
+    if (flags_out != 0 || cd_value_out != cd_value || HDstrcmp(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) ||
+    if (flags_out != 0 || cd_value_out != cd_value || HDstrcmp(filter_class.name, name_out) != 0 ||
         filter_config_out != (H5Z_FILTER_CONFIG_ENCODE_ENABLED | H5Z_FILTER_CONFIG_DECODE_ENABLED))
         TEST_ERROR
 
@@ -16314,7 +16314,7 @@ link_filters(hid_t fapl, hbool_t 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) ||
+    if (flags_out != 0 || cd_value_out != cd_value || HDstrcmp(filter_class.name, name_out) != 0 ||
         filter_config_out != (H5Z_FILTER_CONFIG_ENCODE_ENABLED | H5Z_FILTER_CONFIG_DECODE_ENABLED))
         TEST_ERROR
 
@@ -17753,7 +17753,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t
         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))
+        if (HDstrcmp(valname, tmpval) != 0)
             TEST_ERROR
     } /* end if */
 
@@ -17762,7 +17762,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t
     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))
+    if (HDstrcmp(linkname, tmpname) != 0)
         TEST_ERROR
 
     /* Don't test "native" order if there is no creation order index, since
@@ -17792,7 +17792,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t
             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))
+            if (HDstrcmp(valname, tmpval) != 0)
                 TEST_ERROR
         } /* end if */
 
@@ -17801,7 +17801,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t
         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))
+        if (HDstrcmp(linkname, tmpname) != 0)
             TEST_ERROR
     } /* end if */
 
@@ -17826,7 +17826,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t
         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))
+        if (HDstrcmp(valname, tmpval) != 0)
             TEST_ERROR
     } /* end if */
 
@@ -17835,7 +17835,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t
     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))
+    if (HDstrcmp(linkname, tmpname) != 0)
         TEST_ERROR
 
     /* Verify the link information for first link, in increasing link name order */
@@ -17858,7 +17858,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t
         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))
+        if (HDstrcmp(valname, tmpval) != 0)
             TEST_ERROR
     } /* end if */
 
@@ -17867,7 +17867,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t
     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))
+    if (HDstrcmp(linkname, tmpname) != 0)
         TEST_ERROR
 
     /* Don't test "native" order queries on link name order, since there's not
@@ -17894,7 +17894,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t
         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))
+        if (HDstrcmp(valname, tmpval) != 0)
             TEST_ERROR
     } /* end if */
 
@@ -17903,7 +17903,7 @@ link_info_by_idx_check(hid_t group_id, const char *linkname, hsize_t n, hbool_t
     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))
+    if (HDstrcmp(linkname, tmpname) != 0)
         TEST_ERROR
 
     /* Success */
@@ -18260,7 +18260,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))
+                if (HDstrcmp(valname, tmpval) != 0)
                     TEST_ERROR
             } /* end else */
 
@@ -18268,7 +18268,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))
+            if (HDstrcmp(objname, tmpname) != 0)
                 TEST_ERROR
 
             /* Verify link information (in native order - native is increasing) */
@@ -18285,7 +18285,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))
+                if (HDstrcmp(valname, tmpval) != 0)
                     TEST_ERROR
             } /* end else */
 
@@ -18293,7 +18293,7 @@ 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))
+            if (HDstrcmp(objname, tmpname) != 0)
                 TEST_ERROR
 
             /* Make link name for decreasing order queries */
@@ -18316,7 +18316,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))
+                if (HDstrcmp(valname, tmpval) != 0)
                     TEST_ERROR
             } /* end else */
 
@@ -18324,7 +18324,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))
+            if (HDstrcmp(objname, tmpname) != 0)
                 TEST_ERROR
         } /* end for */
 
@@ -18548,7 +18548,7 @@ delete_by_idx(hid_t fapl)
                         HDsnprintf(objname, sizeof(objname), "filler %02u", (u + 1));
                     else
                         HDsnprintf(objname, sizeof(objname), "filler %02u", (max_compact - (u + 2)));
-                    if (HDstrcmp(objname, tmpname))
+                    if (HDstrcmp(objname, tmpname) != 0)
                         TEST_ERROR
                 } /* end for */
 
@@ -18622,7 +18622,7 @@ delete_by_idx(hid_t fapl)
                         HDsnprintf(objname, sizeof(objname), "filler %02u", (u + 1));
                     else
                         HDsnprintf(objname, sizeof(objname), "filler %02u", ((max_compact * 2) - (u + 2)));
-                    if (HDstrcmp(objname, tmpname))
+                    if (HDstrcmp(objname, tmpname) != 0)
                         TEST_ERROR
                 } /* end for */
 
@@ -18701,7 +18701,7 @@ delete_by_idx(hid_t fapl)
                     else
                         HDsnprintf(objname, sizeof(objname), "filler %02u",
                                    ((max_compact * 2) - ((u * 2) + 2)));
-                    if (HDstrcmp(objname, tmpname))
+                    if (HDstrcmp(objname, tmpname) != 0)
                         TEST_ERROR
                 } /* end for */
 
@@ -18735,7 +18735,7 @@ delete_by_idx(hid_t fapl)
                     else
                         HDsnprintf(objname, sizeof(objname), "filler %02u",
                                    ((max_compact * 2) - ((u * 2) + 4)));
-                    if (HDstrcmp(objname, tmpname))
+                    if (HDstrcmp(objname, tmpname) != 0)
                         TEST_ERROR
                 } /* end for */
 
@@ -18916,7 +18916,7 @@ delete_by_idx_old(hid_t fapl)
                 HDsnprintf(objname, sizeof(objname), "filler %02u", (u + 1));
             else
                 HDsnprintf(objname, sizeof(objname), "filler %02u", dec_u);
-            if (HDstrcmp(objname, tmpname))
+            if (HDstrcmp(objname, tmpname) != 0)
                 TEST_ERROR
         } /* end for */
 
@@ -18995,7 +18995,7 @@ delete_by_idx_old(hid_t fapl)
                 HDsnprintf(objname, sizeof(objname), "filler %02u", ((u * 2) + 1));
             else
                 HDsnprintf(objname, sizeof(objname), "filler %02u", dec_u);
-            if (HDstrcmp(objname, tmpname))
+            if (HDstrcmp(objname, tmpname) != 0)
                 TEST_ERROR
         } /* end for */
 
@@ -19033,7 +19033,7 @@ delete_by_idx_old(hid_t fapl)
                 HDsnprintf(objname, sizeof(objname), "filler %02u", ((u * 2) + 3));
             else
                 HDsnprintf(objname, sizeof(objname), "filler %02u", dec_u);
-            if (HDstrcmp(objname, tmpname))
+            if (HDstrcmp(objname, tmpname) != 0)
                 TEST_ERROR
         } /* end for */
 
@@ -19119,7 +19119,7 @@ link_iterate_cb(hid_t group_id, const char *link_name, const H5L_info2_t *info,
 
     /* Verify name of link */
     HDsnprintf(objname, sizeof(objname), "filler %02u", (unsigned)my_info.corder);
-    if (HDstrcmp(link_name, objname))
+    if (HDstrcmp(link_name, objname) != 0)
         return H5_ITER_ERROR;
 
     /* Check if we've visited this link before */
@@ -19625,7 +19625,7 @@ link_iterate_old_cb(hid_t group_id, const char *link_name, const H5L_info2_t *in
     /* 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))
+    if (HDstrcmp(link_name, objname) != 0)
         return H5_ITER_ERROR;
 
     /* Check if we've visited this link before */