diff mbox series

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

Message ID 20200623230902.236511-1-zenczykowski@gmail.com
State Accepted
Delegated to: Pablo Neira
Headers show
Series [iptables] libxtables/xtables.c - compiler warning fixes for NO_SHARED_LIBS | expand

Commit Message

Maciej Żenczykowski June 23, 2020, 11:09 p.m. UTC 
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(+)

Comments

Maciej Żenczykowski June 23, 2020, 11:11 p.m. UTC | #1 
>  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...
Pablo Neira Ayuso July 4, 2020, 12:08 a.m. UTC | #2 
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.
diff mbox series

Patch

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)