libtinyrad: updating arguments in tinyrad_dict_import()

3 files changed, 6 insertions, 9 deletions

diff --git a/include/tinyrad.h b/include/tinyrad.h
index f8ad1dc..8b38381 100644
--- a/include/tinyrad.h
+++ b/include/tinyrad.h
@@ -578,8 +578,7 @@ tinyrad_dict_import(
          const TinyRadDictVendorDef *  vendor_defs,
          const TinyRadDictAttrDef *    attr_defs,
          const TinyRadDictValueDef *   value_defs,
-         char ***                      msgsp,
-         uint32_t                      opts );
+         char ***                      msgsp );
 
 
 _TINYRAD_F int
diff --git a/lib/libtinyrad/ldict.c b/lib/libtinyrad/ldict.c
index cf429dd..838e096 100644
--- a/lib/libtinyrad/ldict.c
+++ b/lib/libtinyrad/ldict.c
@@ -1363,7 +1363,7 @@ tinyrad_dict_defaults(
    assert(opts == 0);
    if (tinyrad_dict_is_readonly(dict) == TRAD_YES)
       return(TRAD_EDICTRO);
-   return(tinyrad_dict_import(dict, tinyrad_dict_default_vendors, tinyrad_dict_default_attrs, tinyrad_dict_default_values, msgsp, opts));
+   return(tinyrad_dict_import(dict, tinyrad_dict_default_vendors, tinyrad_dict_default_attrs, tinyrad_dict_default_values, msgsp));
 }
 
 
@@ -1373,8 +1373,7 @@ tinyrad_dict_import(
          const TinyRadDictVendorDef *  vendor_defs,
          const TinyRadDictAttrDef *    attr_defs,
          const TinyRadDictValueDef *   value_defs,
-         char ***                      msgsp,
-         uint32_t                      opts )
+         char ***                      msgsp )
 {
    int                     rc;
    size_t                  pos;
@@ -1396,7 +1395,6 @@ tinyrad_dict_import(
    TinyRadDebugTrace();
 
    assert(dict != NULL);
-   assert(opts == 0);
 
    if ((msgsp))
       *msgsp = NULL;
diff --git a/tests/common-dict.c b/tests/common-dict.c
index f3f149c..172efe4 100644
--- a/tests/common-dict.c
+++ b/tests/common-dict.c
@@ -336,7 +336,7 @@ our_dict_initialize(
 
    // load 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)
+   if ((rc = tinyrad_dict_import(*dictp, test_dict_data_vendors, NULL, NULL, &errs)) != TRAD_SUCCESS)
    {
       trutils_error(opts, errs, "tinyrad_dict_import(vendors): %s", tinyrad_strerror(rc));
       tinyrad_strsfree(errs);
@@ -346,7 +346,7 @@ our_dict_initialize(
 
    // load 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)
+   if ((rc = tinyrad_dict_import(*dictp, NULL, test_dict_data_attrs, NULL, &errs)) != TRAD_SUCCESS)
    {
       trutils_error(opts, errs, "tinyrad_dict_import(attributes): %s", tinyrad_strerror(rc));
       tinyrad_strsfree(errs);
@@ -356,7 +356,7 @@ our_dict_initialize(
 
    // load 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)
+   if ((rc = tinyrad_dict_import(*dictp, NULL, NULL, test_dict_data_values, &errs)) != TRAD_SUCCESS)
    {
       trutils_error(opts, errs, "tinyrad_dict_import(values): %s", tinyrad_strerror(rc));
       tinyrad_strsfree(errs);