[PATCH iptables] libxtables/xtables.c - compiler warning fixes for NO_SHARED_LIBS

[PATCH iptables] libxtables/xtables.c - compiler warning fixes for NO_SHARED_LIBS

[Maciej Żenczykowski]

From: Maciej Żenczykowski <maze@google.com>

Fixes two issues with NO_SHARED_LIBS:
 - #include <dlfcn.h> is ifdef'ed out and thus dlclose()
   triggers an undeclared function compiler warning
 - dlreg_add() is unused and thus triggers an unused
   function warning

Test: builds without warnings
Signed-off-by: Maciej Żenczykowski <maze@google.com>
---
 libxtables/xtables.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libxtables/xtables.c b/libxtables/xtables.c
index 7fe42580..8907ba20 100644
--- a/libxtables/xtables.c
+++ b/libxtables/xtables.c
@@ -206,6 +206,7 @@ struct xtables_target *xtables_targets;
 static bool xtables_fully_register_pending_match(struct xtables_match *me);
 static bool xtables_fully_register_pending_target(struct xtables_target *me);
 
+#ifndef NO_SHARED_LIBS
 /* registry for loaded shared objects to close later */
 struct dlreg {
 	struct dlreg *next;
@@ -237,6 +238,7 @@ static void dlreg_free(void)
 		dlreg = next;
 	}
 }
+#endif
 
 void xtables_init(void)
 {
@@ -267,7 +269,9 @@ void xtables_init(void)
 
 void xtables_fini(void)
 {
+#ifndef NO_SHARED_LIBS
 	dlreg_free();
+#endif
 }
 
 void xtables_set_nfproto(uint8_t nfproto)
-- 
2.27.0.111.gc72c7da667-goog

Re: [PATCH iptables] libxtables/xtables.c - compiler warning fixes for NO_SHARED_LIBS

[Maciej Żenczykowski]

>  void xtables_fini(void)
>  {
> +#ifndef NO_SHARED_LIBS
>         dlreg_free();
> +#endif
>  }

Note: I also considered just adding an empty 'void dlreg_free(void)
{}' function in the NO_SHARED_LIBS case, but that doesn't seem to be
the prevalent style...

Re: [PATCH iptables] libxtables/xtables.c - compiler warning fixes for NO_SHARED_LIBS

[Pablo Neira Ayuso]

On Tue, Jun 23, 2020 at 04:09:02PM -0700, Maciej Żenczykowski wrote:
> From: Maciej Żenczykowski <maze@google.com>
> 
> Fixes two issues with NO_SHARED_LIBS:
>  - #include <dlfcn.h> is ifdef'ed out and thus dlclose()
>    triggers an undeclared function compiler warning
>  - dlreg_add() is unused and thus triggers an unused
>    function warning

Patch is applied, thank you.