libtinyrad: updating arguments in tinyrad_dict_defaults()

6 files changed, 6 insertions, 9 deletions

diff --git a/include/tinyrad.h b/include/tinyrad.h
index 8b38381..b9cefec 100644
--- a/include/tinyrad.h
+++ b/include/tinyrad.h
@@ -561,8 +561,7 @@ tinyrad_dict_attr_info(
 _TINYRAD_F int
 tinyrad_dict_defaults(
          TinyRadDict *                 dict,
-         char ***                      msgsp,
-         uint32_t                      opts );
+         char ***                      msgsp );
 
 
 _TINYRAD_F int
diff --git a/lib/libtinyrad/ldict.c b/lib/libtinyrad/ldict.c
index 838e096..0b0fce0 100644
--- a/lib/libtinyrad/ldict.c
+++ b/lib/libtinyrad/ldict.c
@@ -1355,12 +1355,10 @@ tinyrad_dict_attr_oidname(
 int
 tinyrad_dict_defaults(
          TinyRadDict *                 dict,
-         char ***                      msgsp,
-         uint32_t                      opts )
+         char ***                      msgsp )
 {
    TinyRadDebugTrace();
    assert(dict != NULL);
-   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));
diff --git a/lib/libtinyrad/lmemory.c b/lib/libtinyrad/lmemory.c
index 94fd7de..1e7bc20 100644
--- a/lib/libtinyrad/lmemory.c
+++ b/lib/libtinyrad/lmemory.c
@@ -312,7 +312,7 @@ tinyrad_initialize(
          tinyrad_tiyrad_free(tr);
          return(rc);
       };
-      if ((rc = tinyrad_dict_defaults(tr->dict, NULL, 0)) != TRAD_SUCCESS)
+      if ((rc = tinyrad_dict_defaults(tr->dict, NULL)) != TRAD_SUCCESS)
       {
          tinyrad_tiyrad_free(tr);
          return(rc);
diff --git a/src/tinyrad-dict.c b/src/tinyrad-dict.c
index 2e392d0..8afae0b 100644
--- a/src/tinyrad-dict.c
+++ b/src/tinyrad-dict.c
@@ -198,7 +198,7 @@ int main(int argc, char * argv[])
    // load builtin/default dictionary objects
    if ((opts & MY_OPT_DICT_DEFAULTS))
    {
-      if ((rc = tinyrad_dict_defaults(dict, &errs, 0)) != TRAD_SUCCESS)
+      if ((rc = tinyrad_dict_defaults(dict, &errs)) != TRAD_SUCCESS)
       {
          trutils_error(opts, errs, NULL);
          tinyrad_strsfree(files);
diff --git a/src/tinyrad.c b/src/tinyrad.c
index 65d6988..dbd9ebd 100644
--- a/src/tinyrad.c
+++ b/src/tinyrad.c
@@ -296,7 +296,7 @@ my_dict_load(
    // load defaults
    if ((opts & MY_OPT_DICT_DEFAULTS))
    {
-      if ((rc = tinyrad_dict_defaults(dict, &errs, 0)) != TRAD_SUCCESS)
+      if ((rc = tinyrad_dict_defaults(dict, &errs)) != TRAD_SUCCESS)
       {
          trutils_error(opts, errs, NULL);
          tinyrad_strsfree(errs);
diff --git a/tests/common-dict.c b/tests/common-dict.c
index 172efe4..1d7aa4e 100644
--- a/tests/common-dict.c
+++ b/tests/common-dict.c
@@ -325,7 +325,7 @@ our_dict_initialize(
    if ((opts & TEST_OPT_DFLT_DICT))
    {
       trutils_verbose(opts, "loading default dictionary ...");
-      if ((rc = tinyrad_dict_defaults(*dictp, &errs, 0)) != TRAD_SUCCESS)
+      if ((rc = tinyrad_dict_defaults(*dictp, &errs)) != TRAD_SUCCESS)
       {
          trutils_error(opts, errs, "tinyrad_dict_defaults(): %s", tinyrad_strerror(rc));
          tinyrad_strsfree(errs);