tests: replacing our_verbose() with trutils_verbose()

11 files changed, 95 insertions, 113 deletions

diff --git a/include/trutils.h b/include/trutils.h
index c80487c..0eb94e5 100644
--- a/include/trutils.h
+++ b/include/trutils.h
@@ -140,7 +140,4 @@ trutils_verbose(
 _TINYRAD_F void
 trutils_version( void );
 
-void our_verbose(unsigned opts, const char * fmt, ...);
-
-
 #endif /* end of header */
diff --git a/tests/common.c b/tests/common.c
index 5f6b648..b028a48 100644
--- a/tests/common.c
+++ b/tests/common.c
@@ -513,20 +513,6 @@ int our_error(unsigned opts, char ** errs, const char * fmt, ...)
 }
 
 
-void our_verbose(unsigned opts, const char * fmt, ...)
-{
-   va_list args;
-   if (!(opts & TRUTILS_OPT_VERBOSE))
-      return;
-   printf("%s: ", program_name);
-   va_start(args, fmt);
-   vprintf(fmt, args);
-   va_end(args);
-   printf("\n");
-   return;
-}
-
-
 //----------------//
 // misc functions //
 //----------------//
diff --git a/tests/common.h b/tests/common.h
index 3f95d13..b792059 100644
--- a/tests/common.h
+++ b/tests/common.h
@@ -100,7 +100,6 @@ int our_urldesc_test_good(const char * url, unsigned opts);
 #pragma mark log functions
 
 int  our_error(unsigned opts, char ** errs, const char * fmt, ...);
-void our_verbose(unsigned opts, const char * fmt, ...);
 
 
 //----------------//
diff --git a/tests/dict-data.c b/tests/dict-data.c
index 7b280ee..f42bdca 100644
--- a/tests/dict-data.c
+++ b/tests/dict-data.c
@@ -161,13 +161,13 @@ our_dict_diag_attr(
 
    if ((attr_def))
    {
-      our_verbose(opts, "Attribute Definition");
-      our_verbose(opts, "   Name:             %s",       attr_def->name);
-      our_verbose(opts, "   Type:             %" PRIu8,  attr_def->type);
-      our_verbose(opts, "   Vendor ID:        %" PRIu32, attr_def->vendor_id);
-      our_verbose(opts, "   Vendor Type:      %" PRIu32, attr_def->vendor_type);
-      our_verbose(opts, "   Data Type:        %" PRIu32, attr_def->data_type);
-      our_verbose(opts, "   Flags:            0x%08x",   (unsigned)attr_def->flags);
+      trutils_verbose(opts, "Attribute Definition");
+      trutils_verbose(opts, "   Name:             %s",       attr_def->name);
+      trutils_verbose(opts, "   Type:             %" PRIu8,  attr_def->type);
+      trutils_verbose(opts, "   Vendor ID:        %" PRIu32, attr_def->vendor_id);
+      trutils_verbose(opts, "   Vendor Type:      %" PRIu32, attr_def->vendor_type);
+      trutils_verbose(opts, "   Data Type:        %" PRIu32, attr_def->data_type);
+      trutils_verbose(opts, "   Flags:            0x%08x",   (unsigned)attr_def->flags);
    };
 
    if ((attr))
@@ -190,16 +190,16 @@ our_dict_diag_attr(
       tinyrad_dict_attr_info(attr, TRAD_DICT_OPT_TYPE_OCTS,    &attr_type_octets);
       tinyrad_dict_attr_info(attr, TRAD_DICT_OPT_LEN_OCTS,     &attr_len_octets);
       tinyrad_dict_attr_info(attr, TRAD_DICT_OPT_REF_COUNT,    &attr_ref_count);
-      our_verbose(opts, "Attribute Object");
-      our_verbose(opts, "   Name:             %s",       (((attr_name)) ? attr_name : ""));
-      our_verbose(opts, "   Type:             %" PRIu8,  attr_type);
-      our_verbose(opts, "   Vendor ID:        %" PRIu32, attr_vendor_id);
-      our_verbose(opts, "   Vendor Type:      %" PRIu32, attr_vendor_type);
-      our_verbose(opts, "   Data Type:        %" PRIu32, attr_data_type);
-      our_verbose(opts, "   Flags:            0x%08x",   (unsigned)attr_flags);
-      our_verbose(opts, "   Type Octets:      %" PRIu32, attr_type_octets);
-      our_verbose(opts, "   Length Octets:    %" PRIu32, attr_len_octets);
-      our_verbose(opts, "   Reference Count:  %u",       attr_ref_count);
+      trutils_verbose(opts, "Attribute Object");
+      trutils_verbose(opts, "   Name:             %s",       (((attr_name)) ? attr_name : ""));
+      trutils_verbose(opts, "   Type:             %" PRIu8,  attr_type);
+      trutils_verbose(opts, "   Vendor ID:        %" PRIu32, attr_vendor_id);
+      trutils_verbose(opts, "   Vendor Type:      %" PRIu32, attr_vendor_type);
+      trutils_verbose(opts, "   Data Type:        %" PRIu32, attr_data_type);
+      trutils_verbose(opts, "   Flags:            0x%08x",   (unsigned)attr_flags);
+      trutils_verbose(opts, "   Type Octets:      %" PRIu32, attr_type_octets);
+      trutils_verbose(opts, "   Length Octets:    %" PRIu32, attr_len_octets);
+      trutils_verbose(opts, "   Reference Count:  %u",       attr_ref_count);
    };
 
    return;
@@ -222,10 +222,10 @@ our_dict_diag_value(
 
    if ((value_def))
    {
-      our_verbose(opts, "Value Definition");
-      our_verbose(opts, "   Attribute Name:   %s",       value_def->attr_name);
-      our_verbose(opts, "   Value Name:       %s",       value_def->value_name);
-      our_verbose(opts, "   Value Data:       %" PRIu64, value_def->data);
+      trutils_verbose(opts, "Value Definition");
+      trutils_verbose(opts, "   Attribute Name:   %s",       value_def->attr_name);
+      trutils_verbose(opts, "   Value Name:       %s",       value_def->value_name);
+      trutils_verbose(opts, "   Value Data:       %" PRIu64, value_def->data);
    };
 
    if ((value))
@@ -244,14 +244,14 @@ our_dict_diag_value(
       tinyrad_dict_value_info(value, TRAD_DICT_OPT_VEND_TYPE,    &vendor_type);
       tinyrad_dict_value_info(value, TRAD_DICT_OPT_DATA,         &value_data);
       tinyrad_dict_value_info(value, TRAD_DICT_OPT_REF_COUNT,    &value_ref_count);
-      our_verbose(opts, "Value Object");
-      our_verbose(opts, "   Value Name:       %s",         (((value_name)) ? value_name : ""));
-      our_verbose(opts, "   Attribute Name:   %s",         (((attr_name))  ? attr_name  : ""));
-      our_verbose(opts, "   Attribute Type:   %" PRIu8,    value_type);
-      our_verbose(opts, "   Vendor ID:        %" PRIu32,   vendor_id);
-      our_verbose(opts, "   Vendor Type:      %" PRIu32,   vendor_type);
-      our_verbose(opts, "   Value Data:       %" PRIu64,   value_data);
-      our_verbose(opts, "   Reference Count:  %u",         value_ref_count);
+      trutils_verbose(opts, "Value Object");
+      trutils_verbose(opts, "   Value Name:       %s",         (((value_name)) ? value_name : ""));
+      trutils_verbose(opts, "   Attribute Name:   %s",         (((attr_name))  ? attr_name  : ""));
+      trutils_verbose(opts, "   Attribute Type:   %" PRIu8,    value_type);
+      trutils_verbose(opts, "   Vendor ID:        %" PRIu32,   vendor_id);
+      trutils_verbose(opts, "   Vendor Type:      %" PRIu32,   vendor_type);
+      trutils_verbose(opts, "   Value Data:       %" PRIu64,   value_data);
+      trutils_verbose(opts, "   Reference Count:  %u",         value_ref_count);
    };
 
    return;
@@ -272,11 +272,11 @@ our_dict_diag_vendor(
 
    if ((vendor_def))
    {
-      our_verbose(opts, "Vendor Definition");
-      our_verbose(opts, "   Name:             %s",       vendor_def->name);
-      our_verbose(opts, "   Vendor ID:        %" PRIu32, vendor_def->vendor_id);
-      our_verbose(opts, "   Vendor Type:      %" PRIu32, vendor_def->vendor_type_octs);
-      our_verbose(opts, "   Data Type:        %" PRIu32, vendor_def->vendor_len_octs);
+      trutils_verbose(opts, "Vendor Definition");
+      trutils_verbose(opts, "   Name:             %s",       vendor_def->name);
+      trutils_verbose(opts, "   Vendor ID:        %" PRIu32, vendor_def->vendor_id);
+      trutils_verbose(opts, "   Vendor Type:      %" PRIu32, vendor_def->vendor_type_octs);
+      trutils_verbose(opts, "   Data Type:        %" PRIu32, vendor_def->vendor_len_octs);
    };
 
    if ((vendor))
@@ -291,12 +291,12 @@ our_dict_diag_vendor(
       tinyrad_dict_vendor_info(vendor, TRAD_DICT_OPT_TYPE_OCTS,    &vendor_type_octets);
       tinyrad_dict_vendor_info(vendor, TRAD_DICT_OPT_LEN_OCTS,     &vendor_len_octets);
       tinyrad_dict_vendor_info(vendor, TRAD_DICT_OPT_REF_COUNT,    &vendor_ref_count);
-      our_verbose(opts, "Vendor Object");
-      our_verbose(opts, "   Name:             %s",       (((vendor_name)) ? vendor_name : ""));
-      our_verbose(opts, "   Vendor ID:        %" PRIu32, vendor_id);
-      our_verbose(opts, "   Type Octets:      %" PRIu32, vendor_type_octets);
-      our_verbose(opts, "   Length Octets:    %" PRIu32, vendor_len_octets);
-      our_verbose(opts, "   Reference Count:  %u",       vendor_ref_count);
+      trutils_verbose(opts, "Vendor Object");
+      trutils_verbose(opts, "   Name:             %s",       (((vendor_name)) ? vendor_name : ""));
+      trutils_verbose(opts, "   Vendor ID:        %" PRIu32, vendor_id);
+      trutils_verbose(opts, "   Type Octets:      %" PRIu32, vendor_type_octets);
+      trutils_verbose(opts, "   Length Octets:    %" PRIu32, vendor_len_octets);
+      trutils_verbose(opts, "   Reference Count:  %u",       vendor_ref_count);
    };
 
    return;
@@ -326,7 +326,7 @@ our_dict_initialize(
    // load builtin/default dictionary objects
    if ((opts & TRAD_TEST_DFLT_DICT))
    {
-      our_verbose(opts, "loading default dictionary ...");
+      trutils_verbose(opts, "loading default dictionary ...");
       if ((rc = tinyrad_dict_defaults(*dictp, &errs, 0)) != TRAD_SUCCESS)
       {
          our_error(opts, errs, "tinyrad_dict_defaults(): %s", tinyrad_strerror(rc));
@@ -337,7 +337,7 @@ our_dict_initialize(
    };
 
    // load test dictionary vendors
-   our_verbose(opts, "adding test dictionary vendors ...");
+   trutils_verbose(opts, "adding test dictionary vendors ...");
    if ((rc = tinyrad_dict_import(*dictp, test_dict_data_vendors, NULL, NULL, &errs, 0)) != TRAD_SUCCESS)
    {
       our_error(opts, errs, "tinyrad_dict_import(vendors): %s", tinyrad_strerror(rc));
@@ -347,7 +347,7 @@ our_dict_initialize(
    };
 
    // load test dictionary attributes
-   our_verbose(opts, "adding test dictionary attributes ...");
+   trutils_verbose(opts, "adding test dictionary attributes ...");
    if ((rc = tinyrad_dict_import(*dictp, NULL, test_dict_data_attrs, NULL, &errs, 0)) != TRAD_SUCCESS)
    {
       our_error(opts, errs, "tinyrad_dict_import(attributes): %s", tinyrad_strerror(rc));
@@ -357,7 +357,7 @@ our_dict_initialize(
    };
 
    // load test dictionary values
-   our_verbose(opts, "adding test dictionary values ...");
+   trutils_verbose(opts, "adding test dictionary values ...");
    if ((rc = tinyrad_dict_import(*dictp, NULL, NULL, test_dict_data_values, &errs, 0)) != TRAD_SUCCESS)
    {
       our_error(opts, errs, "tinyrad_dict_import(values): %s", tinyrad_strerror(rc));
diff --git a/tests/test-array-queue.c b/tests/test-array-queue.c
index 98547bc..e5b979f 100644
--- a/tests/test-array-queue.c
+++ b/tests/test-array-queue.c
@@ -210,7 +210,7 @@ int main( int argc, char * argv[] )
 
 
    // initialize test data
-   our_verbose(opts, "initializing test data ...");
+   trutils_verbose(opts, "initializing test data ...");
    memset(data, 0, sizeof(data));
    for(len = 0; ((test_strs[len])); len++);
    for(pos = 0; (pos < MY_LIST_LEN); pos++)
@@ -233,7 +233,7 @@ int main( int argc, char * argv[] )
 
 
    // loop through test data and add to queue
-   our_verbose(opts, "queueing to queue ...");
+   trutils_verbose(opts, "queueing to queue ...");
    list     = NULL;
    list_len = 0;
    for(x = 0; (x < MY_LIST_LEN); x++)
@@ -254,7 +254,7 @@ int main( int argc, char * argv[] )
 
 
    // loop through queue and verify data
-   our_verbose(opts, "verifing queue ...");
+   trutils_verbose(opts, "verifing queue ...");
    if (list_len != ((MY_LIST_LEN / 4) * 3))
       return(our_error(opts, NULL, "queue length is incorrect"));
    delta = MY_LIST_LEN - list_len;
@@ -266,7 +266,7 @@ int main( int argc, char * argv[] )
 
 
    // dequeue data from queue
-   our_verbose(opts, "dequeueing from queue ...");
+   trutils_verbose(opts, "dequeueing from queue ...");
    while (list_len > 0)
       if (tinyrad_array_dequeue(list, &list_len, sizeof(MyData *)) == NULL)
          return(our_error(opts, NULL, "unable to dequeue from queue"));
diff --git a/tests/test-array-sorted.c b/tests/test-array-sorted.c
index a6d277f..8901c8b 100644
--- a/tests/test-array-sorted.c
+++ b/tests/test-array-sorted.c
@@ -279,7 +279,7 @@ int main( int argc, char * argv[] )
 
 
    // initialize test data
-   our_verbose(opts, "initializing test data ...");
+   trutils_verbose(opts, "initializing test data ...");
    memset(data, 0, sizeof(data));
    memset(test, 0, sizeof(test));
    for(len = 0; ((test_strs[len])); len++);
@@ -303,7 +303,7 @@ int main( int argc, char * argv[] )
 
 
    // test searching by value
-   our_verbose(opts, "sorting test data by value ...");
+   trutils_verbose(opts, "sorting test data by value ...");
    qsort(test, MY_LIST_LEN, sizeof(MyData *), &my_compare_obj_value);
    opts = opts & ~MY_MASK;
    if ((my_test_search(opts|MY_OBJ_VALUE, test, MY_LIST_LEN)))
@@ -313,7 +313,7 @@ int main( int argc, char * argv[] )
 
 
    // test searching by name
-   our_verbose(opts, "sorting test data by name ...");
+   trutils_verbose(opts, "sorting test data by name ...");
    qsort(test, MY_LIST_LEN, sizeof(MyData *), &my_compare_obj_name);
    opts = opts & ~MY_MASK;
    if ((my_test_search(opts|MY_OBJ_NAME, test, MY_LIST_LEN)))
@@ -323,7 +323,7 @@ int main( int argc, char * argv[] )
 
 
    // insert data as sorted list using TINYRAD_ARRAY_REPLACE
-   our_verbose(opts, "resetting list ...");
+   trutils_verbose(opts, "resetting list ...");
    list     = NULL;
    list_len = 0;
    opts     = (opts & ~MY_MASK) | MY_OBJ_NAME;
@@ -340,7 +340,7 @@ int main( int argc, char * argv[] )
 
 
    // insert data as sorted list using TINYRAD_ARRAY_INSERT
-   our_verbose(opts, "resetting list ...");
+   trutils_verbose(opts, "resetting list ...");
    list     = NULL;
    list_len = 0;
    opts     = (opts & ~MY_MASK) | MY_OBJ_NAME;
@@ -355,7 +355,7 @@ int main( int argc, char * argv[] )
 
 
    // insert data as sorted list using TINYRAD_ARRAY_MERGE and TINYRAD_ARRAY_UNORDERED
-   our_verbose(opts, "resetting list ...");
+   trutils_verbose(opts, "resetting list ...");
    list     = NULL;
    list_len = 0;
    opts     = (opts & ~MY_MASK) | MY_OBJ_NAME;
@@ -378,7 +378,7 @@ int main( int argc, char * argv[] )
 
 
    // insert data as sorted list using TINYRAD_ARRAY_MERGE and TINYRAD_ARRAY_APPEND
-   our_verbose(opts, "resetting list ...");
+   trutils_verbose(opts, "resetting list ...");
    list     = NULL;
    list_len = 0;
    opts     = (opts & ~MY_MASK) | MY_OBJ_NAME;
@@ -401,7 +401,7 @@ int main( int argc, char * argv[] )
 
 
   // insert data as sorted list using TINYRAD_ARRAY_MERGE and TINYRAD_ARRAY_PREPEND
-   our_verbose(opts, "resetting list ...");
+   trutils_verbose(opts, "resetting list ...");
    list     = NULL;
    list_len = 0;
    opts     = (opts & ~MY_MASK) | MY_OBJ_NAME;
@@ -424,12 +424,12 @@ int main( int argc, char * argv[] )
 
 
    // test searching by value
-   our_verbose(opts, "sorting test data by value ...");
+   trutils_verbose(opts, "sorting test data by value ...");
    qsort(test, MY_LIST_LEN, sizeof(MyData *), &my_compare_obj_value);
 
 
    // insert data as sorted list using TINYRAD_ARRAY_MERGE and TINYRAD_ARRAY_UNORDERED
-   our_verbose(opts, "resetting list ...");
+   trutils_verbose(opts, "resetting list ...");
    list     = NULL;
    list_len = 0;
    opts     = (opts & ~MY_MASK) | MY_OBJ_VALUE;
@@ -452,7 +452,7 @@ int main( int argc, char * argv[] )
 
 
    // insert data as sorted list using TINYRAD_ARRAY_MERGE and TINYRAD_ARRAY_APPEND
-   our_verbose(opts, "resetting list ...");
+   trutils_verbose(opts, "resetting list ...");
    list     = NULL;
    list_len = 0;
    opts     = (opts & ~MY_MASK) | MY_OBJ_VALUE;
@@ -475,7 +475,7 @@ int main( int argc, char * argv[] )
 
 
   // insert data as sorted list using TINYRAD_ARRAY_MERGE and TINYRAD_ARRAY_PREPEND
-   our_verbose(opts, "resetting list ...");
+   trutils_verbose(opts, "resetting list ...");
    list     = NULL;
    list_len = 0;
    opts     = (opts & ~MY_MASK) | MY_OBJ_VALUE;
@@ -628,7 +628,7 @@ my_test_insert(
       return(our_error(opts, NULL, "unknown dup action"));
    };
 
-   our_verbose(opts, "testing   tinyrad_array_add( %7s, %9s, %s ) [%s] ...", action_name, merge_type, compar_name, (((iteration)) ? "duplicate" : "unique"));
+   trutils_verbose(opts, "testing   tinyrad_array_add( %7s, %9s, %s ) [%s] ...", action_name, merge_type, compar_name, (((iteration)) ? "duplicate" : "unique"));
    for(x = 0; (x < dat_len); x++)
    {
       if (tinyrad_array_add((void **)listp, list_lenp, sizeof(MyData *), &src[x], arrayopt, compar, NULL, &realloc) == -1)
@@ -645,7 +645,7 @@ my_test_insert(
    if (!(arrayopt & TINYRAD_ARRAY_MERGE))
       iteration = 0;
 
-   our_verbose(opts, "verifying tinyrad_array_add( %7s, %9s, %s ) [%s] ...", action_name, merge_type, compar_name, (((iteration)) ? "duplicate" : "unique"));
+   trutils_verbose(opts, "verifying tinyrad_array_add( %7s, %9s, %s ) [%s] ...", action_name, merge_type, compar_name, (((iteration)) ? "duplicate" : "unique"));
    iteration++;
    for(x = 0; (x < (dat_len*iteration)); x++)
    {
@@ -724,7 +724,7 @@ my_test_remove(
       return(our_error(opts, NULL, "unknown dup action"));
    };
 
-   our_verbose(opts, "testing   tinyrad_array_remove( %7s, %9s, %s ) [%s] ...", action_name, merge_type, compar_name, (((iteration)) ? "duplicate" : "unique"));
+   trutils_verbose(opts, "testing   tinyrad_array_remove( %7s, %9s, %s ) [%s] ...", action_name, merge_type, compar_name, (((iteration)) ? "duplicate" : "unique"));
    for(x = 0; (x < dat_len); x++)
    {
       if (tinyrad_array_remove(list, list_lenp, sizeof(MyData *), &src[x], arrayopt, compar, NULL) == -1)
@@ -739,7 +739,7 @@ my_test_remove(
    if (!(arrayopt & TINYRAD_ARRAY_MERGE))
       iteration = 0;
 
-   our_verbose(opts, "verifying tinyrad_array_remove( %7s, %9s, %s ) [%s] ...", action_name, merge_type, compar_name, (((iteration)) ? "duplicate" : "unique"));
+   trutils_verbose(opts, "verifying tinyrad_array_remove( %7s, %9s, %s ) [%s] ...", action_name, merge_type, compar_name, (((iteration)) ? "duplicate" : "unique"));
    for(x = 0; ((x < (*list_lenp)) && ((iteration))); x++)
    {
       pos = x/iteration;
@@ -787,7 +787,7 @@ my_test_search(
 
    my_compar_opts(opts, &compar_name, &compar);
 
-   our_verbose(opts, "testing   tinyrad_array_search( %s ) ...", compar_name);
+   trutils_verbose(opts, "testing   tinyrad_array_search( %s ) ...", compar_name);
    for(x = 1; (x < (len+1)); x++)
    {
       for(y = 0; (y < x); y++)
@@ -808,7 +808,7 @@ my_test_search(
       };
    };
 
-   our_verbose(opts, "testing   tinyrad_array_get(    %s ) ...", compar_name);
+   trutils_verbose(opts, "testing   tinyrad_array_get(    %s ) ...", compar_name);
    for(x = 1; (x < (len+1)); x++)
    {
       for(y = 0; (y < x); y++)
diff --git a/tests/test-array-stack.c b/tests/test-array-stack.c
index 6c36a8e..de1971e 100644
--- a/tests/test-array-stack.c
+++ b/tests/test-array-stack.c
@@ -210,7 +210,7 @@ int main( int argc, char * argv[] )
 
 
    // initialize test data
-   our_verbose(opts, "initializing test data ...");
+   trutils_verbose(opts, "initializing test data ...");
    memset(data, 0, sizeof(data));
    for(len = 0; ((test_strs[len])); len++);
    for(pos = 0; (pos < MY_LIST_LEN); pos++)
@@ -233,7 +233,7 @@ int main( int argc, char * argv[] )
 
 
    // loop through test data and add to stack
-   our_verbose(opts, "pushing to stack ...");
+   trutils_verbose(opts, "pushing to stack ...");
    list     = NULL;
    list_len = 0;
    for(x = 0; (x < MY_LIST_LEN); x++)
@@ -254,7 +254,7 @@ int main( int argc, char * argv[] )
 
 
    // loop through stack and verify data
-   our_verbose(opts, "verifing stack ...");
+   trutils_verbose(opts, "verifing stack ...");
    if (list_len != ((MY_LIST_LEN / 4) * 3))
       return(our_error(opts, NULL, "stack length is incorrect"));
    for(x = 0, y = 0; (x < MY_LIST_LEN); x++)
@@ -268,7 +268,7 @@ int main( int argc, char * argv[] )
 
 
    // pop data from stack
-   our_verbose(opts, "popping from stack ...");
+   trutils_verbose(opts, "popping from stack ...");
    while (list_len > 0)
       if (tinyrad_array_pop(list, &list_len, sizeof(MyData *)) == NULL)
          return(our_error(opts, NULL, "unable to pop from stack"));
diff --git a/tests/test-dict-attrs.c b/tests/test-dict-attrs.c
index 77c6424..41e3280 100644
--- a/tests/test-dict-attrs.c
+++ b/tests/test-dict-attrs.c
@@ -175,14 +175,14 @@ main(
    if ((our_dict_initialize(opts, &dict)))
       return(1);
 
-   our_verbose(opts, "                                 %4s %9s %7s  %s", "Type", "Vendor", "Vendor", "Name");
-   our_verbose(opts, "                                 %4s %9s %7s  %s",     "",     "ID",   "Type",     "");
+   trutils_verbose(opts, "                                 %4s %9s %7s  %s", "Type", "Vendor", "Vendor", "Name");
+   trutils_verbose(opts, "                                 %4s %9s %7s  %s",     "",     "ID",   "Type",     "");
 
    // verifies test attributes in dictionary by name
    for(pos = 0; ((test_dict_data_attrs[pos].name)); pos++)
    {
       attr_def = &test_dict_data_attrs[pos];
-      our_verbose(
+      trutils_verbose(
          opts,
          "test    attribute search by name %4" PRIu8 " %9" PRIu32 " %7" PRIu32 "  %s ...",
          attr_def->type,
@@ -203,7 +203,7 @@ main(
    for(pos = 0; ((test_dict_data_attrs[pos].name)); pos++)
    {
       attr_def = &test_dict_data_attrs[pos];
-      our_verbose(
+      trutils_verbose(
          opts,
          "test    attribute search by type %4" PRIu8 " %9" PRIu32 " %7" PRIu32 "  %s ...",
          attr_def->type,
@@ -224,7 +224,7 @@ main(
    for(pos = 0; ((tinyrad_dict_default_attrs[pos].name)); pos++)
    {
       attr_def = &tinyrad_dict_default_attrs[pos];
-      our_verbose(
+      trutils_verbose(
          opts,
          "default attribute search by name %4" PRIu8 " %9" PRIu32 " %7" PRIu32 "  %s ...",
          attr_def->type,
@@ -245,7 +245,7 @@ main(
    for(pos = 0; ((tinyrad_dict_default_attrs[pos].name)); pos++)
    {
       attr_def = &tinyrad_dict_default_attrs[pos];
-      our_verbose(
+      trutils_verbose(
          opts,
          "default attribute search by type %4" PRIu8 " %9" PRIu32 " %7" PRIu32 "  %s ...",
          attr_def->type,
diff --git a/tests/test-dict-values.c b/tests/test-dict-values.c
index 675e3bb..8fece04 100644
--- a/tests/test-dict-values.c
+++ b/tests/test-dict-values.c
@@ -177,14 +177,14 @@ main(
    if ((our_dict_initialize(opts, &dict)))
       return(1);
 
-   our_verbose(opts, "                                 %4s %9s %7s  %s", "Type", "Vendor", "Vendor", "Name");
-   our_verbose(opts, "                                 %4s %9s %7s  %s",     "",     "ID",   "Type",     "");
+   trutils_verbose(opts, "                                 %4s %9s %7s  %s", "Type", "Vendor", "Vendor", "Name");
+   trutils_verbose(opts, "                                 %4s %9s %7s  %s",     "",     "ID",   "Type",     "");
 
    // verifies test values in dictionary by name
    for(pos = 0; ((test_dict_data_values[pos].value_name)); pos++)
    {
       value_def = &test_dict_data_values[pos];
-      our_verbose(
+      trutils_verbose(
          opts,
          "test    attribute search by name %25s %25s %3" PRIu64 "  ...",
          value_def->attr_name,
@@ -214,7 +214,7 @@ main(
    for(pos = 0; ((test_dict_data_values[pos].value_name)); pos++)
    {
       value_def = &test_dict_data_values[pos];
-      our_verbose(
+      trutils_verbose(
          opts,
          "test    attribute search by name %25s %25s %3" PRIu64 "  ...",
          value_def->attr_name,
@@ -244,7 +244,7 @@ main(
    for(pos = 0; ((tinyrad_dict_default_values[pos].attr_name)); pos++)
    {
       value_def = &tinyrad_dict_default_values[pos];
-      our_verbose(
+      trutils_verbose(
          opts,
          "test    attribute search by name %25s %25s %3" PRIu64 "  ...",
          value_def->attr_name,
@@ -274,7 +274,7 @@ main(
    for(pos = 0; ((tinyrad_dict_default_values[pos].attr_name)); pos++)
    {
       value_def = &tinyrad_dict_default_values[pos];
-      our_verbose(
+      trutils_verbose(
          opts,
          "test    attribute search by name %25s %25s %3" PRIu64 "  ...",
          value_def->attr_name,
diff --git a/tests/test-dict-vendors.c b/tests/test-dict-vendors.c
index b4e4eaf..af7f0e3 100644
--- a/tests/test-dict-vendors.c
+++ b/tests/test-dict-vendors.c
@@ -175,13 +175,13 @@ main(
    if ((our_dict_initialize(opts, &dict)))
       return(1);
 
-   our_verbose(opts, "Vendor format: vendor id/name");
+   trutils_verbose(opts, "Vendor format: vendor id/name");
 
    // verifies default attributes in dictionary by name
    for(pos = 0; ((tinyrad_dict_default_vendors[pos].name)); pos++)
    {
       vendor_def = &tinyrad_dict_default_vendors[pos];
-      our_verbose( opts, "default attribute search by name %8" PRIu32 "  %s ...", vendor_def->vendor_id, vendor_def->name);
+      trutils_verbose( opts, "default attribute search by name %8" PRIu32 "  %s ...", vendor_def->vendor_id, vendor_def->name);
       vendor = tinyrad_dict_vendor_get(dict, vendor_def->name, 0);
       if ((my_verify_vendor(opts, vendor_def, vendor)))
       {
@@ -195,7 +195,7 @@ main(
    for(pos = 0; ((tinyrad_dict_default_vendors[pos].name)); pos++)
    {
       vendor_def = &tinyrad_dict_default_vendors[pos];
-      our_verbose( opts, "default attribute search by id   %8" PRIu32 "  %s ...", vendor_def->vendor_id, vendor_def->name);
+      trutils_verbose( opts, "default attribute search by id   %8" PRIu32 "  %s ...", vendor_def->vendor_id, vendor_def->name);
       vendor = tinyrad_dict_vendor_get(dict, NULL, (uint32_t)vendor_def->vendor_id);
       if ((my_verify_vendor(opts, vendor_def, vendor)))
       {
@@ -209,7 +209,7 @@ main(
    for(pos = 0; ((test_dict_data_vendors[pos].name)); pos++)
    {
       vendor_def = &test_dict_data_vendors[pos];
-      our_verbose( opts, "test attribute search by name %8" PRIu32 "  %s ...", vendor_def->vendor_id, vendor_def->name);
+      trutils_verbose( opts, "test attribute search by name %8" PRIu32 "  %s ...", vendor_def->vendor_id, vendor_def->name);
       vendor = tinyrad_dict_vendor_get(dict, vendor_def->name, 0);
       if ((my_verify_vendor(opts, vendor_def, vendor)))
       {
@@ -223,7 +223,7 @@ main(
    for(pos = 0; ((test_dict_data_vendors[pos].name)); pos++)
    {
       vendor_def = &test_dict_data_vendors[pos];
-      our_verbose( opts, "test attribute search by id   %8" PRIu32 "  %s ...", vendor_def->vendor_id, vendor_def->name);
+      trutils_verbose( opts, "test attribute search by id   %8" PRIu32 "  %s ...", vendor_def->vendor_id, vendor_def->name);
       vendor = tinyrad_dict_vendor_get(dict, NULL, (uint32_t)vendor_def->vendor_id);
       if ((my_verify_vendor(opts, vendor_def, vendor)))
       {
diff --git a/tests/test-oid-str.c b/tests/test-oid-str.c
index 3588362..76b93d3 100644
--- a/tests/test-oid-str.c
+++ b/tests/test-oid-str.c
@@ -211,8 +211,8 @@ int main(int argc, char * argv[])
    {
       for(y = 1; (y <= test_vals[x].len); y++)
       {
-         our_verbose(opts, "testing oid %s ...", my_oidstr(test_vals[x].vals, y));
-         our_verbose(opts, "   Initializing OID from values ...");
+         trutils_verbose(opts, "testing oid %s ...", my_oidstr(test_vals[x].vals, y));
+         trutils_verbose(opts, "   Initializing OID from values ...");
          if ((oid = tinyrad_oid_init(test_vals[x].vals, y)) == NULL)
          {
             our_error(opts, NULL, "out of virtual memory");
@@ -220,7 +220,7 @@ int main(int argc, char * argv[])
             continue;
          };
 
-         our_verbose(opts, "   Testing values of OID ...");
+         trutils_verbose(opts, "   Testing values of OID ...");
          if ((rc = tinyrad_oid_values(oid, &vals, &len)) != TRAD_SUCCESS)
          {
             our_error(opts, NULL, "tinyrad_oid_values(): %s", tinyrad_strerror(rc));
@@ -308,15 +308,15 @@ my_oid_test(
    uint32_t *        newvals;
    uint32_t *        oldvals;
 
-   our_verbose(opts, "   Generating %s ...", title);
+   trutils_verbose(opts, "   Generating %s ...", title);
    if ((str = tinyrad_oid2str(oldoid, type)) == NULL)
    {
       our_error(opts, NULL, "out of virtual memory");
       return(1);
    };
-   our_verbose(opts, "      %s:  %s", title, str);
+   trutils_verbose(opts, "      %s:  %s", title, str);
 
-   our_verbose(opts, "      Generating OID from %s ...", title);
+   trutils_verbose(opts, "      Generating OID from %s ...", title);
    if ((newoid = tinyrad_str2oid(str)) == NULL)
    {
       our_error(opts, NULL, "error generating OID from %s", title);
@@ -328,7 +328,7 @@ my_oid_test(
 
    tinyrad_oid_values(newoid, &newvals, &newlen);
    tinyrad_oid_values(oldoid, &oldvals, &oldlen);
-   our_verbose(opts, "      Generated OID: %s", my_oidstr(newvals, newlen));
+   trutils_verbose(opts, "      Generated OID: %s", my_oidstr(newvals, newlen));
    if (newlen != oldlen)
    {
       our_error(opts, NULL, "old and new OID lengths do not match");
@@ -349,7 +349,7 @@ my_oid_test(
       };
    };
 
-   our_verbose(opts, "      comparing old OID and new OID ...");
+   trutils_verbose(opts, "      comparing old OID and new OID ...");
    if ((tinyrad_oid_cmp(&oldoid, &newoid)))
    {
       tinyrad_free(newoid);