From c0b59eda9a3481038500d1621813648e2a044a19 Mon Sep 17 00:00:00 2001
From: "David M. Syzdek" <david@syzdek.net>
Date: Tue, 8 Mar 2022 17:08:38 -0900
Subject: libtinyrad: replacing TRAD_TEST_VERBOSE with TRUTILS_OPT_VERBOSE

---
 tests/common.c               | 28 ++++++++++++++--------------
 tests/common.h               |  1 -
 tests/test-array-queue.c     |  4 ++--
 tests/test-array-sorted.c    |  4 ++--
 tests/test-array-stack.c     |  4 ++--
 tests/test-assertions.c      |  6 +++---
 tests/test-assumptions.c     |  6 +++---
 tests/test-dict-attrs.c      |  4 ++--
 tests/test-dict-values.c     |  4 ++--
 tests/test-dict-vendors.c    |  4 ++--
 tests/test-oid-str.c         |  4 ++--
 tests/test-options.c         |  4 ++--
 tests/test-pckt-byte-order.c | 28 ++++++++++++++--------------
 tests/test-url-desc2str.c    |  4 ++--
 tests/test-url-parse.c       |  4 ++--
 tests/test-url-resolve.c     |  4 ++--
 16 files changed, 56 insertions(+), 57 deletions(-)

(limited to 'tests')

diff --git a/tests/common.c b/tests/common.c
index 0b75c3e..66516f5 100644
--- a/tests/common.c
+++ b/tests/common.c
@@ -401,11 +401,11 @@ int our_urldesc_test(const char * url, unsigned opts)
    // initial check
    if ((opts & TRAD_TEST_CHECK))
    {
-      if ((opts & TRAD_TEST_VERBOSE))
+      if ((opts & TRUTILS_OPT_VERBOSE))
          printf("   tinyrad_is_radius_url() ...\n");
       if (tinyrad_is_radius_url(url) != TRAD_SUCCESS)
       {
-         if ((opts & TRAD_TEST_VERBOSE))
+         if ((opts & TRUTILS_OPT_VERBOSE))
             printf(">>> syntax error\n");
          return(1);
       };
@@ -414,11 +414,11 @@ int our_urldesc_test(const char * url, unsigned opts)
    // parse URL
    if (!(opts & TRAD_TEST_PARSE))
       return(0);
-   if ((opts & TRAD_TEST_VERBOSE))
+   if ((opts & TRUTILS_OPT_VERBOSE))
       printf("   tinyrad_urldesc_parse() ...\n");
    if (tinyrad_urldesc_parse(url, &trudp) != TRAD_SUCCESS)
    {
-      if ((opts & TRAD_TEST_VERBOSE))
+      if ((opts & TRUTILS_OPT_VERBOSE))
          printf(">>> syntax error\n");
       return(1);
    };
@@ -426,20 +426,20 @@ int our_urldesc_test(const char * url, unsigned opts)
    // test regenerating URL string
    if ((opts & TRAD_TEST_DESC2STR))
    {
-      if ((opts & TRAD_TEST_VERBOSE))
+      if ((opts & TRUTILS_OPT_VERBOSE))
          printf("   tinyrad_urldesc2str() ...\n");
       if ((str = tinyrad_urldesc2str(trudp)) == NULL)
       {
-         if ((opts & TRAD_TEST_VERBOSE))
+         if ((opts & TRUTILS_OPT_VERBOSE))
             printf(">>> error generating URL\n");
          tinyrad_urldesc_free(trudp);
          return(1);
       };
-      if ((opts & TRAD_TEST_VERBOSE))
+      if ((opts & TRUTILS_OPT_VERBOSE))
          printf("   strcasecmp(url, \"%s\") ...\n", str);
       if ((strcasecmp(url, str)))
       {
-         if ((opts & TRAD_TEST_VERBOSE))
+         if ((opts & TRUTILS_OPT_VERBOSE))
             printf(">>> generated URL does not match original URL\n");
          tinyrad_free(str);
          return(1);
@@ -450,11 +450,11 @@ int our_urldesc_test(const char * url, unsigned opts)
    // resolve URL
    if ((opts & TRAD_TEST_RESOLVE))
    {
-      if ((opts & TRAD_TEST_VERBOSE))
+      if ((opts & TRUTILS_OPT_VERBOSE))
          printf("   tinyrad_urldesc_resolve() ...\n");
       if (tinyrad_urldesc_resolve(trudp, 0) != TRAD_SUCCESS)
       {
-         if ((opts & TRAD_TEST_VERBOSE))
+         if ((opts & TRUTILS_OPT_VERBOSE))
             printf(">>> error resolving URL\n");
          tinyrad_urldesc_free(trudp);
          return(1);
@@ -468,7 +468,7 @@ int our_urldesc_test(const char * url, unsigned opts)
 
 int our_urldesc_test_bad(const char * url, unsigned opts)
 {
-   if ((opts & TRAD_TEST_VERBOSE))
+   if ((opts & TRUTILS_OPT_VERBOSE))
       printf("testing bad url: \"%s\" ...\n", url);
    if ((our_urldesc_test(url, opts)))
       return(0);
@@ -478,7 +478,7 @@ int our_urldesc_test_bad(const char * url, unsigned opts)
 
 int our_urldesc_test_good(const char * url, unsigned opts)
 {
-   if ((opts & TRAD_TEST_VERBOSE))
+   if ((opts & TRUTILS_OPT_VERBOSE))
       printf("testing good url: \"%s\" ...\n", url);
    if ((our_urldesc_test(url, opts)))
       return(1);
@@ -496,7 +496,7 @@ int our_error(unsigned opts, char ** errs, const char * fmt, ...)
    int     pos;
    va_list args;
 
-   if ( ((opts & TRUTILS_OPT_QUIET)) && ((opts & TRAD_TEST_VERBOSE)) )
+   if ( ((opts & TRUTILS_OPT_QUIET)) && ((opts & TRUTILS_OPT_VERBOSE)) )
       return(1);
 
    if ((errs))
@@ -530,7 +530,7 @@ void our_print(unsigned opts, const char * fmt, ...)
 void our_verbose(unsigned opts, const char * fmt, ...)
 {
    va_list args;
-   if (!(opts & TRAD_TEST_VERBOSE))
+   if (!(opts & TRUTILS_OPT_VERBOSE))
       return;
    printf("%s: ", program_name);
    va_start(args, fmt);
diff --git a/tests/common.h b/tests/common.h
index ec765d8..1e3ba57 100644
--- a/tests/common.h
+++ b/tests/common.h
@@ -57,7 +57,6 @@
 ///////////////////
 #pragma mark - Definitions
 
-#define TRAD_TEST_VERBOSE     0x0001UL
 #define TRAD_TEST_RESOLVE     0x0002UL
 #define TRAD_TEST_DESC2STR    0x0004UL
 #define TRAD_TEST_PARSE       0x0008UL
diff --git a/tests/test-array-queue.c b/tests/test-array-queue.c
index f19a3ce..98547bc 100644
--- a/tests/test-array-queue.c
+++ b/tests/test-array-queue.c
@@ -178,7 +178,7 @@ int main( int argc, char * argv[] )
 
          case 'q':
          opts |=  TRUTILS_OPT_QUIET;
-         opts &= ~TRAD_TEST_VERBOSE;
+         opts &= ~TRUTILS_OPT_VERBOSE;
          break;
 
          case 'V':
@@ -186,7 +186,7 @@ int main( int argc, char * argv[] )
          return(0);
 
          case 'v':
-         opts |=  TRAD_TEST_VERBOSE;
+         opts |=  TRUTILS_OPT_VERBOSE;
          opts &= ~TRUTILS_OPT_QUIET;
          break;
 
diff --git a/tests/test-array-sorted.c b/tests/test-array-sorted.c
index e4aed76..a6d277f 100644
--- a/tests/test-array-sorted.c
+++ b/tests/test-array-sorted.c
@@ -247,7 +247,7 @@ int main( int argc, char * argv[] )
 
          case 'q':
          opts |=  TRUTILS_OPT_QUIET;
-         opts &= ~TRAD_TEST_VERBOSE;
+         opts &= ~TRUTILS_OPT_VERBOSE;
          break;
 
          case 'V':
@@ -255,7 +255,7 @@ int main( int argc, char * argv[] )
          return(0);
 
          case 'v':
-         opts |=  TRAD_TEST_VERBOSE;
+         opts |=  TRUTILS_OPT_VERBOSE;
          opts &= ~TRUTILS_OPT_QUIET;
          break;
 
diff --git a/tests/test-array-stack.c b/tests/test-array-stack.c
index f3f885f..6c36a8e 100644
--- a/tests/test-array-stack.c
+++ b/tests/test-array-stack.c
@@ -178,7 +178,7 @@ int main( int argc, char * argv[] )
 
          case 'q':
          opts |=  TRUTILS_OPT_QUIET;
-         opts &= ~TRAD_TEST_VERBOSE;
+         opts &= ~TRUTILS_OPT_VERBOSE;
          break;
 
          case 'V':
@@ -186,7 +186,7 @@ int main( int argc, char * argv[] )
          return(0);
 
          case 'v':
-         opts |=  TRAD_TEST_VERBOSE;
+         opts |=  TRUTILS_OPT_VERBOSE;
          opts &= ~TRUTILS_OPT_QUIET;
          break;
 
diff --git a/tests/test-assertions.c b/tests/test-assertions.c
index 291d9bf..f4aa426 100644
--- a/tests/test-assertions.c
+++ b/tests/test-assertions.c
@@ -130,7 +130,7 @@ main(
 
          case 'q':
          opts |=  TRUTILS_OPT_QUIET;
-         opts &= ~TRAD_TEST_VERBOSE;
+         opts &= ~TRUTILS_OPT_VERBOSE;
          break;
 
          case 'V':
@@ -138,7 +138,7 @@ main(
          return(0);
 
          case 'v':
-         opts |=  TRAD_TEST_VERBOSE;
+         opts |=  TRUTILS_OPT_VERBOSE;
          opts &= ~TRUTILS_OPT_QUIET;
          break;
 
@@ -155,7 +155,7 @@ main(
 
    tinyrad_assertions();
 
-   if ((opts & TRAD_TEST_VERBOSE))
+   if ((opts & TRUTILS_OPT_VERBOSE))
       printf("%s: It appears that the library's assertions appear correct.\n", PROGRAM_NAME);
 
    return(0);
diff --git a/tests/test-assumptions.c b/tests/test-assumptions.c
index f12a105..dfd6364 100644
--- a/tests/test-assumptions.c
+++ b/tests/test-assumptions.c
@@ -254,7 +254,7 @@ main(
 
          case 'q':
          opts |=  TRUTILS_OPT_QUIET;
-         opts &= ~TRAD_TEST_VERBOSE;
+         opts &= ~TRUTILS_OPT_VERBOSE;
          break;
 
          case 'V':
@@ -262,7 +262,7 @@ main(
          return(0);
 
          case 'v':
-         opts |=  TRAD_TEST_VERBOSE;
+         opts |=  TRUTILS_OPT_VERBOSE;
          opts &= ~TRUTILS_OPT_QUIET;
          break;
 
@@ -303,7 +303,7 @@ main(
    assert(sizeof( void * )  ==  sizeof(    size_t ));
    assert(sizeof( void * )  ==  sizeof(   ssize_t ));
 
-   if ((opts & TRAD_TEST_VERBOSE))
+   if ((opts & TRUTILS_OPT_VERBOSE))
       printf("%s: It appears that the developer's assumptions are correct.\n", PROGRAM_NAME);
 
    return(0);
diff --git a/tests/test-dict-attrs.c b/tests/test-dict-attrs.c
index 2e7f4f2..77c6424 100644
--- a/tests/test-dict-attrs.c
+++ b/tests/test-dict-attrs.c
@@ -148,7 +148,7 @@ main(
 
          case 'q':
          opts |=  TRUTILS_OPT_QUIET;
-         opts &= ~TRAD_TEST_VERBOSE;
+         opts &= ~TRUTILS_OPT_VERBOSE;
          break;
 
          case 'V':
@@ -156,7 +156,7 @@ main(
          return(0);
 
          case 'v':
-         opts |=  TRAD_TEST_VERBOSE;
+         opts |=  TRUTILS_OPT_VERBOSE;
          opts &= ~TRUTILS_OPT_QUIET;
          break;
 
diff --git a/tests/test-dict-values.c b/tests/test-dict-values.c
index 4dd2fc6..675e3bb 100644
--- a/tests/test-dict-values.c
+++ b/tests/test-dict-values.c
@@ -150,7 +150,7 @@ main(
 
          case 'q':
          opts |=  TRUTILS_OPT_QUIET;
-         opts &= ~TRAD_TEST_VERBOSE;
+         opts &= ~TRUTILS_OPT_VERBOSE;
          break;
 
          case 'V':
@@ -158,7 +158,7 @@ main(
          return(0);
 
          case 'v':
-         opts |=  TRAD_TEST_VERBOSE;
+         opts |=  TRUTILS_OPT_VERBOSE;
          opts &= ~TRUTILS_OPT_QUIET;
          break;
 
diff --git a/tests/test-dict-vendors.c b/tests/test-dict-vendors.c
index acc964c..b4e4eaf 100644
--- a/tests/test-dict-vendors.c
+++ b/tests/test-dict-vendors.c
@@ -148,7 +148,7 @@ main(
 
          case 'q':
          opts |=  TRUTILS_OPT_QUIET;
-         opts &= ~TRAD_TEST_VERBOSE;
+         opts &= ~TRUTILS_OPT_VERBOSE;
          break;
 
          case 'V':
@@ -156,7 +156,7 @@ main(
          return(0);
 
          case 'v':
-         opts |=  TRAD_TEST_VERBOSE;
+         opts |=  TRUTILS_OPT_VERBOSE;
          opts &= ~TRUTILS_OPT_QUIET;
          break;
 
diff --git a/tests/test-oid-str.c b/tests/test-oid-str.c
index 9453a1f..3588362 100644
--- a/tests/test-oid-str.c
+++ b/tests/test-oid-str.c
@@ -184,7 +184,7 @@ int main(int argc, char * argv[])
 
          case 'q':
          opts |=  TRUTILS_OPT_QUIET;
-         opts &= ~TRAD_TEST_VERBOSE;
+         opts &= ~TRUTILS_OPT_VERBOSE;
          break;
 
          case 'V':
@@ -192,7 +192,7 @@ int main(int argc, char * argv[])
          return(0);
 
          case 'v':
-         opts |=  TRAD_TEST_VERBOSE;
+         opts |=  TRUTILS_OPT_VERBOSE;
          opts &= ~TRUTILS_OPT_QUIET;
          break;
 
diff --git a/tests/test-options.c b/tests/test-options.c
index 04d6c29..5545905 100644
--- a/tests/test-options.c
+++ b/tests/test-options.c
@@ -134,7 +134,7 @@ int main( int argc, char * argv[] )
 
          case 'q':
          opts |=  TRUTILS_OPT_QUIET;
-         opts &= ~TRAD_TEST_VERBOSE;
+         opts &= ~TRUTILS_OPT_VERBOSE;
          break;
 
          case 'V':
@@ -142,7 +142,7 @@ int main( int argc, char * argv[] )
          return(0);
 
          case 'v':
-         opts |=  TRAD_TEST_VERBOSE;
+         opts |=  TRUTILS_OPT_VERBOSE;
          opts &= ~TRUTILS_OPT_QUIET;
          break;
 
diff --git a/tests/test-pckt-byte-order.c b/tests/test-pckt-byte-order.c
index 55b1689..edef3b6 100644
--- a/tests/test-pckt-byte-order.c
+++ b/tests/test-pckt-byte-order.c
@@ -146,7 +146,7 @@ int main(int argc, char * argv[])
 
          case 'q':
          opts |=  TRUTILS_OPT_QUIET;
-         opts &= ~TRAD_TEST_VERBOSE;
+         opts &= ~TRUTILS_OPT_VERBOSE;
          break;
 
          case 'V':
@@ -154,7 +154,7 @@ int main(int argc, char * argv[])
          return(0);
 
          case 'v':
-         opts |=  TRAD_TEST_VERBOSE;
+         opts |=  TRUTILS_OPT_VERBOSE;
          opts &= ~TRUTILS_OPT_QUIET;
          break;
 
@@ -173,19 +173,19 @@ int main(int argc, char * argv[])
    value = 0x2211;
    for(pos = 0; (pos < (sizeof(uint64_t)+1)); pos++)
       errs += my_test_value( opts, sizeof(uint16_t), pos, value );
-   if ((opts & TRAD_TEST_VERBOSE)) printf("\n");
+   if ((opts & TRUTILS_OPT_VERBOSE)) printf("\n");
 
    my_print_header(opts, sizeof(uint32_t));
    value = 0x44332211;
    for(pos = 0; (pos < (sizeof(uint64_t)+1)); pos++)
       errs += my_test_value( opts, sizeof(uint32_t), pos, value );
-   if ((opts & TRAD_TEST_VERBOSE)) printf("\n");
+   if ((opts & TRUTILS_OPT_VERBOSE)) printf("\n");
 
    my_print_header(opts, sizeof(uint64_t));
    value = 0x8877665544332211;
    for(pos = 0; (pos < (sizeof(uint64_t)+1)); pos++)
       errs += my_test_value( opts, sizeof(uint64_t), pos, value );
-   if ((opts & TRAD_TEST_VERBOSE)) printf("\n");
+   if ((opts & TRUTILS_OPT_VERBOSE)) printf("\n");
 
    return( (((errs)) ? 1 : 0) );
 }
@@ -200,7 +200,7 @@ my_print_header(
    const char *   hton_str;
    const char *   ptoh_str;
 
-   if (!(opts & TRAD_TEST_VERBOSE))
+   if (!(opts & TRUTILS_OPT_VERBOSE))
       return;
 
    switch(width)
@@ -283,11 +283,11 @@ my_test_value(
       return(1);
    };
 
-   if ((opts & TRAD_TEST_VERBOSE)) printf("%s", title);
-   if ((opts & TRAD_TEST_VERBOSE)) printf("  %zu", offset);
-   if ((opts & TRAD_TEST_VERBOSE)) printf("  0x%016" PRIx64, value);
-   if ((opts & TRAD_TEST_VERBOSE)) printf(" ");
-   if ((opts & TRAD_TEST_VERBOSE))
+   if ((opts & TRUTILS_OPT_VERBOSE)) printf("%s", title);
+   if ((opts & TRUTILS_OPT_VERBOSE)) printf("  %zu", offset);
+   if ((opts & TRUTILS_OPT_VERBOSE)) printf("  0x%016" PRIx64, value);
+   if ((opts & TRUTILS_OPT_VERBOSE)) printf(" ");
+   if ((opts & TRUTILS_OPT_VERBOSE))
    {
       for(pos = 0; (pos < sizeof(buff)); pos++)
       {
@@ -296,9 +296,9 @@ my_test_value(
          printf("%02" PRIx8, buff[pos]);
       };
    };
-   if ((opts & TRAD_TEST_VERBOSE)) printf("     0x%016" PRIx64, ptoh);
-   if ((opts & TRAD_TEST_VERBOSE)) printf("  0x%016" PRIx64, hton);
-   if ((opts & TRAD_TEST_VERBOSE)) printf("\n");
+   if ((opts & TRUTILS_OPT_VERBOSE)) printf("     0x%016" PRIx64, ptoh);
+   if ((opts & TRUTILS_OPT_VERBOSE)) printf("  0x%016" PRIx64, hton);
+   if ((opts & TRUTILS_OPT_VERBOSE)) printf("\n");
 
    if ( value != ptoh)
    {
diff --git a/tests/test-url-desc2str.c b/tests/test-url-desc2str.c
index 56f07e6..a566e95 100644
--- a/tests/test-url-desc2str.c
+++ b/tests/test-url-desc2str.c
@@ -143,7 +143,7 @@ int main( int argc, char * argv[] )
 
          case 'q':
          opts |=  TRUTILS_OPT_QUIET;
-         opts &= ~TRAD_TEST_VERBOSE;
+         opts &= ~TRUTILS_OPT_VERBOSE;
          break;
 
          case 'V':
@@ -151,7 +151,7 @@ int main( int argc, char * argv[] )
          return(0);
 
          case 'v':
-         opts |=  TRAD_TEST_VERBOSE;
+         opts |=  TRUTILS_OPT_VERBOSE;
          opts &= ~TRUTILS_OPT_QUIET;
          break;
 
diff --git a/tests/test-url-parse.c b/tests/test-url-parse.c
index 40d9c39..4d6a1dd 100644
--- a/tests/test-url-parse.c
+++ b/tests/test-url-parse.c
@@ -138,7 +138,7 @@ int main( int argc, char * argv[] )
 
          case 'q':
          opts |=  TRUTILS_OPT_QUIET;
-         opts &= ~TRAD_TEST_VERBOSE;
+         opts &= ~TRUTILS_OPT_VERBOSE;
          break;
 
          case 'V':
@@ -146,7 +146,7 @@ int main( int argc, char * argv[] )
          return(0);
 
          case 'v':
-         opts |=  TRAD_TEST_VERBOSE;
+         opts |=  TRUTILS_OPT_VERBOSE;
          opts &= ~TRUTILS_OPT_QUIET;
          break;
 
diff --git a/tests/test-url-resolve.c b/tests/test-url-resolve.c
index f45351a..3027eed 100644
--- a/tests/test-url-resolve.c
+++ b/tests/test-url-resolve.c
@@ -143,7 +143,7 @@ int main( int argc, char * argv[] )
 
          case 'q':
          opts |=  TRUTILS_OPT_QUIET;
-         opts &= ~TRAD_TEST_VERBOSE;
+         opts &= ~TRUTILS_OPT_VERBOSE;
          break;
 
          case 'V':
@@ -151,7 +151,7 @@ int main( int argc, char * argv[] )
          return(0);
 
          case 'v':
-         opts |=  TRAD_TEST_VERBOSE;
+         opts |=  TRUTILS_OPT_VERBOSE;
          opts &= ~TRUTILS_OPT_QUIET;
          break;
 
-- 
cgit v1.2.3