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

1 files changed, 66 insertions, 66 deletions

diff --git a/tools/test/perform/zip_perf.c b/tools/test/perform/zip_perf.c
index 517866b..6231587 100644
--- a/tools/test/perform/zip_perf.c
+++ b/tools/test/perform/zip_perf.c
@@ -64,66 +64,66 @@ static void error(const char *fmt, ...);
 static void compress_buffer(Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen);
 
 /* commandline options : long and short form */
-static const char *        s_opts   = "hB:b:c:p:rs:0123456789";
-static struct long_options l_opts[] = {{"help", no_arg, 'h'},
-                                       {"compressability", require_arg, 'c'},
-                                       {"compressabilit", require_arg, 'c'},
-                                       {"compressabili", require_arg, 'c'},
-                                       {"compressabil", require_arg, 'c'},
-                                       {"compressabi", require_arg, 'c'},
-                                       {"compressab", require_arg, 'c'},
-                                       {"compressa", require_arg, 'c'},
-                                       {"compress", require_arg, 'c'},
-                                       {"compres", require_arg, 'c'},
-                                       {"compre", require_arg, 'c'},
-                                       {"compr", require_arg, 'c'},
-                                       {"comp", require_arg, 'c'},
-                                       {"com", require_arg, 'c'},
-                                       {"co", require_arg, 'c'},
-                                       {"file-size", require_arg, 's'},
-                                       {"file-siz", require_arg, 's'},
-                                       {"file-si", require_arg, 's'},
-                                       {"file-s", require_arg, 's'},
-                                       {"file", require_arg, 's'},
-                                       {"fil", require_arg, 's'},
-                                       {"fi", require_arg, 's'},
-                                       {"max-buffer-size", require_arg, 'B'},
-                                       {"max-buffer-siz", require_arg, 'B'},
-                                       {"max-buffer-si", require_arg, 'B'},
-                                       {"max-buffer-s", require_arg, 'B'},
-                                       {"max-buffer", require_arg, 'B'},
-                                       {"max-buffe", require_arg, 'B'},
-                                       {"max-buff", require_arg, 'B'},
-                                       {"max-buf", require_arg, 'B'},
-                                       {"max-bu", require_arg, 'B'},
-                                       {"max-b", require_arg, 'B'},
-                                       {"max", require_arg, 'B'},
-                                       {"min-buffer-size", require_arg, 'b'},
-                                       {"min-buffer-siz", require_arg, 'b'},
-                                       {"min-buffer-si", require_arg, 'b'},
-                                       {"min-buffer-s", require_arg, 'b'},
-                                       {"min-buffer", require_arg, 'b'},
-                                       {"min-buffe", require_arg, 'b'},
-                                       {"min-buff", require_arg, 'b'},
-                                       {"min-buf", require_arg, 'b'},
-                                       {"min-bu", require_arg, 'b'},
-                                       {"min-b", require_arg, 'b'},
-                                       {"min", require_arg, 'b'},
-                                       {"prefix", require_arg, 'p'},
-                                       {"prefi", require_arg, 'p'},
-                                       {"pref", require_arg, 'p'},
-                                       {"pre", require_arg, 'p'},
-                                       {"pr", require_arg, 'p'},
-                                       {"random-test", no_arg, 'r'},
-                                       {"random-tes", no_arg, 'r'},
-                                       {"random-te", no_arg, 'r'},
-                                       {"random-t", no_arg, 'r'},
-                                       {"random", no_arg, 'r'},
-                                       {"rando", no_arg, 'r'},
-                                       {"rand", no_arg, 'r'},
-                                       {"ran", no_arg, 'r'},
-                                       {"ra", no_arg, 'r'},
-                                       {NULL, 0, '\0'}};
+static const char *           s_opts   = "hB:b:c:p:rs:0123456789";
+static struct h5_long_options l_opts[] = {{"help", no_arg, 'h'},
+                                          {"compressability", require_arg, 'c'},
+                                          {"compressabilit", require_arg, 'c'},
+                                          {"compressabili", require_arg, 'c'},
+                                          {"compressabil", require_arg, 'c'},
+                                          {"compressabi", require_arg, 'c'},
+                                          {"compressab", require_arg, 'c'},
+                                          {"compressa", require_arg, 'c'},
+                                          {"compress", require_arg, 'c'},
+                                          {"compres", require_arg, 'c'},
+                                          {"compre", require_arg, 'c'},
+                                          {"compr", require_arg, 'c'},
+                                          {"comp", require_arg, 'c'},
+                                          {"com", require_arg, 'c'},
+                                          {"co", require_arg, 'c'},
+                                          {"file-size", require_arg, 's'},
+                                          {"file-siz", require_arg, 's'},
+                                          {"file-si", require_arg, 's'},
+                                          {"file-s", require_arg, 's'},
+                                          {"file", require_arg, 's'},
+                                          {"fil", require_arg, 's'},
+                                          {"fi", require_arg, 's'},
+                                          {"max-buffer-size", require_arg, 'B'},
+                                          {"max-buffer-siz", require_arg, 'B'},
+                                          {"max-buffer-si", require_arg, 'B'},
+                                          {"max-buffer-s", require_arg, 'B'},
+                                          {"max-buffer", require_arg, 'B'},
+                                          {"max-buffe", require_arg, 'B'},
+                                          {"max-buff", require_arg, 'B'},
+                                          {"max-buf", require_arg, 'B'},
+                                          {"max-bu", require_arg, 'B'},
+                                          {"max-b", require_arg, 'B'},
+                                          {"max", require_arg, 'B'},
+                                          {"min-buffer-size", require_arg, 'b'},
+                                          {"min-buffer-siz", require_arg, 'b'},
+                                          {"min-buffer-si", require_arg, 'b'},
+                                          {"min-buffer-s", require_arg, 'b'},
+                                          {"min-buffer", require_arg, 'b'},
+                                          {"min-buffe", require_arg, 'b'},
+                                          {"min-buff", require_arg, 'b'},
+                                          {"min-buf", require_arg, 'b'},
+                                          {"min-bu", require_arg, 'b'},
+                                          {"min-b", require_arg, 'b'},
+                                          {"min", require_arg, 'b'},
+                                          {"prefix", require_arg, 'p'},
+                                          {"prefi", require_arg, 'p'},
+                                          {"pref", require_arg, 'p'},
+                                          {"pre", require_arg, 'p'},
+                                          {"pr", require_arg, 'p'},
+                                          {"random-test", no_arg, 'r'},
+                                          {"random-tes", no_arg, 'r'},
+                                          {"random-te", no_arg, 'r'},
+                                          {"random-t", no_arg, 'r'},
+                                          {"random", no_arg, 'r'},
+                                          {"rando", no_arg, 'r'},
+                                          {"rand", no_arg, 'r'},
+                                          {"ran", no_arg, 'r'},
+                                          {"ra", no_arg, 'r'},
+                                          {NULL, 0, '\0'}};
 
 /*
  * Function:    error
@@ -551,7 +551,7 @@ main(int argc, const char *argv[])
     /* Initialize h5tools lib */
     h5tools_init();
 
-    while ((opt = get_option(argc, argv, s_opts, l_opts)) > 0) {
+    while ((opt = H5_get_option(argc, argv, s_opts, l_opts)) > 0) {
         switch ((char)opt) {
             case '0':
             case '1':
@@ -566,13 +566,13 @@ main(int argc, const char *argv[])
                 compress_level = opt - '0';
                 break;
             case 'B':
-                max_buf_size = parse_size_directive(opt_arg);
+                max_buf_size = parse_size_directive(H5_optarg);
                 break;
             case 'b':
-                min_buf_size = parse_size_directive(opt_arg);
+                min_buf_size = parse_size_directive(H5_optarg);
                 break;
             case 'c':
-                compress_percent = (int)HDstrtol(opt_arg, NULL, 10);
+                compress_percent = (int)HDstrtol(H5_optarg, NULL, 10);
 
                 if (compress_percent < 0)
                     compress_percent = 0;
@@ -581,13 +581,13 @@ main(int argc, const char *argv[])
 
                 break;
             case 'p':
-                option_prefix = opt_arg;
+                option_prefix = H5_optarg;
                 break;
             case 'r':
                 random_test = TRUE;
                 break;
             case 's':
-                file_size = parse_size_directive(opt_arg);
+                file_size = parse_size_directive(H5_optarg);
                 break;
             case '?':
                 usage();