aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid M. Syzdek <david@syzdek.net>2022-03-17 12:59:41 -0800
committerDavid M. Syzdek <david@syzdek.net>2022-03-17 12:59:41 -0800
commit884f390f579befc04e49c905f6698339ddb65086 (patch)
treec41793daf2822c3a9494885250a74d51d7edcb75
parent3372c001a64554a112da591dd4443de3e1844a4e (diff)
downloadtinyrad-884f390f579befc04e49c905f6698339ddb65086.tar.gz
tinyrad-884f390f579befc04e49c905f6698339ddb65086.tar.bz2
tinyrad-884f390f579befc04e49c905f6698339ddb65086.tar.xz
tinyrad-884f390f579befc04e49c905f6698339ddb65086.zip
libtinyrad: renaming tinyrad_dict_defaults() to tinyrad_dict_builtin()
-rw-r--r--include/tinyrad.h2
-rw-r--r--lib/libtinyrad/ldict.c4
-rw-r--r--lib/libtinyrad/libtinyrad.sym2
-rw-r--r--src/tinyrad-dict.c2
-rw-r--r--src/tinyrad.c2
-rw-r--r--tests/common-dict.c2
6 files changed, 7 insertions, 7 deletions
diff --git a/include/tinyrad.h b/include/tinyrad.h
index 847faf9..609ac5d 100644
--- a/include/tinyrad.h
+++ b/include/tinyrad.h
@@ -560,7 +560,7 @@ tinyrad_dict_attr_info(
560 560
561 561
562_TINYRAD_F int 562_TINYRAD_F int
563tinyrad_dict_defaults( 563tinyrad_dict_builtin(
564 TinyRadDict * dict, 564 TinyRadDict * dict,
565 char *** msgsp ); 565 char *** msgsp );
566 566
diff --git a/lib/libtinyrad/ldict.c b/lib/libtinyrad/ldict.c
index 923a0b5..37666c7 100644
--- a/lib/libtinyrad/ldict.c
+++ b/lib/libtinyrad/ldict.c
@@ -850,7 +850,7 @@ tinyrad_dict_initialize(
850 // load builtin dictionary 850 // load builtin dictionary
851 if ((dict->opts & TRAD_BUILTIN_DICT) == TRAD_BUILTIN_DICT) 851 if ((dict->opts & TRAD_BUILTIN_DICT) == TRAD_BUILTIN_DICT)
852 { 852 {
853 if ((rc = tinyrad_dict_defaults(dict, NULL)) != TRAD_SUCCESS) 853 if ((rc = tinyrad_dict_builtin(dict, NULL)) != TRAD_SUCCESS)
854 { 854 {
855 tinyrad_dict_free(dict); 855 tinyrad_dict_free(dict);
856 return(rc); 856 return(rc);
@@ -1384,7 +1384,7 @@ tinyrad_dict_attr_oidname(
1384#pragma mark dictionary import functions 1384#pragma mark dictionary import functions
1385 1385
1386int 1386int
1387tinyrad_dict_defaults( 1387tinyrad_dict_builtin(
1388 TinyRadDict * dict, 1388 TinyRadDict * dict,
1389 char *** msgsp ) 1389 char *** msgsp )
1390{ 1390{
diff --git a/lib/libtinyrad/libtinyrad.sym b/lib/libtinyrad/libtinyrad.sym
index 09c5d60..bf2ca39 100644
--- a/lib/libtinyrad/libtinyrad.sym
+++ b/lib/libtinyrad/libtinyrad.sym
@@ -57,7 +57,7 @@ tinyrad_pkg_version
57tinyrad_dict_add_path 57tinyrad_dict_add_path
58tinyrad_dict_attr_get 58tinyrad_dict_attr_get
59tinyrad_dict_attr_info 59tinyrad_dict_attr_info
60tinyrad_dict_defaults 60tinyrad_dict_builtin
61tinyrad_dict_get_option 61tinyrad_dict_get_option
62tinyrad_dict_import 62tinyrad_dict_import
63tinyrad_dict_parse 63tinyrad_dict_parse
diff --git a/src/tinyrad-dict.c b/src/tinyrad-dict.c
index 8afae0b..ae4539d 100644
--- a/src/tinyrad-dict.c
+++ b/src/tinyrad-dict.c
@@ -198,7 +198,7 @@ int main(int argc, char * argv[])
198 // load builtin/default dictionary objects 198 // load builtin/default dictionary objects
199 if ((opts & MY_OPT_DICT_DEFAULTS)) 199 if ((opts & MY_OPT_DICT_DEFAULTS))
200 { 200 {
201 if ((rc = tinyrad_dict_defaults(dict, &errs)) != TRAD_SUCCESS) 201 if ((rc = tinyrad_dict_builtin(dict, &errs)) != TRAD_SUCCESS)
202 { 202 {
203 trutils_error(opts, errs, NULL); 203 trutils_error(opts, errs, NULL);
204 tinyrad_strsfree(files); 204 tinyrad_strsfree(files);
diff --git a/src/tinyrad.c b/src/tinyrad.c
index dbd9ebd..d2cd6d5 100644
--- a/src/tinyrad.c
+++ b/src/tinyrad.c
@@ -296,7 +296,7 @@ my_dict_load(
296 // load defaults 296 // load defaults
297 if ((opts & MY_OPT_DICT_DEFAULTS)) 297 if ((opts & MY_OPT_DICT_DEFAULTS))
298 { 298 {
299 if ((rc = tinyrad_dict_defaults(dict, &errs)) != TRAD_SUCCESS) 299 if ((rc = tinyrad_dict_builtin(dict, &errs)) != TRAD_SUCCESS)
300 { 300 {
301 trutils_error(opts, errs, NULL); 301 trutils_error(opts, errs, NULL);
302 tinyrad_strsfree(errs); 302 tinyrad_strsfree(errs);
diff --git a/tests/common-dict.c b/tests/common-dict.c
index 1d7aa4e..8a0ce8a 100644
--- a/tests/common-dict.c
+++ b/tests/common-dict.c
@@ -325,7 +325,7 @@ our_dict_initialize(
325 if ((opts & TEST_OPT_DFLT_DICT)) 325 if ((opts & TEST_OPT_DFLT_DICT))
326 { 326 {
327 trutils_verbose(opts, "loading default dictionary ..."); 327 trutils_verbose(opts, "loading default dictionary ...");
328 if ((rc = tinyrad_dict_defaults(*dictp, &errs)) != TRAD_SUCCESS) 328 if ((rc = tinyrad_dict_builtin(*dictp, &errs)) != TRAD_SUCCESS)
329 { 329 {
330 trutils_error(opts, errs, "tinyrad_dict_defaults(): %s", tinyrad_strerror(rc)); 330 trutils_error(opts, errs, "tinyrad_dict_defaults(): %s", tinyrad_strerror(rc));
331 tinyrad_strsfree(errs); 331 tinyrad_strsfree(errs);