state: 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 5c99913a819b5f6ec086ce37d1ab8ae393f034aa..e5878459e9f2b2a194671879fc04fd327a807543 100644 (file)
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -353,6 +353,7 @@ lxc_attach_SOURCES = tools/lxc_attach.c \
                     rexec.c rexec.h \
                     ringbuf.c ringbuf.h \
                     start.c start.h \
+                    state.c state.h \
                     string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_attach_SOURCES += seccomp.c lxcseccomp.h
@@ -381,6 +382,7 @@ lxc_autostart_SOURCES = tools/lxc_autostart.c \
                        process_utils.c process_utils.h \
                        ringbuf.c ringbuf.h \
                        start.c start.h \
+                       state.c state.h \
                        string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_autostart_SOURCES += seccomp.c lxcseccomp.h
@@ -409,6 +411,7 @@ lxc_cgroup_SOURCES = tools/lxc_cgroup.c \
                     process_utils.c process_utils.h \
                     ringbuf.c ringbuf.h \
                     start.c start.h \
+                    state.c state.h \
                     string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_cgroup_SOURCES += seccomp.c lxcseccomp.h
@@ -437,6 +440,7 @@ lxc_config_SOURCES = tools/lxc_config.c \
                     process_utils.c process_utils.h \
                     ringbuf.c ringbuf.h \
                     start.c start.h \
+                    state.c state.h \
                     string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_config_SOURCES += seccomp.c lxcseccomp.h
@@ -465,6 +469,7 @@ lxc_console_SOURCES = tools/lxc_console.c \
                      process_utils.c process_utils.h \
                      ringbuf.c ringbuf.h \
                      start.c start.h \
+                     state.c state.h \
                      string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_console_SOURCES += seccomp.c lxcseccomp.h
@@ -493,6 +498,7 @@ lxc_destroy_SOURCES = tools/lxc_destroy.c \
                      process_utils.c process_utils.h \
                      ringbuf.c ringbuf.h \
                      start.c start.h \
+                     state.c state.h \
                      string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_destroy_SOURCES += seccomp.c lxcseccomp.h
@@ -521,6 +527,7 @@ lxc_device_SOURCES = tools/lxc_device.c \
                     process_utils.c process_utils.h \
                     ringbuf.c ringbuf.h \
                     start.c start.h \
+                    state.c state.h \
                     string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_device_SOURCES += seccomp.c lxcseccomp.h
@@ -549,6 +556,7 @@ lxc_execute_SOURCES = tools/lxc_execute.c \
                      process_utils.c process_utils.h \
                      ringbuf.c ringbuf.h \
                      start.c start.h \
+                     state.c state.h \
                      string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_execute_SOURCES += seccomp.c lxcseccomp.h
@@ -577,6 +585,7 @@ lxc_freeze_SOURCES = tools/lxc_freeze.c \
                     process_utils.c process_utils.h \
                     ringbuf.c ringbuf.h \
                     start.c start.h \
+                    state.c state.h \
                     string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_freeze_SOURCES += seccomp.c lxcseccomp.h
@@ -605,6 +614,7 @@ lxc_info_SOURCES = tools/lxc_info.c \
                   process_utils.c process_utils.h \
                   ringbuf.c ringbuf.h \
                   start.c start.h \
+                  state.c state.h \
                   string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_info_SOURCES += seccomp.c lxcseccomp.h
@@ -634,6 +644,7 @@ lxc_monitor_SOURCES = tools/lxc_monitor.c \
                      process_utils.c process_utils.h \
                      ringbuf.c ringbuf.h \
                      start.c start.h \
+                     state.c state.h \
                      string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_monitor_SOURCES += seccomp.c lxcseccomp.h
@@ -663,6 +674,7 @@ lxc_ls_SOURCES = tools/lxc_ls.c \
                 process_utils.c process_utils.h \
                 ringbuf.c ringbuf.h \
                 start.c start.h \
+                state.c state.h \
                 string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_ls_SOURCES += seccomp.c lxcseccomp.h
@@ -691,6 +703,7 @@ lxc_copy_SOURCES = tools/lxc_copy.c \
                   process_utils.c process_utils.h \
                   ringbuf.c ringbuf.h \
                   start.c start.h \
+                  state.c state.h \
                   storage/storage_utils.c storage/storage_utils.h \
                   string_utils.c string_utils.h
 if ENABLE_SECCOMP
@@ -720,6 +733,7 @@ lxc_start_SOURCES = tools/lxc_start.c \
                    process_utils.c process_utils.h \
                    ringbuf.c ringbuf.h \
                    start.c start.h \
+                   state.c state.h \
                    string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_start_SOURCES += seccomp.c lxcseccomp.h
@@ -748,6 +762,7 @@ lxc_stop_SOURCES = tools/lxc_stop.c \
                   process_utils.c process_utils.h \
                   ringbuf.c ringbuf.h \
                   start.c start.h \
+                  state.c state.h \
                   string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_stop_SOURCES += seccomp.c lxcseccomp.h
@@ -776,6 +791,7 @@ lxc_top_SOURCES = tools/lxc_top.c \
                  process_utils.c process_utils.h \
                  ringbuf.c ringbuf.h \
                  start.c start.h \
+                 state.c state.h \
                  string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_top_SOURCES += seccomp.c lxcseccomp.h
@@ -804,6 +820,7 @@ lxc_unfreeze_SOURCES = tools/lxc_unfreeze.c \
                       process_utils.c process_utils.h \
                       ringbuf.c ringbuf.h \
                       start.c start.h \
+                      state.c state.h \
                       string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_unfreeze_SOURCES += seccomp.c lxcseccomp.h
@@ -832,6 +849,7 @@ lxc_unshare_SOURCES = tools/lxc_unshare.c \
                      process_utils.c process_utils.h \
                      ringbuf.c ringbuf.h \
                      start.c start.h \
+                     state.c state.h \
                      string_utils.c string_utils.h \
                      syscall_numbers.h \
                      syscall_wrappers.h
@@ -862,6 +880,7 @@ lxc_wait_SOURCES = tools/lxc_wait.c \
                   process_utils.c process_utils.h \
                   ringbuf.c ringbuf.h \
                   start.c start.h \
+                  state.c state.h \
                   string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_wait_SOURCES += seccomp.c lxcseccomp.h
@@ -890,6 +909,7 @@ lxc_create_SOURCES = tools/lxc_create.c \
                     process_utils.c process_utils.h \
                     ringbuf.c ringbuf.h \
                     start.c start.h \
+                    state.c state.h \
                     storage/storage_utils.c storage/storage_utils.h \
                     string_utils.c string_utils.h
 if ENABLE_SECCOMP
@@ -919,6 +939,7 @@ lxc_snapshot_SOURCES = tools/lxc_snapshot.c \
                       process_utils.c process_utils.h \
                       ringbuf.c ringbuf.h \
                       start.c start.h \
+                      state.c state.h \
                       string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_snapshot_SOURCES += seccomp.c lxcseccomp.h
@@ -947,6 +968,7 @@ lxc_checkpoint_SOURCES = tools/lxc_checkpoint.c \
                         process_utils.c process_utils.h \
                         ringbuf.c ringbuf.h \
                         start.c start.h \
+                        state.c state.h \
                         string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_checkpoint_SOURCES += seccomp.c lxcseccomp.h
@@ -997,6 +1019,7 @@ lxc_monitord_SOURCES = cmd/lxc_monitord.c \
                       process_utils.c process_utils.h \
                       ringbuf.c ringbuf.h \
                       start.c start.h \
+                      state.c state.h \
                       string_utils.c string_utils.h \
                       syscall_numbers.h \
                       utils.c utils.h
@@ -1028,6 +1051,7 @@ lxc_user_nic_SOURCES = cmd/lxc_user_nic.c \
                       process_utils.c process_utils.h \
                       ringbuf.c ringbuf.h \
                       start.c start.h \
+                      state.c state.h \
                       string_utils.c string_utils.h \
                       syscall_numbers.h \
                       syscall_wrappers.h
@@ -1060,6 +1084,7 @@ lxc_usernsexec_SOURCES = cmd/lxc_usernsexec.c \
                         process_utils.c process_utils.h \
                         ringbuf.c ringbuf.h \
                         start.c start.h \
+                        state.c state.h \
                         string_utils.c string_utils.h \
                         syscall_wrappers.h \
                         utils.c utils.h

diff --git a/src/lxc/state.h b/src/lxc/state.h
index 994d1b792aad0291ebc9908be8f15f3886f86a88..afb2fbb785b06fe1fe38cb85375dcbf7c8bd981e 100644 (file)
--- a/src/lxc/state.h
+++ b/src/lxc/state.h
@@ -3,6 +3,8 @@
 #ifndef __LXC_STATE_H
 #define __LXC_STATE_H
 
+#include "compiler.h"
+
 #define MAX_STATE_LENGTH (8 + 1)
 
 typedef enum {
@@ -23,10 +25,11 @@ enum {
        REBOOT_INIT
 };
 
-extern lxc_state_t lxc_getstate(const char *name, const char *lxcpath);
+__hidden extern lxc_state_t lxc_getstate(const char *name, const char *lxcpath);
 
-extern lxc_state_t lxc_str2state(const char *state);
-extern const char *lxc_state2str(lxc_state_t state);
-extern int lxc_wait(const char *lxcname, const char *states, int timeout, const char *lxcpath);
+__hidden extern lxc_state_t lxc_str2state(const char *state);
+__hidden extern const char *lxc_state2str(lxc_state_t state);
+__hidden extern int lxc_wait(const char *lxcname, const char *states, int timeout,
+                            const char *lxcpath);
 
-#endif
+#endif /* __LXC_STATE_H */

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 0b354437efd1cce7810d8cc89f9c2f812fee5e1f..7c68e69e4b9a8a146e166c30526f716ab5069198 100644 (file)
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -29,6 +29,7 @@ lxc_test_api_reboot_SOURCES = api_reboot.c \
                              ../lxc/process_utils.c ../lxc/process_utils.h \
                              ../lxc/ringbuf.c ../lxc/ringbuf.h \
                              ../lxc/start.c ../lxc/start.h \
+                             ../lxc/state.c ../lxc/state.h \
                              ../lxc/string_utils.c ../lxc/string_utils.h
 if ENABLE_SECCOMP
 lxc_test_api_reboot_SOURCES += ../lxc/seccomp.c ../lxc/lxcseccomp.h
@@ -57,6 +58,7 @@ lxc_test_attach_SOURCES = attach.c \
                          ../lxc/process_utils.c ../lxc/process_utils.h \
                          ../lxc/ringbuf.c ../lxc/ringbuf.h \
                          ../lxc/start.c ../lxc/start.h \
+                         ../lxc/state.c ../lxc/state.h \
                          ../lxc/string_utils.c ../lxc/string_utils.h
 if ENABLE_SECCOMP
 lxc_test_attach_SOURCES += ../lxc/seccomp.c ../lxc/lxcseccomp.h
@@ -85,6 +87,7 @@ lxc_test_cgpath_SOURCES = cgpath.c \
                          ../lxc/process_utils.c ../lxc/process_utils.h \
                          ../lxc/ringbuf.c ../lxc/ringbuf.h \
                          ../lxc/start.c ../lxc/start.h \
+                         ../lxc/state.c ../lxc/state.h \
                          ../lxc/string_utils.c ../lxc/string_utils.h
 if ENABLE_SECCOMP
 lxc_test_cgpath_SOURCES += ../lxc/seccomp.c ../lxc/lxcseccomp.h
@@ -115,6 +118,7 @@ lxc_test_config_jump_table_SOURCES = config_jump_table.c \
                                     ../lxc/process_utils.c ../lxc/process_utils.h \
                                     ../lxc/ringbuf.c ../lxc/ringbuf.h \
                                     ../lxc/start.c ../lxc/start.h \
+                                    ../lxc/state.c ../lxc/state.h \
                                     ../lxc/string_utils.c ../lxc/string_utils.h
 if ENABLE_SECCOMP
 lxc_test_config_jump_table_SOURCES += ../lxc/seccomp.c ../lxc/lxcseccomp.h
@@ -166,6 +170,7 @@ lxc_test_parse_config_file_SOURCES = parse_config_file.c \
                                     ../lxc/process_utils.c ../lxc/process_utils.h \
                                     ../lxc/ringbuf.c ../lxc/ringbuf.h \
                                     ../lxc/start.c ../lxc/start.h \
+                                    ../lxc/state.c ../lxc/state.h \
                                     ../lxc/string_utils.c ../lxc/string_utils.h
 if ENABLE_SECCOMP
 lxc_test_parse_config_file_SOURCES += ../lxc/seccomp.c ../lxc/lxcseccomp.h
@@ -217,6 +222,7 @@ lxc_test_utils_SOURCES = lxc-test-utils.c \
                          ../lxc/process_utils.c ../lxc/process_utils.h \
                          ../lxc/ringbuf.c ../lxc/ringbuf.h \
                          ../lxc/start.c ../lxc/start.h \
+                         ../lxc/state.c ../lxc/state.h \
                          ../lxc/string_utils.c ../lxc/string_utils.h
 if ENABLE_SECCOMP
 lxc_test_utils_SOURCES += ../lxc/seccomp.c ../lxc/lxcseccomp.h