tinyrad: splitting widgets into separate files

6 files changed, 215 insertions, 31 deletions

diff --git a/Makefile.am b/Makefile.am
index f710586..40dceb4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -305,8 +305,11 @@ lib_libutils_a_SOURCES			= $(noinst_HEADERS) $(include_HEADERS) \
 src_tinyrad_DEPENDENCIES                = $(lib_LTLIBRARIES) $(noinst_LIBRARIES)
 src_tinyrad_LDADD                       = $(lib_LTLIBRARIES) $(noinst_LIBRARIES)
 src_tinyrad_SOURCES                     = $(noinst_HEADERS) $(include_HEADERS) \
+                                          src/tru/tru.h \
                                           src/tru/tinyrad.c \
-                                          src/tru/tru.h
+                                          src/tru/widget-config.c \
+                                          src/tru/widget-dict.c \
+                                          src/tru/widget-url.c
 
 
 # macros for src/tinyrad-url
diff --git a/src/tru/tinyrad.c b/src/tru/tinyrad.c
index 79bd639..155f09a 100644
--- a/src/tru/tinyrad.c
+++ b/src/tru/tinyrad.c
@@ -293,36 +293,6 @@ tru_cleanup(
 
 
 int
-tru_widget_config(
-         TinyRadUtilConf *                 cnf )
-{
-   int               rc;
-   TinyRadDict *     dict;
-   if ((rc = tru_load_tinyrad(cnf)) != TRAD_SUCCESS)
-      return(rc);
-   tinyrad_get_option(cnf->tr, TRAD_OPT_DICTIONARY, &dict);
-   tinyrad_conf_print(cnf->tr, dict);
-   tinyrad_free(dict);
-   return(TRAD_SUCCESS);
-}
-
-
-int
-tru_widget_dict(
-         TinyRadUtilConf *                 cnf )
-{
-   int               rc;
-   TinyRadDict *     dict;
-   if ((rc = tru_load_tinyrad(cnf)) != TRAD_SUCCESS)
-      return(rc);
-   tinyrad_get_option(cnf->tr, TRAD_OPT_DICTIONARY, &dict);
-   tinyrad_dict_print(dict, 0xffff);
-   tinyrad_free(dict);
-   return(TRAD_SUCCESS);
-}
-
-
-int
 tru_getopt(
          TinyRadUtilConf *                 cnf,
          int                           argc,
diff --git a/src/tru/tru.h b/src/tru/tru.h
index 75c26c3..d0c54ab 100644
--- a/src/tru/tru.h
+++ b/src/tru/tru.h
@@ -187,6 +187,11 @@ tru_widget_dict(
 
 
 int
+tru_widget_url(
+         TinyRadUtilConf *                 cnf );
+
+
+int
 tru_getopt(
          TinyRadUtilConf *                 cnf,
          int                           argc,
diff --git a/src/tru/widget-config.c b/src/tru/widget-config.c
new file mode 100644
index 0000000..c090c86
--- /dev/null
+++ b/src/tru/widget-config.c
@@ -0,0 +1,70 @@
+/*
+ *  Tiny RADIUS Client Library
+ *  Copyright (C) 2022 David M. Syzdek <david@syzdek.net>.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of David M. Syzdek nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ *  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ *  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ *  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DAVID M. SYZDEK BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ *  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ *  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ *  SUCH DAMAGE.
+ */
+#define _SRC_TRU_WIDGET_CONFIG_C 1
+
+///////////////
+//           //
+//  Headers  //
+//           //
+///////////////
+#pragma mark - Headers
+
+#include "tru.h"
+
+#include <tinyrad_utils.h>
+
+#include <stdio.h>
+#include <assert.h>
+
+
+/////////////////
+//             //
+//  Functions  //
+//             //
+/////////////////
+#pragma mark - Functions
+
+int
+tru_widget_config(
+         TinyRadUtilConf *                 cnf )
+{
+   int               rc;
+   TinyRadDict *     dict;
+   if ((rc = tru_load_tinyrad(cnf)) != TRAD_SUCCESS)
+      return(rc);
+   tinyrad_get_option(cnf->tr, TRAD_OPT_DICTIONARY, &dict);
+   tinyrad_conf_print(cnf->tr, dict);
+   tinyrad_free(dict);
+   return(TRAD_SUCCESS);
+}
+
+
+/* end of source */
diff --git a/src/tru/widget-dict.c b/src/tru/widget-dict.c
new file mode 100644
index 0000000..1faff32
--- /dev/null
+++ b/src/tru/widget-dict.c
@@ -0,0 +1,70 @@
+/*
+ *  Tiny RADIUS Client Library
+ *  Copyright (C) 2022 David M. Syzdek <david@syzdek.net>.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of David M. Syzdek nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ *  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ *  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ *  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DAVID M. SYZDEK BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ *  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ *  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ *  SUCH DAMAGE.
+ */
+#define _SRC_TRU_WIDGET_DICT_C 1
+
+///////////////
+//           //
+//  Headers  //
+//           //
+///////////////
+#pragma mark - Headers
+
+#include "tru.h"
+
+#include <tinyrad_utils.h>
+
+#include <stdio.h>
+#include <assert.h>
+
+
+/////////////////
+//             //
+//  Functions  //
+//             //
+/////////////////
+#pragma mark - Functions
+
+int
+tru_widget_dict(
+         TinyRadUtilConf *                 cnf )
+{
+   int               rc;
+   TinyRadDict *     dict;
+   if ((rc = tru_load_tinyrad(cnf)) != TRAD_SUCCESS)
+      return(rc);
+   tinyrad_get_option(cnf->tr, TRAD_OPT_DICTIONARY, &dict);
+   tinyrad_dict_print(dict, 0xffff);
+   tinyrad_free(dict);
+   return(TRAD_SUCCESS);
+}
+
+
+/* end of source */
diff --git a/src/tru/widget-url.c b/src/tru/widget-url.c
new file mode 100644
index 0000000..2e2cd85
--- /dev/null
+++ b/src/tru/widget-url.c
@@ -0,0 +1,66 @@
+/*
+ *  Tiny RADIUS Client Library
+ *  Copyright (C) 2022 David M. Syzdek <david@syzdek.net>.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of David M. Syzdek nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ *  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ *  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ *  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DAVID M. SYZDEK BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ *  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ *  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ *  SUCH DAMAGE.
+ */
+#define _SRC_TRU_WIDGET_URL_C 1
+
+///////////////
+//           //
+//  Headers  //
+//           //
+///////////////
+#pragma mark - Headers
+
+#include "tru.h"
+
+#include <tinyrad_utils.h>
+
+#include <stdio.h>
+#include <assert.h>
+
+
+/////////////////
+//             //
+//  Functions  //
+//             //
+/////////////////
+#pragma mark - Functions
+
+int
+tru_widget_url(
+         TinyRadUtilConf *                 cnf )
+{
+   int               rc;
+   if ((rc = tru_load_tinyrad(cnf)) != TRAD_SUCCESS)
+      return(rc);
+   return(TRAD_SUCCESS);
+}
+
+
+/* end of source */