Skip to content

L
lxc
Unverified Commit 64bcba9f by Christian Brauner
Options

parse: hide unnecessary symbols

Signed-off-by: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent 0144cea2
Showing with 37 additions and 8 deletions
src/lxc/Makefile.am
...@@ -342,6 +342,7 @@ lxc_attach_SOURCES = tools/lxc_attach.c \ ...@@ -342,6 +342,7 @@ lxc_attach_SOURCES = tools/lxc_attach.c \
namespace.c namespace.h \ namespace.c namespace.h \
network.c network.h \ network.c network.h \
nl.c nl.h \ nl.c nl.h \
parse.c parse.h \
rexec.c rexec.h \ rexec.c rexec.h \
string_utils.c string_utils.h string_utils.c string_utils.h
if ENABLE_SECCOMP if ENABLE_SECCOMP
...@@ -361,6 +362,7 @@ lxc_autostart_SOURCES = tools/lxc_autostart.c \ ...@@ -361,6 +362,7 @@ lxc_autostart_SOURCES = tools/lxc_autostart.c \
namespace.c namespace.h \ namespace.c namespace.h \
network.c network.h \ network.c network.h \
nl.c nl.h \ nl.c nl.h \
parse.c parse.h \
string_utils.c string_utils.h string_utils.c string_utils.h
if ENABLE_SECCOMP if ENABLE_SECCOMP
lxc_autostart_SOURCES += seccomp.c lxcseccomp.h lxc_autostart_SOURCES += seccomp.c lxcseccomp.h
...@@ -379,6 +381,7 @@ lxc_cgroup_SOURCES = tools/lxc_cgroup.c \ ...@@ -379,6 +381,7 @@ lxc_cgroup_SOURCES = tools/lxc_cgroup.c \
namespace.c namespace.h \ namespace.c namespace.h \
network.c network.h \ network.c network.h \
nl.c nl.h \ nl.c nl.h \
parse.c parse.h \
string_utils.c string_utils.h string_utils.c string_utils.h
if ENABLE_SECCOMP if ENABLE_SECCOMP
lxc_cgroup_SOURCES += seccomp.c lxcseccomp.h lxc_cgroup_SOURCES += seccomp.c lxcseccomp.h
...@@ -397,6 +400,7 @@ lxc_config_SOURCES = tools/lxc_config.c \ ...@@ -397,6 +400,7 @@ lxc_config_SOURCES = tools/lxc_config.c \
namespace.c namespace.h \ namespace.c namespace.h \
network.c network.h \ network.c network.h \
nl.c nl.h \ nl.c nl.h \
parse.c parse.h \
string_utils.c string_utils.h string_utils.c string_utils.h
if ENABLE_SECCOMP if ENABLE_SECCOMP
lxc_config_SOURCES += seccomp.c lxcseccomp.h lxc_config_SOURCES += seccomp.c lxcseccomp.h
...@@ -415,6 +419,7 @@ lxc_console_SOURCES = tools/lxc_console.c \ ...@@ -415,6 +419,7 @@ lxc_console_SOURCES = tools/lxc_console.c \
namespace.c namespace.h \ namespace.c namespace.h \
network.c network.h \ network.c network.h \
nl.c nl.h \ nl.c nl.h \
parse.c parse.h \
string_utils.c string_utils.h string_utils.c string_utils.h
if ENABLE_SECCOMP if ENABLE_SECCOMP
lxc_console_SOURCES += seccomp.c lxcseccomp.h lxc_console_SOURCES += seccomp.c lxcseccomp.h
...@@ -433,6 +438,7 @@ lxc_destroy_SOURCES = tools/lxc_destroy.c \ ...@@ -433,6 +438,7 @@ lxc_destroy_SOURCES = tools/lxc_destroy.c \
namespace.c namespace.h \ namespace.c namespace.h \
network.c network.h \ network.c network.h \
nl.c nl.h \ nl.c nl.h \
parse.c parse.h \
string_utils.c string_utils.h string_utils.c string_utils.h
if ENABLE_SECCOMP if ENABLE_SECCOMP
lxc_destroy_SOURCES += seccomp.c lxcseccomp.h lxc_destroy_SOURCES += seccomp.c lxcseccomp.h
...@@ -451,6 +457,7 @@ lxc_device_SOURCES = tools/lxc_device.c \ ...@@ -451,6 +457,7 @@ lxc_device_SOURCES = tools/lxc_device.c \
namespace.c namespace.h \ namespace.c namespace.h \
network.c network.h \ network.c network.h \
nl.c nl.h \ nl.c nl.h \
parse.c parse.h \
string_utils.c string_utils.h string_utils.c string_utils.h
if ENABLE_SECCOMP if ENABLE_SECCOMP
lxc_device_SOURCES += seccomp.c lxcseccomp.h lxc_device_SOURCES += seccomp.c lxcseccomp.h
...@@ -469,6 +476,7 @@ lxc_execute_SOURCES = tools/lxc_execute.c \ ...@@ -469,6 +476,7 @@ lxc_execute_SOURCES = tools/lxc_execute.c \
namespace.c namespace.h \ namespace.c namespace.h \
network.c network.h \ network.c network.h \
nl.c nl.h \ nl.c nl.h \
parse.c parse.h \
string_utils.c string_utils.h string_utils.c string_utils.h
if ENABLE_SECCOMP if ENABLE_SECCOMP
lxc_execute_SOURCES += seccomp.c lxcseccomp.h lxc_execute_SOURCES += seccomp.c lxcseccomp.h
...@@ -487,6 +495,7 @@ lxc_freeze_SOURCES = tools/lxc_freeze.c \ ...@@ -487,6 +495,7 @@ lxc_freeze_SOURCES = tools/lxc_freeze.c \
namespace.c namespace.h \ namespace.c namespace.h \
network.c network.h \ network.c network.h \
nl.c nl.h \ nl.c nl.h \
parse.c parse.h \
string_utils.c string_utils.h string_utils.c string_utils.h
if ENABLE_SECCOMP if ENABLE_SECCOMP
lxc_freeze_SOURCES += seccomp.c lxcseccomp.h lxc_freeze_SOURCES += seccomp.c lxcseccomp.h
...@@ -505,6 +514,7 @@ lxc_info_SOURCES = tools/lxc_info.c \ ...@@ -505,6 +514,7 @@ lxc_info_SOURCES = tools/lxc_info.c \
namespace.c namespace.h \ namespace.c namespace.h \
network.c network.h \ network.c network.h \
nl.c nl.h \ nl.c nl.h \
parse.c parse.h \
string_utils.c string_utils.h string_utils.c string_utils.h
if ENABLE_SECCOMP if ENABLE_SECCOMP
lxc_info_SOURCES += seccomp.c lxcseccomp.h lxc_info_SOURCES += seccomp.c lxcseccomp.h
...@@ -525,6 +535,7 @@ lxc_monitor_SOURCES = tools/lxc_monitor.c \ ...@@ -525,6 +535,7 @@ lxc_monitor_SOURCES = tools/lxc_monitor.c \
namespace.c namespace.h \ namespace.c namespace.h \
network.c network.h \ network.c network.h \
nl.c nl.h \ nl.c nl.h \
parse.c parse.h \
string_utils.c string_utils.h string_utils.c string_utils.h
if ENABLE_SECCOMP if ENABLE_SECCOMP
lxc_monitor_SOURCES += seccomp.c lxcseccomp.h lxc_monitor_SOURCES += seccomp.c lxcseccomp.h
...@@ -544,6 +555,7 @@ lxc_ls_SOURCES = tools/lxc_ls.c \ ...@@ -544,6 +555,7 @@ lxc_ls_SOURCES = tools/lxc_ls.c \
namespace.c namespace.h \ namespace.c namespace.h \
network.c network.h \ network.c network.h \
nl.c nl.h \ nl.c nl.h \
parse.c parse.h \
string_utils.c string_utils.h string_utils.c string_utils.h
if ENABLE_SECCOMP if ENABLE_SECCOMP
lxc_ls_SOURCES += seccomp.c lxcseccomp.h lxc_ls_SOURCES += seccomp.c lxcseccomp.h
...@@ -562,6 +574,7 @@ lxc_copy_SOURCES = tools/lxc_copy.c \ ...@@ -562,6 +574,7 @@ lxc_copy_SOURCES = tools/lxc_copy.c \
namespace.c namespace.h \ namespace.c namespace.h \
network.c network.h \ network.c network.h \
nl.c nl.h \ nl.c nl.h \
parse.c parse.h \
storage/storage_utils.c storage/storage_utils.h \ storage/storage_utils.c storage/storage_utils.h \
string_utils.c string_utils.h string_utils.c string_utils.h
if ENABLE_SECCOMP if ENABLE_SECCOMP
...@@ -581,6 +594,7 @@ lxc_start_SOURCES = tools/lxc_start.c \ ...@@ -581,6 +594,7 @@ lxc_start_SOURCES = tools/lxc_start.c \
namespace.c namespace.h \ namespace.c namespace.h \
network.c network.h \ network.c network.h \
nl.c nl.h \ nl.c nl.h \
parse.c parse.h \
string_utils.c string_utils.h string_utils.c string_utils.h
if ENABLE_SECCOMP if ENABLE_SECCOMP
lxc_start_SOURCES += seccomp.c lxcseccomp.h lxc_start_SOURCES += seccomp.c lxcseccomp.h
...@@ -600,6 +614,7 @@ lxc_stop_SOURCES = tools/lxc_stop.c \ ...@@ -600,6 +614,7 @@ lxc_stop_SOURCES = tools/lxc_stop.c \
namespace.c namespace.h \ namespace.c namespace.h \
network.c network.h \ network.c network.h \
nl.c nl.h \ nl.c nl.h \
parse.c parse.h \
string_utils.c string_utils.h string_utils.c string_utils.h
if ENABLE_SECCOMP if ENABLE_SECCOMP
lxc_stop_SOURCES += seccomp.c lxcseccomp.h lxc_stop_SOURCES += seccomp.c lxcseccomp.h
...@@ -619,6 +634,7 @@ lxc_top_SOURCES = tools/lxc_top.c \ ...@@ -619,6 +634,7 @@ lxc_top_SOURCES = tools/lxc_top.c \
namespace.c namespace.h \ namespace.c namespace.h \
network.c network.h \ network.c network.h \
nl.c nl.h \ nl.c nl.h \
parse.c parse.h \
string_utils.c string_utils.h string_utils.c string_utils.h
if ENABLE_SECCOMP if ENABLE_SECCOMP
lxc_top_SOURCES += seccomp.c lxcseccomp.h lxc_top_SOURCES += seccomp.c lxcseccomp.h
...@@ -637,6 +653,7 @@ lxc_unfreeze_SOURCES = tools/lxc_unfreeze.c \ ...@@ -637,6 +653,7 @@ lxc_unfreeze_SOURCES = tools/lxc_unfreeze.c \
namespace.c namespace.h \ namespace.c namespace.h \
network.c network.h \ network.c network.h \
nl.c nl.h \ nl.c nl.h \
parse.c parse.h \
string_utils.c string_utils.h string_utils.c string_utils.h
if ENABLE_SECCOMP if ENABLE_SECCOMP
lxc_unfreeze_SOURCES += seccomp.c lxcseccomp.h lxc_unfreeze_SOURCES += seccomp.c lxcseccomp.h
...@@ -655,6 +672,7 @@ lxc_unshare_SOURCES = tools/lxc_unshare.c \ ...@@ -655,6 +672,7 @@ lxc_unshare_SOURCES = tools/lxc_unshare.c \
namespace.c namespace.h \ namespace.c namespace.h \
network.c network.h \ network.c network.h \
nl.c nl.h \ nl.c nl.h \
parse.c parse.h \
string_utils.c string_utils.h \ string_utils.c string_utils.h \
syscall_numbers.h \ syscall_numbers.h \
syscall_wrappers.h syscall_wrappers.h
...@@ -675,6 +693,7 @@ lxc_wait_SOURCES = tools/lxc_wait.c \ ...@@ -675,6 +693,7 @@ lxc_wait_SOURCES = tools/lxc_wait.c \
namespace.c namespace.h \ namespace.c namespace.h \
network.c network.h \ network.c network.h \
nl.c nl.h \ nl.c nl.h \
parse.c parse.h \
string_utils.c string_utils.h string_utils.c string_utils.h
if ENABLE_SECCOMP if ENABLE_SECCOMP
lxc_wait_SOURCES += seccomp.c lxcseccomp.h lxc_wait_SOURCES += seccomp.c lxcseccomp.h
...@@ -693,6 +712,7 @@ lxc_create_SOURCES = tools/lxc_create.c \ ...@@ -693,6 +712,7 @@ lxc_create_SOURCES = tools/lxc_create.c \
namespace.c namespace.h \ namespace.c namespace.h \
network.c network.h \ network.c network.h \
nl.c nl.h \ nl.c nl.h \
parse.c parse.h \
storage/storage_utils.c storage/storage_utils.h \ storage/storage_utils.c storage/storage_utils.h \
string_utils.c string_utils.h string_utils.c string_utils.h
if ENABLE_SECCOMP if ENABLE_SECCOMP
...@@ -712,6 +732,7 @@ lxc_snapshot_SOURCES = tools/lxc_snapshot.c \ ...@@ -712,6 +732,7 @@ lxc_snapshot_SOURCES = tools/lxc_snapshot.c \
namespace.c namespace.h \ namespace.c namespace.h \
network.c network.h \ network.c network.h \
nl.c nl.h \ nl.c nl.h \
parse.c parse.h \
string_utils.c string_utils.h string_utils.c string_utils.h
if ENABLE_SECCOMP if ENABLE_SECCOMP
lxc_snapshot_SOURCES += seccomp.c lxcseccomp.h lxc_snapshot_SOURCES += seccomp.c lxcseccomp.h
...@@ -730,6 +751,7 @@ lxc_checkpoint_SOURCES = tools/lxc_checkpoint.c \ ...@@ -730,6 +751,7 @@ lxc_checkpoint_SOURCES = tools/lxc_checkpoint.c \
namespace.c namespace.h \ namespace.c namespace.h \
network.c network.h \ network.c network.h \
nl.c nl.h \ nl.c nl.h \
parse.c parse.h \
string_utils.c string_utils.h string_utils.c string_utils.h
if ENABLE_SECCOMP if ENABLE_SECCOMP
lxc_checkpoint_SOURCES += seccomp.c lxcseccomp.h lxc_checkpoint_SOURCES += seccomp.c lxcseccomp.h
...@@ -771,6 +793,7 @@ lxc_monitord_SOURCES = cmd/lxc_monitord.c \ ...@@ -771,6 +793,7 @@ lxc_monitord_SOURCES = cmd/lxc_monitord.c \
namespace.c namespace.h \ namespace.c namespace.h \
network.c network.h \ network.c network.h \
nl.c nl.h \ nl.c nl.h \
parse.c parse.h \
process_utils.c process_utils.h \ process_utils.c process_utils.h \
string_utils.c string_utils.h \ string_utils.c string_utils.h \
syscall_numbers.h \ syscall_numbers.h \
...@@ -817,6 +840,7 @@ lxc_usernsexec_SOURCES = cmd/lxc_usernsexec.c \ ...@@ -817,6 +840,7 @@ lxc_usernsexec_SOURCES = cmd/lxc_usernsexec.c \
namespace.c namespace.h \ namespace.c namespace.h \
network.c network.h \ network.c network.h \
nl.c nl.h \ nl.c nl.h \
parse.c parse.h \
string_utils.c string_utils.h \ string_utils.c string_utils.h \
syscall_wrappers.h \ syscall_wrappers.h \
utils.c utils.h utils.c utils.h
......
src/lxc/parse.h
...@@ -13,17 +13,16 @@ typedef int (*lxc_dir_cb)(const char *name, const char *directory, ...@@ -13,17 +13,16 @@ typedef int (*lxc_dir_cb)(const char *name, const char *directory,
typedef int (*lxc_file_cb)(char *buffer, void *data); typedef int (*lxc_file_cb)(char *buffer, void *data);
__hot extern int lxc_file_for_each_line(const char *file, lxc_file_cb callback, __hidden __hot extern int lxc_file_for_each_line(const char *file, lxc_file_cb callback, void *data);
void *data);
__hot extern int lxc_file_for_each_line_mmap(const char *file, __hidden __hot extern int lxc_file_for_each_line_mmap(const char *file, lxc_file_cb callback,
lxc_file_cb callback, void *data); void *data);
/* mmap() wrapper. lxc_strmmap() will take care to \0-terminate files so that /* mmap() wrapper. lxc_strmmap() will take care to \0-terminate files so that
* normal string-handling functions can be used on the buffer. */ * normal string-handling functions can be used on the buffer. */
extern void *lxc_strmmap(void *addr, size_t length, int prot, int flags, int fd, __hidden extern void *lxc_strmmap(void *addr, size_t length, int prot, int flags, int fd,
off_t offset); off_t offset);
/* munmap() wrapper. Use it to free memory mmap()ed with lxc_strmmap(). */ /* munmap() wrapper. Use it to free memory mmap()ed with lxc_strmmap(). */
extern int lxc_strmunmap(void *addr, size_t length); __hidden extern int lxc_strmunmap(void *addr, size_t length);
#endif #endif /* __LXC_PARSE_H */
src/tests/Makefile.am
...@@ -22,6 +22,7 @@ lxc_test_api_reboot_SOURCES = api_reboot.c \ ...@@ -22,6 +22,7 @@ lxc_test_api_reboot_SOURCES = api_reboot.c \
../lxc/namespace.c ../lxc/namespace.h \ ../lxc/namespace.c ../lxc/namespace.h \
../lxc/network.c ../lxc/network.h \ ../lxc/network.c ../lxc/network.h \
../lxc/nl.c ../lxc/nl.h \ ../lxc/nl.c ../lxc/nl.h \
../lxc/parse.c ../lxc/parse.h \
../lxc/string_utils.c ../lxc/string_utils.h ../lxc/string_utils.c ../lxc/string_utils.h
if ENABLE_SECCOMP if ENABLE_SECCOMP
lxc_test_api_reboot_SOURCES += ../lxc/seccomp.c ../lxc/lxcseccomp.h lxc_test_api_reboot_SOURCES += ../lxc/seccomp.c ../lxc/lxcseccomp.h
...@@ -43,6 +44,7 @@ lxc_test_attach_SOURCES = attach.c \ ...@@ -43,6 +44,7 @@ lxc_test_attach_SOURCES = attach.c \
../lxc/namespace.c ../lxc/namespace.h \ ../lxc/namespace.c ../lxc/namespace.h \
../lxc/network.c ../lxc/network.h \ ../lxc/network.c ../lxc/network.h \
../lxc/nl.c ../lxc/nl.h \ ../lxc/nl.c ../lxc/nl.h \
../lxc/parse.c ../lxc/parse.h \
../lxc/string_utils.c ../lxc/string_utils.h ../lxc/string_utils.c ../lxc/string_utils.h
if ENABLE_SECCOMP if ENABLE_SECCOMP
lxc_test_attach_SOURCES += ../lxc/seccomp.c ../lxc/lxcseccomp.h lxc_test_attach_SOURCES += ../lxc/seccomp.c ../lxc/lxcseccomp.h
...@@ -64,6 +66,7 @@ lxc_test_cgpath_SOURCES = cgpath.c \ ...@@ -64,6 +66,7 @@ lxc_test_cgpath_SOURCES = cgpath.c \
../lxc/namespace.c ../lxc/namespace.h \ ../lxc/namespace.c ../lxc/namespace.h \
../lxc/network.c ../lxc/network.h \ ../lxc/network.c ../lxc/network.h \
../lxc/nl.c ../lxc/nl.h \ ../lxc/nl.c ../lxc/nl.h \
../lxc/parse.c ../lxc/parse.h \
../lxc/string_utils.c ../lxc/string_utils.h ../lxc/string_utils.c ../lxc/string_utils.h
if ENABLE_SECCOMP if ENABLE_SECCOMP
lxc_test_cgpath_SOURCES += ../lxc/seccomp.c ../lxc/lxcseccomp.h lxc_test_cgpath_SOURCES += ../lxc/seccomp.c ../lxc/lxcseccomp.h
...@@ -87,6 +90,7 @@ lxc_test_config_jump_table_SOURCES = config_jump_table.c \ ...@@ -87,6 +90,7 @@ lxc_test_config_jump_table_SOURCES = config_jump_table.c \
../lxc/namespace.c ../lxc/namespace.h \ ../lxc/namespace.c ../lxc/namespace.h \
../lxc/network.c ../lxc/network.h \ ../lxc/network.c ../lxc/network.h \
../lxc/nl.c ../lxc/nl.h \ ../lxc/nl.c ../lxc/nl.h \
../lxc/parse.c ../lxc/parse.h \
../lxc/string_utils.c ../lxc/string_utils.h ../lxc/string_utils.c ../lxc/string_utils.h
if ENABLE_SECCOMP if ENABLE_SECCOMP
lxc_test_config_jump_table_SOURCES += ../lxc/seccomp.c ../lxc/lxcseccomp.h lxc_test_config_jump_table_SOURCES += ../lxc/seccomp.c ../lxc/lxcseccomp.h
...@@ -128,6 +132,7 @@ lxc_test_parse_config_file_SOURCES = parse_config_file.c \ ...@@ -128,6 +132,7 @@ lxc_test_parse_config_file_SOURCES = parse_config_file.c \
../lxc/namespace.c ../lxc/namespace.h \ ../lxc/namespace.c ../lxc/namespace.h \
../lxc/network.c ../lxc/network.h \ ../lxc/network.c ../lxc/network.h \
../lxc/nl.c ../lxc/nl.h \ ../lxc/nl.c ../lxc/nl.h \
../lxc/parse.c ../lxc/parse.h \
../lxc/string_utils.c ../lxc/string_utils.h ../lxc/string_utils.c ../lxc/string_utils.h
if ENABLE_SECCOMP if ENABLE_SECCOMP
lxc_test_parse_config_file_SOURCES += ../lxc/seccomp.c ../lxc/lxcseccomp.h lxc_test_parse_config_file_SOURCES += ../lxc/seccomp.c ../lxc/lxcseccomp.h
...@@ -172,6 +177,7 @@ lxc_test_utils_SOURCES = lxc-test-utils.c \ ...@@ -172,6 +177,7 @@ lxc_test_utils_SOURCES = lxc-test-utils.c \
../lxc/namespace.c ../lxc/namespace.h \ ../lxc/namespace.c ../lxc/namespace.h \
../lxc/network.c ../lxc/network.h \ ../lxc/network.c ../lxc/network.h \
../lxc/nl.c ../lxc/nl.h \ ../lxc/nl.c ../lxc/nl.h \
../lxc/parse.c ../lxc/parse.h \
../lxc/string_utils.c ../lxc/string_utils.h ../lxc/string_utils.c ../lxc/string_utils.h
if ENABLE_SECCOMP if ENABLE_SECCOMP
lxc_test_utils_SOURCES += ../lxc/seccomp.c ../lxc/lxcseccomp.h lxc_test_utils_SOURCES += ../lxc/seccomp.c ../lxc/lxcseccomp.h
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment