mainloop: hide unnecessary symbols

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index 2caaaad252a6a825aa7feb596dd3a30baa2518fd..fd3eec99400fb5b098290b4073784e4789a644b1 100644 (file)
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -553,6 +553,7 @@ lxc_stop_SOURCES = tools/lxc_stop.c \
                   file_utils.c file_utils.h \
                   initutils.c initutils.h \
                   log.c log.h \
+                  mainloop.c mainloop.h \
                   string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_stop_SOURCES += seccomp.c lxcseccomp.h
@@ -568,6 +569,7 @@ lxc_top_SOURCES = tools/lxc_top.c \
                  file_utils.c file_utils.h \
                  initutils.c initutils.h \
                  log.c log.h \
+                 mainloop.c mainloop.h \
                  string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_top_SOURCES += seccomp.c lxcseccomp.h

diff --git a/src/lxc/mainloop.h b/src/lxc/mainloop.h
index e6ab9a6d9e93eb870c178c49fc68e1804c0917d1..2a16c94e06952532874f52775e18fbe7738d3c58 100644 (file)
--- a/src/lxc/mainloop.h
+++ b/src/lxc/mainloop.h
@@ -5,6 +5,7 @@
 
 #include <stdint.h>
 
+#include "compiler.h"
 #include "list.h"
 #include "memory_utils.h"
 
@@ -20,21 +21,18 @@ struct lxc_epoll_descr {
 typedef int (*lxc_mainloop_callback_t)(int fd, uint32_t event, void *data,
                                       struct lxc_epoll_descr *descr);
 
-extern int lxc_mainloop(struct lxc_epoll_descr *descr, int timeout_ms);
+__hidden extern int lxc_mainloop(struct lxc_epoll_descr *descr, int timeout_ms);
 
-extern int lxc_mainloop_add_handler_events(struct lxc_epoll_descr *descr,
-                                          int fd, int events,
-                                          lxc_mainloop_callback_t callback,
-                                          void *data);
-extern int lxc_mainloop_add_handler(struct lxc_epoll_descr *descr, int fd,
-                                   lxc_mainloop_callback_t callback,
-                                   void *data);
+__hidden extern int lxc_mainloop_add_handler_events(struct lxc_epoll_descr *descr, int fd, int events,
+                                                   lxc_mainloop_callback_t callback, void *data);
+__hidden extern int lxc_mainloop_add_handler(struct lxc_epoll_descr *descr, int fd,
+                                            lxc_mainloop_callback_t callback, void *data);
 
-extern int lxc_mainloop_del_handler(struct lxc_epoll_descr *descr, int fd);
+__hidden extern int lxc_mainloop_del_handler(struct lxc_epoll_descr *descr, int fd);
 
-extern int lxc_mainloop_open(struct lxc_epoll_descr *descr);
+__hidden extern int lxc_mainloop_open(struct lxc_epoll_descr *descr);
 
-extern void lxc_mainloop_close(struct lxc_epoll_descr *descr);
+__hidden extern void lxc_mainloop_close(struct lxc_epoll_descr *descr);
 
 define_cleanup_function(struct lxc_epoll_descr *, lxc_mainloop_close);
 

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 064b2b0f63302ffb05db9ca313114a697f488463..b660e0a0da486ae813b6b92ac2ac0550080b072d 100644 (file)
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -18,6 +18,7 @@ lxc_test_api_reboot_SOURCES = api_reboot.c \
                              ../lxc/file_utils.c ../lxc/file_utils.h \
                              ../lxc/initutils.c ../lxc/initutils.h \
                              ../lxc/log.c ../lxc/log.h \
+                             ../lxc/mainloop.c ../lxc/mainloop.h \
                              ../lxc/network.c ../lxc/network.h \
                              ../lxc/nl.c ../lxc/nl.h \
                              ../lxc/string_utils.c ../lxc/string_utils.h
@@ -37,6 +38,7 @@ lxc_test_attach_SOURCES = attach.c \
                          ../lxc/file_utils.c ../lxc/file_utils.h \
                          ../lxc/initutils.c ../lxc/initutils.h \
                          ../lxc/log.c ../lxc/log.h \
+                         ../lxc/mainloop.c ../lxc/mainloop.h \
                          ../lxc/network.c ../lxc/network.h \
                          ../lxc/nl.c ../lxc/nl.h \
                          ../lxc/string_utils.c ../lxc/string_utils.h
@@ -56,6 +58,7 @@ lxc_test_cgpath_SOURCES = cgpath.c \
                          ../lxc/file_utils.c ../lxc/file_utils.h \
                          ../lxc/initutils.c ../lxc/initutils.h \
                          ../lxc/log.c ../lxc/log.h \
+                         ../lxc/mainloop.c ../lxc/mainloop.h \
                          ../lxc/network.c ../lxc/network.h \
                          ../lxc/nl.c ../lxc/nl.h \
                          ../lxc/string_utils.c ../lxc/string_utils.h
@@ -77,6 +80,7 @@ lxc_test_config_jump_table_SOURCES = config_jump_table.c \
                                     ../lxc/file_utils.c ../lxc/file_utils.h \
                                     ../lxc/initutils.c ../lxc/initutils.h \
                                     ../lxc/log.c ../lxc/log.h \
+                                    ../lxc/mainloop.c ../lxc/mainloop.h \
                                     ../lxc/network.c ../lxc/network.h \
                                     ../lxc/nl.c ../lxc/nl.h \
                                     ../lxc/string_utils.c ../lxc/string_utils.h
@@ -159,6 +163,7 @@ lxc_test_utils_SOURCES = lxc-test-utils.c \
                          ../lxc/file_utils.c ../lxc/file_utils.h \
                          ../lxc/initutils.c ../lxc/initutils.h \
                          ../lxc/log.c ../lxc/log.h \
+                         ../lxc/mainloop.c ../lxc/mainloop.h \
                          ../lxc/network.c ../lxc/network.h \
                          ../lxc/nl.c ../lxc/nl.h \
                          ../lxc/string_utils.c ../lxc/string_utils.h