parse: 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 7c181d44c92b2612f7d67afcaf5e610a3f114213..456dded39ed1ec497d0bf463f069b71b7b3ab474 100644 (file)
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -342,6 +342,7 @@ lxc_attach_SOURCES = tools/lxc_attach.c \
                     namespace.c namespace.h \
                     network.c network.h \
                     nl.c nl.h \
+                    parse.c parse.h \
                     rexec.c rexec.h \
                     string_utils.c string_utils.h
 if ENABLE_SECCOMP
@@ -361,6 +362,7 @@ lxc_autostart_SOURCES = tools/lxc_autostart.c \
                        namespace.c namespace.h \
                        network.c network.h \
                        nl.c nl.h \
+                       parse.c parse.h \
                        string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_autostart_SOURCES += seccomp.c lxcseccomp.h
@@ -379,6 +381,7 @@ lxc_cgroup_SOURCES = tools/lxc_cgroup.c \
                     namespace.c namespace.h \
                     network.c network.h \
                     nl.c nl.h \
+                    parse.c parse.h \
                     string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_cgroup_SOURCES += seccomp.c lxcseccomp.h
@@ -397,6 +400,7 @@ lxc_config_SOURCES = tools/lxc_config.c \
                     namespace.c namespace.h \
                     network.c network.h \
                     nl.c nl.h \
+                    parse.c parse.h \
                     string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_config_SOURCES += seccomp.c lxcseccomp.h
@@ -415,6 +419,7 @@ lxc_console_SOURCES = tools/lxc_console.c \
                      namespace.c namespace.h \
                      network.c network.h \
                      nl.c nl.h \
+                     parse.c parse.h \
                      string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_console_SOURCES += seccomp.c lxcseccomp.h
@@ -433,6 +438,7 @@ lxc_destroy_SOURCES = tools/lxc_destroy.c \
                      namespace.c namespace.h \
                      network.c network.h \
                      nl.c nl.h \
+                     parse.c parse.h \
                      string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_destroy_SOURCES += seccomp.c lxcseccomp.h
@@ -451,6 +457,7 @@ lxc_device_SOURCES = tools/lxc_device.c \
                     namespace.c namespace.h \
                     network.c network.h \
                     nl.c nl.h \
+                    parse.c parse.h \
                     string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_device_SOURCES += seccomp.c lxcseccomp.h
@@ -469,6 +476,7 @@ lxc_execute_SOURCES = tools/lxc_execute.c \
                      namespace.c namespace.h \
                      network.c network.h \
                      nl.c nl.h \
+                     parse.c parse.h \
                      string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_execute_SOURCES += seccomp.c lxcseccomp.h
@@ -487,6 +495,7 @@ lxc_freeze_SOURCES = tools/lxc_freeze.c \
                     namespace.c namespace.h \
                     network.c network.h \
                     nl.c nl.h \
+                    parse.c parse.h \
                     string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_freeze_SOURCES += seccomp.c lxcseccomp.h
@@ -505,6 +514,7 @@ lxc_info_SOURCES = tools/lxc_info.c \
                   namespace.c namespace.h \
                   network.c network.h \
                   nl.c nl.h \
+                  parse.c parse.h \
                   string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_info_SOURCES += seccomp.c lxcseccomp.h
@@ -525,6 +535,7 @@ lxc_monitor_SOURCES = tools/lxc_monitor.c \
                      namespace.c namespace.h \
                      network.c network.h \
                      nl.c nl.h \
+                     parse.c parse.h \
                      string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_monitor_SOURCES += seccomp.c lxcseccomp.h
@@ -544,6 +555,7 @@ lxc_ls_SOURCES = tools/lxc_ls.c \
                 namespace.c namespace.h \
                 network.c network.h \
                 nl.c nl.h \
+                parse.c parse.h \
                 string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_ls_SOURCES += seccomp.c lxcseccomp.h
@@ -562,6 +574,7 @@ lxc_copy_SOURCES = tools/lxc_copy.c \
                   namespace.c namespace.h \
                   network.c network.h \
                   nl.c nl.h \
+                  parse.c parse.h \
                   storage/storage_utils.c storage/storage_utils.h \
                   string_utils.c string_utils.h
 if ENABLE_SECCOMP
@@ -581,6 +594,7 @@ lxc_start_SOURCES = tools/lxc_start.c \
                    namespace.c namespace.h \
                    network.c network.h \
                    nl.c nl.h \
+                   parse.c parse.h \
                    string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_start_SOURCES += seccomp.c lxcseccomp.h
@@ -600,6 +614,7 @@ lxc_stop_SOURCES = tools/lxc_stop.c \
                   namespace.c namespace.h \
                   network.c network.h \
                   nl.c nl.h \
+                  parse.c parse.h \
                   string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_stop_SOURCES += seccomp.c lxcseccomp.h
@@ -619,6 +634,7 @@ lxc_top_SOURCES = tools/lxc_top.c \
                  namespace.c namespace.h \
                  network.c network.h \
                  nl.c nl.h \
+                 parse.c parse.h \
                  string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_top_SOURCES += seccomp.c lxcseccomp.h
@@ -637,6 +653,7 @@ lxc_unfreeze_SOURCES = tools/lxc_unfreeze.c \
                       namespace.c namespace.h \
                       network.c network.h \
                       nl.c nl.h \
+                      parse.c parse.h \
                       string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_unfreeze_SOURCES += seccomp.c lxcseccomp.h
@@ -655,6 +672,7 @@ lxc_unshare_SOURCES = tools/lxc_unshare.c \
                      namespace.c namespace.h \
                      network.c network.h \
                      nl.c nl.h \
+                     parse.c parse.h \
                      string_utils.c string_utils.h \
                      syscall_numbers.h \
                      syscall_wrappers.h
@@ -675,6 +693,7 @@ lxc_wait_SOURCES = tools/lxc_wait.c \
                   namespace.c namespace.h \
                   network.c network.h \
                   nl.c nl.h \
+                  parse.c parse.h \
                   string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_wait_SOURCES += seccomp.c lxcseccomp.h
@@ -693,6 +712,7 @@ lxc_create_SOURCES = tools/lxc_create.c \
                     namespace.c namespace.h \
                     network.c network.h \
                     nl.c nl.h \
+                    parse.c parse.h \
                     storage/storage_utils.c storage/storage_utils.h \
                     string_utils.c string_utils.h
 if ENABLE_SECCOMP
@@ -712,6 +732,7 @@ lxc_snapshot_SOURCES = tools/lxc_snapshot.c \
                       namespace.c namespace.h \
                       network.c network.h \
                       nl.c nl.h \
+                      parse.c parse.h \
                       string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_snapshot_SOURCES += seccomp.c lxcseccomp.h
@@ -730,6 +751,7 @@ lxc_checkpoint_SOURCES = tools/lxc_checkpoint.c \
                         namespace.c namespace.h \
                         network.c network.h \
                         nl.c nl.h \
+                        parse.c parse.h \
                         string_utils.c string_utils.h
 if ENABLE_SECCOMP
 lxc_checkpoint_SOURCES += seccomp.c lxcseccomp.h
@@ -771,6 +793,7 @@ lxc_monitord_SOURCES = cmd/lxc_monitord.c \
                       namespace.c namespace.h \
                       network.c network.h \
                       nl.c nl.h \
+                      parse.c parse.h \
                       process_utils.c process_utils.h \
                       string_utils.c string_utils.h \
                       syscall_numbers.h \
@@ -817,6 +840,7 @@ lxc_usernsexec_SOURCES = cmd/lxc_usernsexec.c \
                         namespace.c namespace.h \
                         network.c network.h \
                         nl.c nl.h \
+                        parse.c parse.h \
                         string_utils.c string_utils.h \
                         syscall_wrappers.h \
                         utils.c utils.h

diff --git a/src/lxc/parse.h b/src/lxc/parse.h
index 19d2b20bb5d4eb1d8647b644e786ee5cb363a895..e4808ed0fb0a537c6396cd2a14b2f8aa36bc93a2 100644 (file)
--- a/src/lxc/parse.h
+++ b/src/lxc/parse.h
@@ -13,17 +13,16 @@ typedef int (*lxc_dir_cb)(const char *name, const char *directory,
 
 typedef int (*lxc_file_cb)(char *buffer, void *data);
 
-__hot extern int lxc_file_for_each_line(const char *file, lxc_file_cb callback,
-                                       void *data);
+__hidden __hot extern int lxc_file_for_each_line(const char *file, lxc_file_cb callback, void *data);
 
-__hot extern int lxc_file_for_each_line_mmap(const char *file,
-                                            lxc_file_cb callback, void *data);
+__hidden __hot extern int lxc_file_for_each_line_mmap(const char *file, lxc_file_cb callback,
+                                                     void *data);
 
 /* mmap() wrapper. lxc_strmmap() will take care to \0-terminate files so that
  * 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,
-                        off_t offset);
+__hidden extern void *lxc_strmmap(void *addr, size_t length, int prot, int flags, int fd,
+                                 off_t offset);
 /* 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 */

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 7c26aa0e19f34b356aeb881da24e6108a12bf915..64979d3a638060d51e351eb86f5869f30b1e1a77 100644 (file)
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -22,6 +22,7 @@ lxc_test_api_reboot_SOURCES = api_reboot.c \
                              ../lxc/namespace.c ../lxc/namespace.h \
                              ../lxc/network.c ../lxc/network.h \
                              ../lxc/nl.c ../lxc/nl.h \
+                             ../lxc/parse.c ../lxc/parse.h \
                              ../lxc/string_utils.c ../lxc/string_utils.h
 if ENABLE_SECCOMP
 lxc_test_api_reboot_SOURCES += ../lxc/seccomp.c ../lxc/lxcseccomp.h
@@ -43,6 +44,7 @@ lxc_test_attach_SOURCES = attach.c \
                          ../lxc/namespace.c ../lxc/namespace.h \
                          ../lxc/network.c ../lxc/network.h \
                          ../lxc/nl.c ../lxc/nl.h \
+                         ../lxc/parse.c ../lxc/parse.h \
                          ../lxc/string_utils.c ../lxc/string_utils.h
 if ENABLE_SECCOMP
 lxc_test_attach_SOURCES += ../lxc/seccomp.c ../lxc/lxcseccomp.h
@@ -64,6 +66,7 @@ lxc_test_cgpath_SOURCES = cgpath.c \
                          ../lxc/namespace.c ../lxc/namespace.h \
                          ../lxc/network.c ../lxc/network.h \
                          ../lxc/nl.c ../lxc/nl.h \
+                         ../lxc/parse.c ../lxc/parse.h \
                          ../lxc/string_utils.c ../lxc/string_utils.h
 if ENABLE_SECCOMP
 lxc_test_cgpath_SOURCES += ../lxc/seccomp.c ../lxc/lxcseccomp.h
@@ -87,6 +90,7 @@ lxc_test_config_jump_table_SOURCES = config_jump_table.c \
                                     ../lxc/namespace.c ../lxc/namespace.h \
                                     ../lxc/network.c ../lxc/network.h \
                                     ../lxc/nl.c ../lxc/nl.h \
+                                    ../lxc/parse.c ../lxc/parse.h \
                                     ../lxc/string_utils.c ../lxc/string_utils.h
 if ENABLE_SECCOMP
 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 \
                                     ../lxc/namespace.c ../lxc/namespace.h \
                                     ../lxc/network.c ../lxc/network.h \
                                     ../lxc/nl.c ../lxc/nl.h \
+                                    ../lxc/parse.c ../lxc/parse.h \
                                     ../lxc/string_utils.c ../lxc/string_utils.h
 if ENABLE_SECCOMP
 lxc_test_parse_config_file_SOURCES += ../lxc/seccomp.c ../lxc/lxcseccomp.h
@@ -172,6 +177,7 @@ lxc_test_utils_SOURCES = lxc-test-utils.c \
                          ../lxc/namespace.c ../lxc/namespace.h \
                          ../lxc/network.c ../lxc/network.h \
                          ../lxc/nl.c ../lxc/nl.h \
+                         ../lxc/parse.c ../lxc/parse.h \
                          ../lxc/string_utils.c ../lxc/string_utils.h
 if ENABLE_SECCOMP
 lxc_test_utils_SOURCES += ../lxc/seccomp.c ../lxc/lxcseccomp.h