From 6a8891969c257d2bfee953bfbe2756c319a8b72e Mon Sep 17 00:00:00 2001
From: "David M. Syzdek" <david@syzdek.net>
Date: Thu, 24 Mar 2022 01:50:36 -0800
Subject: tinryad: moving tr to config struct

---
 src/tinyrad.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/tinyrad.c b/src/tinyrad.c
index e5b740d..b7f3459 100644
--- a/src/tinyrad.c
+++ b/src/tinyrad.c
@@ -198,7 +198,6 @@ int main(int argc, char * argv[])
    int            opt_index;
    int            rc;
    TinyRadDict *  dict;
-   TinyRad *      tr;
    TinyRadConf    cnfdata;
    TinyRadConf *  cnf;
 
@@ -310,7 +309,7 @@ int main(int argc, char * argv[])
    };
 
    // load TinyRad handle
-   rc = tinyrad_load_dict(cnf->opts, cnf->tr_opts, &tr, cnf->url, cnf->dict_files, cnf->dict_paths);
+   rc = tinyrad_load_dict(cnf->opts, cnf->tr_opts, &cnf->tr, cnf->url, cnf->dict_files, cnf->dict_paths);
    if (rc != TRAD_SUCCESS)
    {
       tinyrad_cleanup(cnf);
@@ -320,7 +319,7 @@ int main(int argc, char * argv[])
    // display dictionary
    if ((cnf->opts & MY_OPT_DICT_DUMP))
    {
-      tinyrad_get_option(tr, TRAD_OPT_DICTIONARY, &dict);
+      tinyrad_get_option(cnf->tr, TRAD_OPT_DICTIONARY, &dict);
       tinyrad_dict_print(dict, 0xffff);
       tinyrad_cleanup(cnf);
       tinyrad_free(dict);
@@ -330,8 +329,8 @@ int main(int argc, char * argv[])
    // display configuration
    if ((cnf->opts & MY_OPT_CONFIG_PRINT))
    {
-      tinyrad_get_option(tr, TRAD_OPT_DICTIONARY, &dict);
-      tinyrad_conf_print(tr, dict);
+      tinyrad_get_option(cnf->tr, TRAD_OPT_DICTIONARY, &dict);
+      tinyrad_conf_print(cnf->tr, dict);
       tinyrad_cleanup(cnf);
       tinyrad_free(dict);
       return(0);
-- 
cgit v1.2.3