From ee5d2e1d032b0bf3bb6911e946dbd9ae00cf530a Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Tue, 27 Jun 2023 22:11:03 -0700 Subject: [PATCH 1/2] Rename HDsystem() to system() system() is only used in the iopipe test and the things it calls (which are POSIX-y) are protected by an ifdef. --- src/H5private.h | 3 --- tools/test/perform/iopipe.c | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/H5private.h b/src/H5private.h index ec0604ba830..59b58e9c5ab 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -1173,9 +1173,6 @@ H5_DLL H5_ATTR_CONST int Nflock(int fd, int operation); #ifndef HDsymlink #define HDsymlink(F1, F2) symlink(F1, F2) #endif -#ifndef HDsystem -#define HDsystem(S) system(S) -#endif #ifndef HDtime #define HDtime(T) time(T) #endif diff --git a/tools/test/perform/iopipe.c b/tools/test/perform/iopipe.c index c61e6a91b31..3b14af8185a 100644 --- a/tools/test/perform/iopipe.c +++ b/tools/test/perform/iopipe.c @@ -99,10 +99,10 @@ synchronize(void) #else int H5_ATTR_NDEBUG_UNUSED status; - status = HDsystem("sync"); + status = system("sync"); HDassert(status >= 0); - status = HDsystem("df >/dev/null"); + status = system("df >/dev/null"); HDassert(status >= 0); #endif } From d2ab381e8b2c4c763d54a88e01d028f04564bd94 Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Wed, 28 Jun 2023 12:11:57 -0700 Subject: [PATCH 2/2] Fixed a rogue HDqsort --- c++/test/titerate.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/c++/test/titerate.cpp b/c++/test/titerate.cpp index 5d20f80e9f5..70eb25f2a57 100644 --- a/c++/test/titerate.cpp +++ b/c++/test/titerate.cpp @@ -179,7 +179,7 @@ test_iter_group(FileAccPropList &fapl) check_values(lnames[NDATASETS], "HDstrdup returns NULL", __LINE__, __FILE__); /* Sort the dataset names */ - HDqsort(lnames, NDATASETS + 2, sizeof(char *), iter_strcmp); + qsort(lnames, NDATASETS + 2, sizeof(char *), iter_strcmp); /* Iterate through the datasets in the root group in various ways */