16 files changed, 30 insertions, 31 deletions

diff --git a/tests/common.c b/tests/common.c
index b7ab07a..0b75c3e 100644
--- a/tests/common.c
+++ b/tests/common.c
@@ -496,7 +496,7 @@ int our_error(unsigned opts, char ** errs, const char * fmt, ...)
    int     pos;
    va_list args;
 
-   if ( ((opts & TRAD_TEST_QUIET)) && ((opts & TRAD_TEST_VERBOSE)) )
+   if ( ((opts & TRUTILS_OPT_QUIET)) && ((opts & TRAD_TEST_VERBOSE)) )
       return(1);
 
    if ((errs))
@@ -516,7 +516,7 @@ int our_error(unsigned opts, char ** errs, const char * fmt, ...)
 void our_print(unsigned opts, const char * fmt, ...)
 {
    va_list args;
-   if ((opts & TRAD_TEST_QUIET))
+   if ((opts & TRUTILS_OPT_QUIET))
       return;
    printf("%s: ", program_name);
    va_start(args, fmt);
diff --git a/tests/common.h b/tests/common.h
index 21e1fda..ec765d8 100644
--- a/tests/common.h
+++ b/tests/common.h
@@ -62,7 +62,6 @@
 #define TRAD_TEST_DESC2STR    0x0004UL
 #define TRAD_TEST_PARSE       0x0008UL
 #define TRAD_TEST_CHECK       0x0010UL
-#define TRAD_TEST_QUIET       0x0020UL
 #define TRAD_TEST_DFLT_DICT   0x0040UL
 
 
diff --git a/tests/test-array-queue.c b/tests/test-array-queue.c
index 6b7d8be..f19a3ce 100644
--- a/tests/test-array-queue.c
+++ b/tests/test-array-queue.c
@@ -177,7 +177,7 @@ int main( int argc, char * argv[] )
          return(0);
 
          case 'q':
-         opts |=  TRAD_TEST_QUIET;
+         opts |=  TRUTILS_OPT_QUIET;
          opts &= ~TRAD_TEST_VERBOSE;
          break;
 
@@ -187,7 +187,7 @@ int main( int argc, char * argv[] )
 
          case 'v':
          opts |=  TRAD_TEST_VERBOSE;
-         opts &= ~TRAD_TEST_QUIET;
+         opts &= ~TRUTILS_OPT_QUIET;
          break;
 
          case '?':
diff --git a/tests/test-array-sorted.c b/tests/test-array-sorted.c
index 5cd729b..e4aed76 100644
--- a/tests/test-array-sorted.c
+++ b/tests/test-array-sorted.c
@@ -246,7 +246,7 @@ int main( int argc, char * argv[] )
          return(0);
 
          case 'q':
-         opts |=  TRAD_TEST_QUIET;
+         opts |=  TRUTILS_OPT_QUIET;
          opts &= ~TRAD_TEST_VERBOSE;
          break;
 
@@ -256,7 +256,7 @@ int main( int argc, char * argv[] )
 
          case 'v':
          opts |=  TRAD_TEST_VERBOSE;
-         opts &= ~TRAD_TEST_QUIET;
+         opts &= ~TRUTILS_OPT_QUIET;
          break;
 
          case '?':
diff --git a/tests/test-array-stack.c b/tests/test-array-stack.c
index d6f02ce..f3f885f 100644
--- a/tests/test-array-stack.c
+++ b/tests/test-array-stack.c
@@ -177,7 +177,7 @@ int main( int argc, char * argv[] )
          return(0);
 
          case 'q':
-         opts |=  TRAD_TEST_QUIET;
+         opts |=  TRUTILS_OPT_QUIET;
          opts &= ~TRAD_TEST_VERBOSE;
          break;
 
@@ -187,7 +187,7 @@ int main( int argc, char * argv[] )
 
          case 'v':
          opts |=  TRAD_TEST_VERBOSE;
-         opts &= ~TRAD_TEST_QUIET;
+         opts &= ~TRUTILS_OPT_QUIET;
          break;
 
          case '?':
diff --git a/tests/test-assertions.c b/tests/test-assertions.c
index 7c24d23..291d9bf 100644
--- a/tests/test-assertions.c
+++ b/tests/test-assertions.c
@@ -129,7 +129,7 @@ main(
          return(0);
 
          case 'q':
-         opts |=  TRAD_TEST_QUIET;
+         opts |=  TRUTILS_OPT_QUIET;
          opts &= ~TRAD_TEST_VERBOSE;
          break;
 
@@ -139,7 +139,7 @@ main(
 
          case 'v':
          opts |=  TRAD_TEST_VERBOSE;
-         opts &= ~TRAD_TEST_QUIET;
+         opts &= ~TRUTILS_OPT_QUIET;
          break;
 
          case '?':
diff --git a/tests/test-assumptions.c b/tests/test-assumptions.c
index 5a0a0ba..f12a105 100644
--- a/tests/test-assumptions.c
+++ b/tests/test-assumptions.c
@@ -253,7 +253,7 @@ main(
          return(0);
 
          case 'q':
-         opts |=  TRAD_TEST_QUIET;
+         opts |=  TRUTILS_OPT_QUIET;
          opts &= ~TRAD_TEST_VERBOSE;
          break;
 
@@ -263,7 +263,7 @@ main(
 
          case 'v':
          opts |=  TRAD_TEST_VERBOSE;
-         opts &= ~TRAD_TEST_QUIET;
+         opts &= ~TRUTILS_OPT_QUIET;
          break;
 
          case '?':
diff --git a/tests/test-dict-attrs.c b/tests/test-dict-attrs.c
index 699f3e1..2e7f4f2 100644
--- a/tests/test-dict-attrs.c
+++ b/tests/test-dict-attrs.c
@@ -147,7 +147,7 @@ main(
          return(0);
 
          case 'q':
-         opts |=  TRAD_TEST_QUIET;
+         opts |=  TRUTILS_OPT_QUIET;
          opts &= ~TRAD_TEST_VERBOSE;
          break;
 
@@ -157,7 +157,7 @@ main(
 
          case 'v':
          opts |=  TRAD_TEST_VERBOSE;
-         opts &= ~TRAD_TEST_QUIET;
+         opts &= ~TRUTILS_OPT_QUIET;
          break;
 
          case '?':
diff --git a/tests/test-dict-values.c b/tests/test-dict-values.c
index 5e9f4c3..4dd2fc6 100644
--- a/tests/test-dict-values.c
+++ b/tests/test-dict-values.c
@@ -149,7 +149,7 @@ main(
          return(0);
 
          case 'q':
-         opts |=  TRAD_TEST_QUIET;
+         opts |=  TRUTILS_OPT_QUIET;
          opts &= ~TRAD_TEST_VERBOSE;
          break;
 
@@ -159,7 +159,7 @@ main(
 
          case 'v':
          opts |=  TRAD_TEST_VERBOSE;
-         opts &= ~TRAD_TEST_QUIET;
+         opts &= ~TRUTILS_OPT_QUIET;
          break;
 
          case '?':
diff --git a/tests/test-dict-vendors.c b/tests/test-dict-vendors.c
index 228afb2..acc964c 100644
--- a/tests/test-dict-vendors.c
+++ b/tests/test-dict-vendors.c
@@ -147,7 +147,7 @@ main(
          return(0);
 
          case 'q':
-         opts |=  TRAD_TEST_QUIET;
+         opts |=  TRUTILS_OPT_QUIET;
          opts &= ~TRAD_TEST_VERBOSE;
          break;
 
@@ -157,7 +157,7 @@ main(
 
          case 'v':
          opts |=  TRAD_TEST_VERBOSE;
-         opts &= ~TRAD_TEST_QUIET;
+         opts &= ~TRUTILS_OPT_QUIET;
          break;
 
          case '?':
diff --git a/tests/test-oid-str.c b/tests/test-oid-str.c
index 1ab9cbf..9453a1f 100644
--- a/tests/test-oid-str.c
+++ b/tests/test-oid-str.c
@@ -183,7 +183,7 @@ int main(int argc, char * argv[])
          return(0);
 
          case 'q':
-         opts |=  TRAD_TEST_QUIET;
+         opts |=  TRUTILS_OPT_QUIET;
          opts &= ~TRAD_TEST_VERBOSE;
          break;
 
@@ -193,7 +193,7 @@ int main(int argc, char * argv[])
 
          case 'v':
          opts |=  TRAD_TEST_VERBOSE;
-         opts &= ~TRAD_TEST_QUIET;
+         opts &= ~TRUTILS_OPT_QUIET;
          break;
 
          case '?':
diff --git a/tests/test-options.c b/tests/test-options.c
index ce5b0c8..04d6c29 100644
--- a/tests/test-options.c
+++ b/tests/test-options.c
@@ -133,7 +133,7 @@ int main( int argc, char * argv[] )
          return(0);
 
          case 'q':
-         opts |=  TRAD_TEST_QUIET;
+         opts |=  TRUTILS_OPT_QUIET;
          opts &= ~TRAD_TEST_VERBOSE;
          break;
 
@@ -143,7 +143,7 @@ int main( int argc, char * argv[] )
 
          case 'v':
          opts |=  TRAD_TEST_VERBOSE;
-         opts &= ~TRAD_TEST_QUIET;
+         opts &= ~TRUTILS_OPT_QUIET;
          break;
 
          case '?':
diff --git a/tests/test-pckt-byte-order.c b/tests/test-pckt-byte-order.c
index bde9ef9..55b1689 100644
--- a/tests/test-pckt-byte-order.c
+++ b/tests/test-pckt-byte-order.c
@@ -145,7 +145,7 @@ int main(int argc, char * argv[])
          return(0);
 
          case 'q':
-         opts |=  TRAD_TEST_QUIET;
+         opts |=  TRUTILS_OPT_QUIET;
          opts &= ~TRAD_TEST_VERBOSE;
          break;
 
@@ -155,7 +155,7 @@ int main(int argc, char * argv[])
 
          case 'v':
          opts |=  TRAD_TEST_VERBOSE;
-         opts &= ~TRAD_TEST_QUIET;
+         opts &= ~TRUTILS_OPT_QUIET;
          break;
 
          case '?':
diff --git a/tests/test-url-desc2str.c b/tests/test-url-desc2str.c
index e9e26af..56f07e6 100644
--- a/tests/test-url-desc2str.c
+++ b/tests/test-url-desc2str.c
@@ -142,7 +142,7 @@ int main( int argc, char * argv[] )
          return(0);
 
          case 'q':
-         opts |=  TRAD_TEST_QUIET;
+         opts |=  TRUTILS_OPT_QUIET;
          opts &= ~TRAD_TEST_VERBOSE;
          break;
 
@@ -152,7 +152,7 @@ int main( int argc, char * argv[] )
 
          case 'v':
          opts |=  TRAD_TEST_VERBOSE;
-         opts &= ~TRAD_TEST_QUIET;
+         opts &= ~TRUTILS_OPT_QUIET;
          break;
 
          case '?':
diff --git a/tests/test-url-parse.c b/tests/test-url-parse.c
index b896ede..40d9c39 100644
--- a/tests/test-url-parse.c
+++ b/tests/test-url-parse.c
@@ -137,7 +137,7 @@ int main( int argc, char * argv[] )
          return(0);
 
          case 'q':
-         opts |=  TRAD_TEST_QUIET;
+         opts |=  TRUTILS_OPT_QUIET;
          opts &= ~TRAD_TEST_VERBOSE;
          break;
 
@@ -147,7 +147,7 @@ int main( int argc, char * argv[] )
 
          case 'v':
          opts |=  TRAD_TEST_VERBOSE;
-         opts &= ~TRAD_TEST_QUIET;
+         opts &= ~TRUTILS_OPT_QUIET;
          break;
 
          case '?':
diff --git a/tests/test-url-resolve.c b/tests/test-url-resolve.c
index 374e3c2..f45351a 100644
--- a/tests/test-url-resolve.c
+++ b/tests/test-url-resolve.c
@@ -142,7 +142,7 @@ int main( int argc, char * argv[] )
          return(0);
 
          case 'q':
-         opts |=  TRAD_TEST_QUIET;
+         opts |=  TRUTILS_OPT_QUIET;
          opts &= ~TRAD_TEST_VERBOSE;
          break;
 
@@ -152,7 +152,7 @@ int main( int argc, char * argv[] )
 
          case 'v':
          opts |=  TRAD_TEST_VERBOSE;
-         opts &= ~TRAD_TEST_QUIET;
+         opts &= ~TRUTILS_OPT_QUIET;
          break;
 
          case '?':