conf: 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 a6757b456f495ae56054722eb1e9f9d09de51c61..b5f53bf77b084a70183d25ca53b958f8beae7ade 100644 (file)
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -331,79 +331,141 @@ LDADD = liblxc.la \
 if ENABLE_TOOLS
 lxc_attach_SOURCES = tools/lxc_attach.c \
                     tools/arguments.c tools/arguments.h \
+                    af_unix.c af_unix.h \
                     caps.c caps.h \
+                    conf.c conf.h \
                     rexec.c rexec.h \
                     string_utils.c string_utils.h
 lxc_autostart_SOURCES = tools/lxc_autostart.c \
                        tools/arguments.c tools/arguments.h \
+                       af_unix.c af_unix.h \
+                       caps.c caps.h \
+                       conf.c conf.h \
                        string_utils.c string_utils.h
 lxc_cgroup_SOURCES = tools/lxc_cgroup.c \
                     tools/arguments.c tools/arguments.h \
+                    af_unix.c af_unix.h \
+                    caps.c caps.h \
+                    conf.c conf.h \
                     string_utils.c string_utils.h
 lxc_config_SOURCES = tools/lxc_config.c \
                     tools/arguments.c tools/arguments.h \
+                    af_unix.c af_unix.h \
+                    caps.c caps.h \
+                    conf.c conf.h \
                     string_utils.c string_utils.h
 lxc_console_SOURCES = tools/lxc_console.c \
                      tools/arguments.c tools/arguments.h \
+                     af_unix.c af_unix.h \
+                     caps.c caps.h \
+                     conf.c conf.h \
                      string_utils.c string_utils.h
 lxc_destroy_SOURCES = tools/lxc_destroy.c \
                      tools/arguments.c tools/arguments.h \
+                     af_unix.c af_unix.h \
+                     caps.c caps.h \
+                     conf.c conf.h \
                      string_utils.c string_utils.h
 lxc_device_SOURCES = tools/lxc_device.c \
                     tools/arguments.c tools/arguments.h \
+                    af_unix.c af_unix.h \
+                    caps.c caps.h \
+                    conf.c conf.h \
                     string_utils.c string_utils.h
 lxc_execute_SOURCES = tools/lxc_execute.c \
                      tools/arguments.c tools/arguments.h \
+                     af_unix.c af_unix.h \
                      caps.c caps.h \
+                     conf.c conf.h \
                      string_utils.c string_utils.h
 lxc_freeze_SOURCES = tools/lxc_freeze.c \
                     tools/arguments.c tools/arguments.h \
+                    af_unix.c af_unix.h \
+                    caps.c caps.h \
+                    conf.c conf.h \
                     string_utils.c string_utils.h
 lxc_info_SOURCES = tools/lxc_info.c \
                   tools/arguments.c tools/arguments.h \
+                  af_unix.c af_unix.h \
+                  caps.c caps.h \
+                  conf.c conf.h \
                   string_utils.c string_utils.h
 lxc_monitor_SOURCES = tools/lxc_monitor.c \
                      tools/arguments.c tools/arguments.h \
+                     af_unix.c af_unix.h \
+                     caps.c caps.h \
+                     conf.c conf.h \
                      macro.h \
                      string_utils.c string_utils.h
 lxc_ls_SOURCES = tools/lxc_ls.c \
                 tools/arguments.c tools/arguments.h \
+                af_unix.c af_unix.h \
+                caps.c caps.h \
+                conf.c conf.h \
                 string_utils.c string_utils.h
 lxc_copy_SOURCES = tools/lxc_copy.c \
                   tools/arguments.c tools/arguments.h \
+                  af_unix.c af_unix.h \
+                  caps.c caps.h \
+                  conf.c conf.h \
                   storage/storage_utils.c storage/storage_utils.h \
                   string_utils.c string_utils.h
 lxc_start_SOURCES = tools/lxc_start.c \
                    tools/arguments.c tools/arguments.h \
+                   af_unix.c af_unix.h \
                    caps.c caps.h \
+                   conf.c conf.h \
                    string_utils.c string_utils.h
 lxc_stop_SOURCES = tools/lxc_stop.c \
                   tools/arguments.c tools/arguments.h \
+                  af_unix.c af_unix.h \
+                  caps.c caps.h \
+                  conf.c conf.h \
                   string_utils.c string_utils.h
 lxc_top_SOURCES = tools/lxc_top.c \
                  tools/arguments.c tools/arguments.h \
+                 af_unix.c af_unix.h \
+                 caps.c caps.h \
+                 conf.c conf.h \
                  string_utils.c string_utils.h
 lxc_unfreeze_SOURCES = tools/lxc_unfreeze.c \
                       tools/arguments.c tools/arguments.h \
+                      af_unix.c af_unix.h \
+                      caps.c caps.h \
+                      conf.c conf.h \
                       string_utils.c string_utils.h
 lxc_unshare_SOURCES = tools/lxc_unshare.c \
                      tools/arguments.c tools/arguments.h \
+                     af_unix.c af_unix.h \
                      caps.c caps.h \
+                     conf.c conf.h \
                      string_utils.c string_utils.h \
                      syscall_numbers.h \
                      syscall_wrappers.h
 lxc_wait_SOURCES = tools/lxc_wait.c \
                   tools/arguments.c tools/arguments.h \
+                  af_unix.c af_unix.h \
+                  caps.c caps.h \
+                  conf.c conf.h \
                   string_utils.c string_utils.h
 lxc_create_SOURCES = tools/lxc_create.c \
                     tools/arguments.c tools/arguments.h \
+                    af_unix.c af_unix.h \
+                    caps.c caps.h \
+                    conf.c conf.h \
                     storage/storage_utils.c storage/storage_utils.h \
                     string_utils.c string_utils.h
 lxc_snapshot_SOURCES = tools/lxc_snapshot.c \
                       tools/arguments.c tools/arguments.h \
+                      af_unix.c af_unix.h \
+                      caps.c caps.h \
+                      conf.c conf.h \
                       string_utils.c string_utils.h
 lxc_checkpoint_SOURCES = tools/lxc_checkpoint.c \
                         tools/arguments.c tools/arguments.h \
+                        af_unix.c af_unix.h \
+                        caps.c caps.h \
+                        conf.c conf.h \
                         string_utils.c string_utils.h1
 endif
 
@@ -424,6 +486,7 @@ init_lxc_LDFLAGS = -pthread
 lxc_monitord_SOURCES = cmd/lxc_monitord.c \
                       af_unix.c af_unix.h \
                       caps.c caps.h \
+                      conf.c conf.h \
                       log.c log.h \
                       mainloop.c mainloop.h \
                       monitor.c monitor.h \
@@ -433,7 +496,9 @@ lxc_monitord_SOURCES = cmd/lxc_monitord.c \
                       utils.c utils.h
 lxc_user_nic_SOURCES = cmd/lxc_user_nic.c \
                       ../include/netns_ifaddrs.c ../include/netns_ifaddrs.h \
+                      af_unix.c af_unix.h \
                       caps.c caps.h \
+                      conf.c conf.h \
                       log.c log.h \
                       memory_utils.h \
                       network.c network.h \
@@ -470,6 +535,7 @@ if HAVE_STATIC_LIBCAP
 sbin_PROGRAMS += init.lxc.static
 
 init_lxc_static_SOURCES = cmd/lxc_init.c \
+                         af_unix.c af_unix.h \
                          caps.c caps.h \
                          error.c error.h \
                          initutils.c initutils.h \

diff --git a/src/lxc/conf.h b/src/lxc/conf.h
index e3dba87c4fe157debf76907509e4b8401de3a4ac..6ec8936da92b080726b0be86e4dae5d6a428d8fd 100644 (file)
--- a/src/lxc/conf.h
+++ b/src/lxc/conf.h
@@ -415,9 +415,8 @@ struct lxc_conf {
        struct timens_offsets timens;
 };
 
-extern int write_id_mapping(enum idtype idtype, pid_t pid, const char *buf,
-                           size_t buf_size)
-__access_r(3, 4);
+__hidden extern int write_id_mapping(enum idtype idtype, pid_t pid, const char *buf, size_t buf_size)
+    __access_r(3, 4);
 
 #ifdef HAVE_TLS
 extern thread_local struct lxc_conf *current_config;
@@ -425,68 +424,61 @@ extern thread_local struct lxc_conf *current_config;
 extern struct lxc_conf *current_config;
 #endif
 
-extern int run_lxc_hooks(const char *name, char *hook, struct lxc_conf *conf,
-                        char *argv[]);
-extern int detect_shared_rootfs(void);
-extern struct lxc_conf *lxc_conf_init(void);
-extern void lxc_conf_free(struct lxc_conf *conf);
-extern int pin_rootfs(const char *rootfs);
-extern int lxc_map_ids(struct lxc_list *idmap, pid_t pid);
-extern int lxc_create_tty(const char *name, struct lxc_conf *conf);
-extern void lxc_delete_tty(struct lxc_tty_info *ttys);
-extern int lxc_clear_config_caps(struct lxc_conf *c);
-extern int lxc_clear_config_keepcaps(struct lxc_conf *c);
-extern int lxc_clear_cgroups(struct lxc_conf *c, const char *key, int version);
-extern int lxc_clear_mount_entries(struct lxc_conf *c);
-extern int lxc_clear_automounts(struct lxc_conf *c);
-extern int lxc_clear_hooks(struct lxc_conf *c, const char *key);
-extern int lxc_clear_idmaps(struct lxc_conf *c);
-extern int lxc_clear_groups(struct lxc_conf *c);
-extern int lxc_clear_environment(struct lxc_conf *c);
-extern int lxc_clear_limits(struct lxc_conf *c, const char *key);
-extern int lxc_delete_autodev(struct lxc_handler *handler);
-extern int lxc_clear_autodev_tmpfs_size(struct lxc_conf *c);
-extern void lxc_clear_includes(struct lxc_conf *conf);
-extern int lxc_setup_rootfs_prepare_root(struct lxc_conf *conf,
-                                        const char *name, const char *lxcpath);
-extern int lxc_setup(struct lxc_handler *handler);
-extern int lxc_setup_parent(struct lxc_handler *handler);
-extern int setup_resource_limits(struct lxc_list *limits, pid_t pid);
-extern int find_unmapped_nsid(const struct lxc_conf *conf, enum idtype idtype);
-extern int mapped_hostid(unsigned id, const struct lxc_conf *conf,
-                        enum idtype idtype);
-extern int userns_exec_1(const struct lxc_conf *conf, int (*fn)(void *),
-                        void *data, const char *fn_name);
-extern int userns_exec_full(struct lxc_conf *conf, int (*fn)(void *),
-                           void *data, const char *fn_name);
-extern int parse_mntopts(const char *mntopts, unsigned long *mntflags,
-                        char **mntdata);
-extern int parse_propagationopts(const char *mntopts, unsigned long *pflags);
-extern void tmp_proc_unmount(struct lxc_conf *lxc_conf);
-extern void turn_into_dependent_mounts(void);
-extern void suggest_default_idmap(void);
-extern FILE *make_anonymous_mount_file(struct lxc_list *mount,
-                                      bool include_nesting_helpers);
-extern struct lxc_list *sort_cgroup_settings(struct lxc_list *cgroup_settings);
-extern unsigned long add_required_remount_flags(const char *s, const char *d,
-                                               unsigned long flags);
-extern int run_script(const char *name, const char *section, const char *script,
-                     ...);
-extern int run_script_argv(const char *name, unsigned int hook_version,
-                          const char *section, const char *script,
-                          const char *hookname, char **argsin);
-extern int in_caplist(int cap, struct lxc_list *caps);
-extern int setup_sysctl_parameters(struct lxc_list *sysctls);
-extern int lxc_clear_sysctls(struct lxc_conf *c, const char *key);
-extern int setup_proc_filesystem(struct lxc_list *procs, pid_t pid);
-extern int lxc_clear_procs(struct lxc_conf *c, const char *key);
-extern int lxc_clear_apparmor_raw(struct lxc_conf *c);
-extern int lxc_clear_namespace(struct lxc_conf *c);
-extern int userns_exec_minimal(const struct lxc_conf *conf,
-                              int (*fn_parent)(void *), void *fn_parent_data,
-                              int (*fn_child)(void *), void *fn_child_data);
-extern int userns_exec_mapped_root(const char *path, int path_fd,
-                                  const struct lxc_conf *conf);
+__hidden extern int run_lxc_hooks(const char *name, char *hook, struct lxc_conf *conf, char *argv[]);
+__hidden extern struct lxc_conf *lxc_conf_init(void);
+__hidden extern void lxc_conf_free(struct lxc_conf *conf);
+__hidden extern int pin_rootfs(const char *rootfs);
+__hidden extern int lxc_map_ids(struct lxc_list *idmap, pid_t pid);
+__hidden extern int lxc_create_tty(const char *name, struct lxc_conf *conf);
+__hidden extern void lxc_delete_tty(struct lxc_tty_info *ttys);
+__hidden extern int lxc_clear_config_caps(struct lxc_conf *c);
+__hidden extern int lxc_clear_config_keepcaps(struct lxc_conf *c);
+__hidden extern int lxc_clear_cgroups(struct lxc_conf *c, const char *key, int version);
+__hidden extern int lxc_clear_mount_entries(struct lxc_conf *c);
+__hidden extern int lxc_clear_automounts(struct lxc_conf *c);
+__hidden extern int lxc_clear_hooks(struct lxc_conf *c, const char *key);
+__hidden extern int lxc_clear_idmaps(struct lxc_conf *c);
+__hidden extern int lxc_clear_groups(struct lxc_conf *c);
+__hidden extern int lxc_clear_environment(struct lxc_conf *c);
+__hidden extern int lxc_clear_limits(struct lxc_conf *c, const char *key);
+__hidden extern int lxc_delete_autodev(struct lxc_handler *handler);
+__hidden extern int lxc_clear_autodev_tmpfs_size(struct lxc_conf *c);
+__hidden extern void lxc_clear_includes(struct lxc_conf *conf);
+__hidden extern int lxc_setup_rootfs_prepare_root(struct lxc_conf *conf, const char *name,
+                                                 const char *lxcpath);
+__hidden extern int lxc_setup(struct lxc_handler *handler);
+__hidden extern int lxc_setup_parent(struct lxc_handler *handler);
+__hidden extern int setup_resource_limits(struct lxc_list *limits, pid_t pid);
+__hidden extern int find_unmapped_nsid(const struct lxc_conf *conf, enum idtype idtype);
+__hidden extern int mapped_hostid(unsigned id, const struct lxc_conf *conf, enum idtype idtype);
+__hidden extern int userns_exec_1(const struct lxc_conf *conf, int (*fn)(void *), void *data,
+                                 const char *fn_name);
+__hidden extern int userns_exec_full(struct lxc_conf *conf, int (*fn)(void *), void *data,
+                                    const char *fn_name);
+__hidden extern int parse_mntopts(const char *mntopts, unsigned long *mntflags, char **mntdata);
+__hidden extern int parse_propagationopts(const char *mntopts, unsigned long *pflags);
+__hidden extern void tmp_proc_unmount(struct lxc_conf *lxc_conf);
+__hidden extern void turn_into_dependent_mounts(void);
+__hidden extern void suggest_default_idmap(void);
+__hidden extern FILE *make_anonymous_mount_file(struct lxc_list *mount, bool include_nesting_helpers);
+__hidden extern struct lxc_list *sort_cgroup_settings(struct lxc_list *cgroup_settings);
+__hidden extern unsigned long add_required_remount_flags(const char *s, const char *d,
+                                                        unsigned long flags);
+__hidden extern int run_script(const char *name, const char *section, const char *script, ...);
+__hidden extern int run_script_argv(const char *name, unsigned int hook_version, const char *section,
+                                   const char *script, const char *hookname, char **argsin);
+__hidden extern int in_caplist(int cap, struct lxc_list *caps);
+__hidden extern int setup_sysctl_parameters(struct lxc_list *sysctls);
+__hidden extern int lxc_clear_sysctls(struct lxc_conf *c, const char *key);
+__hidden extern int setup_proc_filesystem(struct lxc_list *procs, pid_t pid);
+__hidden extern int lxc_clear_procs(struct lxc_conf *c, const char *key);
+__hidden extern int lxc_clear_apparmor_raw(struct lxc_conf *c);
+__hidden extern int lxc_clear_namespace(struct lxc_conf *c);
+__hidden extern int userns_exec_minimal(const struct lxc_conf *conf, int (*fn_parent)(void *),
+                                       void *fn_parent_data, int (*fn_child)(void *),
+                                       void *fn_child_data);
+__hidden extern int userns_exec_mapped_root(const char *path, int path_fd,
+                                           const struct lxc_conf *conf);
 static inline int chown_mapped_root(const char *path, const struct lxc_conf *conf)
 {
        return userns_exec_mapped_root(path, -EBADF, conf);

diff --git a/src/lxc/error.c b/src/lxc/error.c
index 2e8f26893d17d5b3283fa88826c7a1ee2b738503..6e49eca2daf6952c5e98b9cde90fc77e08e5364f 100644 (file)
--- a/src/lxc/error.c
+++ b/src/lxc/error.c
@@ -18,7 +18,7 @@ lxc_log_define(error, lxc);
  *   128+n       signal n received by the application
  *   255         lxc error
  */
-extern int  lxc_error_set_and_log(int pid, int status)
+extern int lxc_error_set_and_log(int pid, int status)
 {
        int ret = 0;
 

diff --git a/src/lxc/file_utils.c b/src/lxc/file_utils.c
index 85e24fea20a7f1611e9e06f3c4d9bb67fbca3dd2..0ec1f21c480522f47bbc5681398e7b478f0512c1 100644 (file)
--- a/src/lxc/file_utils.c
+++ b/src/lxc/file_utils.c
@@ -14,10 +14,10 @@
 
 #include "config.h"
 #include "file_utils.h"
-#include "log.h"
 #include "macro.h"
 #include "memory_utils.h"
 #include "string_utils.h"
+#include <time.h>
 #include "utils.h"
 
 int lxc_open_dirfd(const char *dir)

diff --git a/src/lxc/initutils.c b/src/lxc/initutils.c
index 5549c2e8f75caf68c2ed74065db5b59fa4612680..dbd89bf85415c8d63b2da3d53f7fb7a6f41ba9bb 100644 (file)
--- a/src/lxc/initutils.c
+++ b/src/lxc/initutils.c
@@ -4,12 +4,13 @@
 #define _GNU_SOURCE 1
 #endif
 #include <sys/prctl.h>
+#include <sys/syscall.h>
+#include <unistd.h>
 
 #include "compiler.h"
 #include "config.h"
 #include "file_utils.h"
 #include "initutils.h"
-#include "log.h"
 #include "macro.h"
 #include "memory_utils.h"
 
@@ -17,8 +18,6 @@
 #include "include/strlcpy.h"
 #endif
 
-lxc_log_define(initutils, lxc);
-
 static char *copy_global_config_value(char *p)
 {
        int len = strlen(p);
@@ -310,8 +309,6 @@ int setproctitle(char *title)
                    prctl_arg(sizeof(prctl_map)), prctl_arg(0));
        if (ret == 0)
                (void)strlcpy((char *)arg_start, title, len);
-       else
-               SYSWARN("Failed to set cmdline");
 
        return ret;
 }