VFD SWMR: Sync with develop (#811)

* Normalization with develop

* Removes checks and work-arounds for strtoll and strtoull (#769)

* Removes checks for (v)snprintf, which are C99 (#772)

* Update missing release note info. (#776)

* Replaces the H5_OVERRIDE macro with override (#773)

The macro is no longer necessary now that we require C++11.

* Cleans up some POSIX header bits in H5private.h (#783)

* Removes outdated checks for ways inline might be defined (#781)

These are obsolete now that we require C99.

* Removes checks for system(), which is C89/90 (#782)

* Removes C++ dependency on H5private.h (#774)

* Removes C++ dependency on H5private.h

Most C API calls have been removed, aside from a few uses of free,
where we just dropped the 'HD'. A couple of H5_ATTR_UNUSED macros
were also replaced with (void) statements.

* Committing clang-format changes

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Further simplifies Autotools type size checks (#789)

Also fixes an issue where clock_gettime and difftime are not detected
due to earlier simplifications of this code.

* Release Note (#784)

* Normalization of CMake H5pubconf.h with Autotools (#791)

Mostly just moving things around and changing the comments to keep the
delta small. The only symbol change is that for curl/curl.h which I
changed to H5_HAVE_CURL_CURL_H to match the Autotools. This symbol
is not used in the library and is just an artifact of the checks.

* Fix tools test (#794)

* Removes ancient Autotools cruft (#790)

* Reorganization of C and POSIX headers in H5public.h & H5private.h (#793)

* Reorganization of C and POSIX headers in H5public.h & H5private.h

Consolidated and removed duplicates

* It turns out Windows has sys/types.h

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

* Removes checks for signal and set/longjmp, which are C89 (#798)

Also removes checks for setjmp.h and stddef.h

* Assume frexpl/f and fabsl/f, which are C99 (#799)

* Assume the library has C99 types in C++ type code (#806)

* Assume the library has C99 types in C++ type code

* Committing clang-format changes

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Removes obsolete equivalents of C99's __func__ (#800)

* Cleans up POSIX/C bits in H5private.h (#804)

* Cleans up POSIX/C bits in H5private.h

* Assume difftime exists (C89)
* Reorg AC_CHECK_HEADERS so headers are in alphabetical order
* Split off networking-related AC_CHECK_HEADERS
* Remove unused UNAME_CYGWIN from configure.ac
* Remove checks for unused sys/timeb.h
* Tidying pass over H5private.h HD prefix macros
* Tidy H5win32defs.h
* Add HD prefix to various scanf calls

* Committing clang-format changes

* Fixes to the alarm(2) code used in the tests to make Windows happy

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Brings the tools getopt(3) replacement into the main library (#803)

* Moves get_option from the tools library to the C library

* Adds H5 prefix to get_option call and variables

* Renames the H5_get_option long options struct and enum

* Removes type guesses when C99 types are missing (#807)

* Assume C99 types exist in H5detect.c (#808)

* Fixes parallel issues from recent C99 changes

* Adds MPE FUNC --> __func__ changes missed in earlier PRs

* Fix typo

* Fixes parallel issues from recent C99 changes (#809)

* Fixes parallel issues from recent C99 changes

* Adds MPE FUNC --> __func__ changes missed in earlier PRs

* Even more missed FUNC --> __func__ macros

* Removes remaining H5_TIME_WITH_SYS_TIME cruft (#810)

Mostly from CMake

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Larry Knox <lrknox@hdfgroup.org>

1 files changed, 114 insertions, 112 deletions

diff --git a/tools/src/h5stat/h5stat.c b/tools/src/h5stat/h5stat.c
index 61f3365..b884b7e 100644
--- a/tools/src/h5stat/h5stat.c
+++ b/tools/src/h5stat/h5stat.c
@@ -171,106 +171,106 @@ struct handler_t {
 
 static const char *s_opts = "Aa:Ddm:EFfhGgl:sSTO:Vw:H:";
 /* e.g. "filemetadata" has to precede "file"; "groupmetadata" has to precede "group" etc. */
-static struct long_options l_opts[] = {{"help", no_arg, 'h'},
-                                       {"hel", no_arg, 'h'},
-                                       {"he", no_arg, 'h'},
-                                       {"filemetadata", no_arg, 'F'},
-                                       {"filemetadat", no_arg, 'F'},
-                                       {"filemetada", no_arg, 'F'},
-                                       {"filemetad", no_arg, 'F'},
-                                       {"filemeta", no_arg, 'F'},
-                                       {"filemet", no_arg, 'F'},
-                                       {"fileme", no_arg, 'F'},
-                                       {"filem", no_arg, 'F'},
-                                       {"file", no_arg, 'f'},
-                                       {"fil", no_arg, 'f'},
-                                       {"fi", no_arg, 'f'},
-                                       {"groupmetadata", no_arg, 'G'},
-                                       {"groupmetadat", no_arg, 'G'},
-                                       {"groupmetada", no_arg, 'G'},
-                                       {"groupmetad", no_arg, 'G'},
-                                       {"groupmeta", no_arg, 'G'},
-                                       {"groupmet", no_arg, 'G'},
-                                       {"groupme", no_arg, 'G'},
-                                       {"groupm", no_arg, 'G'},
-                                       {"group", no_arg, 'g'},
-                                       {"grou", no_arg, 'g'},
-                                       {"gro", no_arg, 'g'},
-                                       {"gr", no_arg, 'g'},
-                                       {"links", require_arg, 'l'},
-                                       {"link", require_arg, 'l'},
-                                       {"lin", require_arg, 'l'},
-                                       {"li", require_arg, 'l'},
-                                       {"dsetmetadata", no_arg, 'D'},
-                                       {"dsetmetadat", no_arg, 'D'},
-                                       {"dsetmetada", no_arg, 'D'},
-                                       {"dsetmetad", no_arg, 'D'},
-                                       {"dsetmeta", no_arg, 'D'},
-                                       {"dsetmet", no_arg, 'D'},
-                                       {"dsetme", no_arg, 'D'},
-                                       {"dsetm", no_arg, 'D'},
-                                       {"dset", no_arg, 'd'},
-                                       {"dse", no_arg, 'd'},
-                                       {"ds", no_arg, 'd'},
-                                       {"dims", require_arg, 'm'},
-                                       {"dim", require_arg, 'm'},
-                                       {"di", require_arg, 'm'},
-                                       {"dtypemetadata", no_arg, 'T'},
-                                       {"dtypemetadat", no_arg, 'T'},
-                                       {"dtypemetada", no_arg, 'T'},
-                                       {"dtypemetad", no_arg, 'T'},
-                                       {"dtypemeta", no_arg, 'T'},
-                                       {"dtypemet", no_arg, 'T'},
-                                       {"dtypeme", no_arg, 'T'},
-                                       {"dtypem", no_arg, 'T'},
-                                       {"dtype", no_arg, 'T'},
-                                       {"dtyp", no_arg, 'T'},
-                                       {"dty", no_arg, 'T'},
-                                       {"dt", no_arg, 'T'},
-                                       {"object", require_arg, 'O'},
-                                       {"objec", require_arg, 'O'},
-                                       {"obje", require_arg, 'O'},
-                                       {"obj", require_arg, 'O'},
-                                       {"ob", require_arg, 'O'},
-                                       {"version", no_arg, 'V'},
-                                       {"versio", no_arg, 'V'},
-                                       {"versi", no_arg, 'V'},
-                                       {"vers", no_arg, 'V'},
-                                       {"ver", no_arg, 'V'},
-                                       {"ve", no_arg, 'V'},
-                                       {"attribute", no_arg, 'A'},
-                                       {"attribut", no_arg, 'A'},
-                                       {"attribu", no_arg, 'A'},
-                                       {"attrib", no_arg, 'A'},
-                                       {"attri", no_arg, 'A'},
-                                       {"attr", no_arg, 'A'},
-                                       {"att", no_arg, 'A'},
-                                       {"at", no_arg, 'A'},
-                                       {"enable-error-stack", no_arg, 'E'},
-                                       {"numattrs", require_arg, 'a'},
-                                       {"numattr", require_arg, 'a'},
-                                       {"numatt", require_arg, 'a'},
-                                       {"numat", require_arg, 'a'},
-                                       {"numa", require_arg, 'a'},
-                                       {"num", require_arg, 'a'},
-                                       {"nu", require_arg, 'a'},
-                                       {"freespace", no_arg, 's'},
-                                       {"freespac", no_arg, 's'},
-                                       {"freespa", no_arg, 's'},
-                                       {"freesp", no_arg, 's'},
-                                       {"frees", no_arg, 's'},
-                                       {"free", no_arg, 's'},
-                                       {"fre", no_arg, 's'},
-                                       {"fr", no_arg, 's'},
-                                       {"summary", no_arg, 'S'},
-                                       {"summar", no_arg, 'S'},
-                                       {"summa", no_arg, 'S'},
-                                       {"summ", no_arg, 'S'},
-                                       {"sum", no_arg, 'S'},
-                                       {"su", no_arg, 'S'},
-                                       {"s3-cred", require_arg, 'w'},
-                                       {"hdfs-attrs", require_arg, 'H'},
-                                       {NULL, 0, '\0'}};
+static struct h5_long_options l_opts[] = {{"help", no_arg, 'h'},
+                                          {"hel", no_arg, 'h'},
+                                          {"he", no_arg, 'h'},
+                                          {"filemetadata", no_arg, 'F'},
+                                          {"filemetadat", no_arg, 'F'},
+                                          {"filemetada", no_arg, 'F'},
+                                          {"filemetad", no_arg, 'F'},
+                                          {"filemeta", no_arg, 'F'},
+                                          {"filemet", no_arg, 'F'},
+                                          {"fileme", no_arg, 'F'},
+                                          {"filem", no_arg, 'F'},
+                                          {"file", no_arg, 'f'},
+                                          {"fil", no_arg, 'f'},
+                                          {"fi", no_arg, 'f'},
+                                          {"groupmetadata", no_arg, 'G'},
+                                          {"groupmetadat", no_arg, 'G'},
+                                          {"groupmetada", no_arg, 'G'},
+                                          {"groupmetad", no_arg, 'G'},
+                                          {"groupmeta", no_arg, 'G'},
+                                          {"groupmet", no_arg, 'G'},
+                                          {"groupme", no_arg, 'G'},
+                                          {"groupm", no_arg, 'G'},
+                                          {"group", no_arg, 'g'},
+                                          {"grou", no_arg, 'g'},
+                                          {"gro", no_arg, 'g'},
+                                          {"gr", no_arg, 'g'},
+                                          {"links", require_arg, 'l'},
+                                          {"link", require_arg, 'l'},
+                                          {"lin", require_arg, 'l'},
+                                          {"li", require_arg, 'l'},
+                                          {"dsetmetadata", no_arg, 'D'},
+                                          {"dsetmetadat", no_arg, 'D'},
+                                          {"dsetmetada", no_arg, 'D'},
+                                          {"dsetmetad", no_arg, 'D'},
+                                          {"dsetmeta", no_arg, 'D'},
+                                          {"dsetmet", no_arg, 'D'},
+                                          {"dsetme", no_arg, 'D'},
+                                          {"dsetm", no_arg, 'D'},
+                                          {"dset", no_arg, 'd'},
+                                          {"dse", no_arg, 'd'},
+                                          {"ds", no_arg, 'd'},
+                                          {"dims", require_arg, 'm'},
+                                          {"dim", require_arg, 'm'},
+                                          {"di", require_arg, 'm'},
+                                          {"dtypemetadata", no_arg, 'T'},
+                                          {"dtypemetadat", no_arg, 'T'},
+                                          {"dtypemetada", no_arg, 'T'},
+                                          {"dtypemetad", no_arg, 'T'},
+                                          {"dtypemeta", no_arg, 'T'},
+                                          {"dtypemet", no_arg, 'T'},
+                                          {"dtypeme", no_arg, 'T'},
+                                          {"dtypem", no_arg, 'T'},
+                                          {"dtype", no_arg, 'T'},
+                                          {"dtyp", no_arg, 'T'},
+                                          {"dty", no_arg, 'T'},
+                                          {"dt", no_arg, 'T'},
+                                          {"object", require_arg, 'O'},
+                                          {"objec", require_arg, 'O'},
+                                          {"obje", require_arg, 'O'},
+                                          {"obj", require_arg, 'O'},
+                                          {"ob", require_arg, 'O'},
+                                          {"version", no_arg, 'V'},
+                                          {"versio", no_arg, 'V'},
+                                          {"versi", no_arg, 'V'},
+                                          {"vers", no_arg, 'V'},
+                                          {"ver", no_arg, 'V'},
+                                          {"ve", no_arg, 'V'},
+                                          {"attribute", no_arg, 'A'},
+                                          {"attribut", no_arg, 'A'},
+                                          {"attribu", no_arg, 'A'},
+                                          {"attrib", no_arg, 'A'},
+                                          {"attri", no_arg, 'A'},
+                                          {"attr", no_arg, 'A'},
+                                          {"att", no_arg, 'A'},
+                                          {"at", no_arg, 'A'},
+                                          {"enable-error-stack", no_arg, 'E'},
+                                          {"numattrs", require_arg, 'a'},
+                                          {"numattr", require_arg, 'a'},
+                                          {"numatt", require_arg, 'a'},
+                                          {"numat", require_arg, 'a'},
+                                          {"numa", require_arg, 'a'},
+                                          {"num", require_arg, 'a'},
+                                          {"nu", require_arg, 'a'},
+                                          {"freespace", no_arg, 's'},
+                                          {"freespac", no_arg, 's'},
+                                          {"freespa", no_arg, 's'},
+                                          {"freesp", no_arg, 's'},
+                                          {"frees", no_arg, 's'},
+                                          {"free", no_arg, 's'},
+                                          {"fre", no_arg, 's'},
+                                          {"fr", no_arg, 's'},
+                                          {"summary", no_arg, 'S'},
+                                          {"summar", no_arg, 'S'},
+                                          {"summa", no_arg, 'S'},
+                                          {"summ", no_arg, 'S'},
+                                          {"sum", no_arg, 'S'},
+                                          {"su", no_arg, 'S'},
+                                          {"s3-cred", require_arg, 'w'},
+                                          {"hdfs-attrs", require_arg, 'H'},
+                                          {NULL, 0, '\0'}};
 
 static void
 leave(int ret)
@@ -920,7 +920,7 @@ parse_command_line(int argc, const char *argv[], struct handler_t **hand_ret)
     struct handler_t *hand = NULL;
 
     /* parse command line options */
-    while ((opt = get_option(argc, argv, s_opts, l_opts)) != EOF) {
+    while ((opt = H5_get_option(argc, argv, s_opts, l_opts)) != EOF) {
         switch ((char)opt) {
             case 'h':
                 usage(h5tools_getprogname());
@@ -959,8 +959,8 @@ parse_command_line(int argc, const char *argv[], struct handler_t **hand_ret)
                 break;
 
             case 'l':
-                if (opt_arg) {
-                    sgroups_threshold = HDatoi(opt_arg);
+                if (H5_optarg) {
+                    sgroups_threshold = HDatoi(H5_optarg);
                     if (sgroups_threshold < 1) {
                         error_msg("Invalid threshold for small groups\n");
                         goto error;
@@ -982,8 +982,8 @@ parse_command_line(int argc, const char *argv[], struct handler_t **hand_ret)
                 break;
 
             case 'm':
-                if (opt_arg) {
-                    sdsets_threshold = HDatoi(opt_arg);
+                if (H5_optarg) {
+                    sdsets_threshold = HDatoi(H5_optarg);
                     if (sdsets_threshold < 1) {
                         error_msg("Invalid threshold for small datasets\n");
                         goto error;
@@ -1005,8 +1005,8 @@ parse_command_line(int argc, const char *argv[], struct handler_t **hand_ret)
                 break;
 
             case 'a':
-                if (opt_arg) {
-                    sattrs_threshold = HDatoi(opt_arg);
+                if (H5_optarg) {
+                    sattrs_threshold = HDatoi(H5_optarg);
                     if (sattrs_threshold < 1) {
                         error_msg("Invalid threshold for small # of attributes\n");
                         goto error;
@@ -1046,7 +1046,7 @@ parse_command_line(int argc, const char *argv[], struct handler_t **hand_ret)
 
                 /* Store object names */
                 for (u = 0; u < hand->obj_count; u++)
-                    if (NULL == (hand->obj[u] = HDstrdup(opt_arg))) {
+                    if (NULL == (hand->obj[u] = HDstrdup(H5_optarg))) {
                         error_msg("unable to allocate memory for object name\n");
                         goto error;
                     } /* end if */
@@ -1054,7 +1054,7 @@ parse_command_line(int argc, const char *argv[], struct handler_t **hand_ret)
 
             case 'w':
 #ifdef H5_HAVE_ROS3_VFD
-                if (h5tools_parse_ros3_fapl_tuple(opt_arg, ',', &ros3_fa) < 0) {
+                if (h5tools_parse_ros3_fapl_tuple(H5_optarg, ',', &ros3_fa) < 0) {
                     error_msg("failed to parse S3 VFD credential info\n");
                     goto error;
                 }
@@ -1068,7 +1068,7 @@ parse_command_line(int argc, const char *argv[], struct handler_t **hand_ret)
 
             case 'H':
 #ifdef H5_HAVE_LIBHDFS
-                if (h5tools_parse_hdfs_fapl_tuple(opt_arg, ',', &hdfs_fa) < 0) {
+                if (h5tools_parse_hdfs_fapl_tuple(H5_optarg, ',', &hdfs_fa) < 0) {
                     error_msg("failed to parse HDFS VFD configuration info\n");
                     goto error;
                 }
@@ -1087,7 +1087,7 @@ parse_command_line(int argc, const char *argv[], struct handler_t **hand_ret)
     }     /* end while */
 
     /* check for file name to be processed */
-    if (argc <= opt_ind) {
+    if (argc <= H5_optind) {
         error_msg("missing file name\n");
         usage(h5tools_getprogname());
         goto error;
@@ -1779,7 +1779,7 @@ main(int argc, const char *argv[])
     if (parse_command_line(argc, argv, &hand) < 0)
         goto done;
 
-    fname = argv[opt_ind];
+    fname = argv[H5_optind];
 
     /* enable error reporting if command line option */
     h5tools_error_report();
@@ -1814,6 +1814,8 @@ main(int argc, const char *argv[])
         }
     }
 
+    fname = argv[H5_optind];
+
     /* Check for filename given */
     if (fname) {
         hid_t       fcpl;