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, 30 insertions, 30 deletions

diff --git a/tools/src/h5format_convert/h5format_convert.c b/tools/src/h5format_convert/h5format_convert.c
index 321f274..3430c55 100644
--- a/tools/src/h5format_convert/h5format_convert.c
+++ b/tools/src/h5format_convert/h5format_convert.c
@@ -38,28 +38,28 @@ static int   verbose_g = 0;
  * Command-line options: The user can specify short or long-named
  * parameters.
  */
-static const char *        s_opts   = "hVvd:n";
-static struct long_options l_opts[] = {{"help", no_arg, 'h'},
-                                       {"hel", no_arg, 'h'},
-                                       {"he", no_arg, 'h'},
-                                       {"version", no_arg, 'V'},
-                                       {"version", no_arg, 'V'},
-                                       {"versio", no_arg, 'V'},
-                                       {"versi", no_arg, 'V'},
-                                       {"vers", no_arg, 'V'},
-                                       {"verbose", no_arg, 'v'},
-                                       {"verbos", no_arg, 'v'},
-                                       {"verbo", no_arg, 'v'},
-                                       {"verb", no_arg, 'v'},
-                                       {"dname", require_arg, 'd'},
-                                       {"dnam", require_arg, 'd'},
-                                       {"dna", require_arg, 'd'},
-                                       {"dn", require_arg, 'd'},
-                                       {"noop", no_arg, 'n'},
-                                       {"noo", no_arg, 'n'},
-                                       {"no", no_arg, 'n'},
-                                       {"enable-error-stack", no_arg, 'E'},
-                                       {NULL, 0, '\0'}};
+static const char *           s_opts   = "hVvd:n";
+static struct h5_long_options l_opts[] = {{"help", no_arg, 'h'},
+                                          {"hel", no_arg, 'h'},
+                                          {"he", no_arg, 'h'},
+                                          {"version", no_arg, 'V'},
+                                          {"version", no_arg, 'V'},
+                                          {"versio", no_arg, 'V'},
+                                          {"versi", no_arg, 'V'},
+                                          {"vers", no_arg, 'V'},
+                                          {"verbose", no_arg, 'v'},
+                                          {"verbos", no_arg, 'v'},
+                                          {"verbo", no_arg, 'v'},
+                                          {"verb", no_arg, 'v'},
+                                          {"dname", require_arg, 'd'},
+                                          {"dnam", require_arg, 'd'},
+                                          {"dna", require_arg, 'd'},
+                                          {"dn", require_arg, 'd'},
+                                          {"noop", no_arg, 'n'},
+                                          {"noo", no_arg, 'n'},
+                                          {"no", no_arg, 'n'},
+                                          {"enable-error-stack", no_arg, 'E'},
+                                          {NULL, 0, '\0'}};
 
 /*-------------------------------------------------------------------------
  * Function: usage
@@ -123,7 +123,7 @@ parse_command_line(int argc, const char **argv)
     }
 
     /* 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());
@@ -140,11 +140,11 @@ parse_command_line(int argc, const char **argv)
                 break;
 
             case 'd': /* -d dname */
-                if (opt_arg != NULL && *opt_arg)
-                    dname_g = HDstrdup(opt_arg);
+                if (H5_optarg != NULL && *H5_optarg)
+                    dname_g = HDstrdup(H5_optarg);
                 if (dname_g == NULL) {
                     h5tools_setstatus(EXIT_FAILURE);
-                    error_msg("No dataset name\n", opt_arg);
+                    error_msg("No dataset name\n", H5_optarg);
                     usage(h5tools_getprogname());
                     goto error;
                 }
@@ -167,19 +167,19 @@ parse_command_line(int argc, const char **argv)
         } /* switch */
     }     /* while */
 
-    if (argc <= opt_ind) {
+    if (argc <= H5_optind) {
         error_msg("missing file name\n");
         usage(h5tools_getprogname());
         h5tools_setstatus(EXIT_FAILURE);
         goto error;
     }
 
-    fname_g = HDstrdup(argv[opt_ind]);
+    fname_g = HDstrdup(argv[H5_optind]);
 
-    return (0);
+    return 0;
 
 error:
-    return (-1);
+    return -1;
     ;
 } /* parse_command_line() */