Skip to contentSkip to conversation

libxtables/xtables.c - compiler warning fixes for NO_SHARED_LIBS

PATCH In review Maciej Żenczykowski 2 participants 3 messages Jun 23, 2020 – Jul 4, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libxtables/xtables.c - compiler warning fixes for NO_SHARED_LIBS

From: Maciej Żenczykowski <[email protected]>

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

---
 libxtables/xtables.c | 4 ++++
 1 file changed, 4 insertions(+)
libxtables/xtables.c +4 -0
index 7fe42580..8907ba20 100644
@@ -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)
Signature · 1 line
2.27.0.111.gc72c7da667-goog
#1 lore raw

libxtables/xtables.c void xtables_init(void) · line 275

Quoted 6 lines

void xtables_fini(void)
{

libxtables/xtables.c +2 -0
+#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...

#2 lore raw
In reply to Maciej Żenczykowski
Quoted 7 lines · Maciej Żenczykowski

From: Maciej Żenczykowski <[email protected]>

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.