Skip to content

L
lxc
Unverified Commit 7cf9ab57 by Christian Brauner
Options

log: hide unnecessary symbols

Signed-off-by: 's avatarChristian Brauner <christian.brauner@ubuntu.com>
parent 12b47815
Showing with 57 additions and 26 deletions
src/lxc/Makefile.am
......@@ -338,6 +338,7 @@ lxc_attach_SOURCES = tools/lxc_attach.c \
confile_utils.c confile_utils.h \
file_utils.c file_utils.h \
initutils.c initutils.h \
log.c log.h \
rexec.c rexec.h \
string_utils.c string_utils.h
lxc_autostart_SOURCES = tools/lxc_autostart.c \
......@@ -349,6 +350,7 @@ lxc_autostart_SOURCES = tools/lxc_autostart.c \
confile_utils.c confile_utils.h \
file_utils.c file_utils.h \
initutils.c initutils.h \
log.c log.h \
string_utils.c string_utils.h
lxc_cgroup_SOURCES = tools/lxc_cgroup.c \
tools/arguments.c tools/arguments.h \
......@@ -359,6 +361,7 @@ lxc_cgroup_SOURCES = tools/lxc_cgroup.c \
confile_utils.c confile_utils.h \
file_utils.c file_utils.h \
initutils.c initutils.h \
log.c log.h \
string_utils.c string_utils.h
lxc_config_SOURCES = tools/lxc_config.c \
tools/arguments.c tools/arguments.h \
......@@ -369,6 +372,7 @@ lxc_config_SOURCES = tools/lxc_config.c \
confile_utils.c confile_utils.h \
file_utils.c file_utils.h \
initutils.c initutils.h \
log.c log.h \
string_utils.c string_utils.h
lxc_console_SOURCES = tools/lxc_console.c \
tools/arguments.c tools/arguments.h \
......@@ -379,6 +383,7 @@ lxc_console_SOURCES = tools/lxc_console.c \
confile_utils.c confile_utils.h \
file_utils.c file_utils.h \
initutils.c initutils.h \
log.c log.h \
string_utils.c string_utils.h
lxc_destroy_SOURCES = tools/lxc_destroy.c \
tools/arguments.c tools/arguments.h \
......@@ -389,6 +394,7 @@ lxc_destroy_SOURCES = tools/lxc_destroy.c \
confile_utils.c confile_utils.h \
file_utils.c file_utils.h \
initutils.c initutils.h \
log.c log.h \
string_utils.c string_utils.h
lxc_device_SOURCES = tools/lxc_device.c \
tools/arguments.c tools/arguments.h \
......@@ -399,6 +405,7 @@ lxc_device_SOURCES = tools/lxc_device.c \
confile_utils.c confile_utils.h \
file_utils.c file_utils.h \
initutils.c initutils.h \
log.c log.h \
string_utils.c string_utils.h
lxc_execute_SOURCES = tools/lxc_execute.c \
tools/arguments.c tools/arguments.h \
......@@ -409,6 +416,7 @@ lxc_execute_SOURCES = tools/lxc_execute.c \
confile_utils.c confile_utils.h \
file_utils.c file_utils.h \
initutils.c initutils.h \
log.c log.h \
string_utils.c string_utils.h
lxc_freeze_SOURCES = tools/lxc_freeze.c \
tools/arguments.c tools/arguments.h \
......@@ -419,6 +427,7 @@ lxc_freeze_SOURCES = tools/lxc_freeze.c \
confile_utils.c confile_utils.h \
file_utils.c file_utils.h \
initutils.c initutils.h \
log.c log.h \
string_utils.c string_utils.h
lxc_info_SOURCES = tools/lxc_info.c \
tools/arguments.c tools/arguments.h \
......@@ -429,6 +438,7 @@ lxc_info_SOURCES = tools/lxc_info.c \
confile_utils.c confile_utils.h \
file_utils.c file_utils.h \
initutils.c initutils.h \
log.c log.h \
string_utils.c string_utils.h
lxc_monitor_SOURCES = tools/lxc_monitor.c \
tools/arguments.c tools/arguments.h \
......@@ -439,6 +449,7 @@ lxc_monitor_SOURCES = tools/lxc_monitor.c \
confile_utils.c confile_utils.h \
file_utils.c file_utils.h \
initutils.c initutils.h \
log.c log.h \
macro.h \
string_utils.c string_utils.h
lxc_ls_SOURCES = tools/lxc_ls.c \
......@@ -450,6 +461,7 @@ lxc_ls_SOURCES = tools/lxc_ls.c \
confile_utils.c confile_utils.h \
file_utils.c file_utils.h \
initutils.c initutils.h \
log.c log.h \
memory_utils.h \
string_utils.c string_utils.h
lxc_copy_SOURCES = tools/lxc_copy.c \
......@@ -461,6 +473,7 @@ lxc_copy_SOURCES = tools/lxc_copy.c \
confile_utils.c confile_utils.h \
file_utils.c file_utils.h \
initutils.c initutils.h \
log.c log.h \
storage/storage_utils.c storage/storage_utils.h \
string_utils.c string_utils.h
lxc_start_SOURCES = tools/lxc_start.c \
......@@ -472,6 +485,7 @@ lxc_start_SOURCES = tools/lxc_start.c \
confile_utils.c confile_utils.h \
file_utils.c file_utils.h \
initutils.c initutils.h \
log.c log.h \
string_utils.c string_utils.h
lxc_stop_SOURCES = tools/lxc_stop.c \
tools/arguments.c tools/arguments.h \
......@@ -482,6 +496,7 @@ lxc_stop_SOURCES = tools/lxc_stop.c \
confile_utils.c confile_utils.h \
file_utils.c file_utils.h \
initutils.c initutils.h \
log.c log.h \
string_utils.c string_utils.h
lxc_top_SOURCES = tools/lxc_top.c \
tools/arguments.c tools/arguments.h \
......@@ -492,6 +507,7 @@ lxc_top_SOURCES = tools/lxc_top.c \
confile_utils.c confile_utils.h \
file_utils.c file_utils.h \
initutils.c initutils.h \
log.c log.h \
string_utils.c string_utils.h
lxc_unfreeze_SOURCES = tools/lxc_unfreeze.c \
tools/arguments.c tools/arguments.h \
......@@ -502,6 +518,7 @@ lxc_unfreeze_SOURCES = tools/lxc_unfreeze.c \
confile_utils.c confile_utils.h \
file_utils.c file_utils.h \
initutils.c initutils.h \
log.c log.h \
string_utils.c string_utils.h
lxc_unshare_SOURCES = tools/lxc_unshare.c \
tools/arguments.c tools/arguments.h \
......@@ -512,6 +529,7 @@ lxc_unshare_SOURCES = tools/lxc_unshare.c \
confile_utils.c confile_utils.h \
file_utils.c file_utils.h \
initutils.c initutils.h \
log.c log.h \
string_utils.c string_utils.h \
syscall_numbers.h \
syscall_wrappers.h
......@@ -524,6 +542,7 @@ lxc_wait_SOURCES = tools/lxc_wait.c \
confile_utils.c confile_utils.h \
file_utils.c file_utils.h \
initutils.c initutils.h \
log.c log.h \
string_utils.c string_utils.h
lxc_create_SOURCES = tools/lxc_create.c \
tools/arguments.c tools/arguments.h \
......@@ -534,6 +553,7 @@ lxc_create_SOURCES = tools/lxc_create.c \
confile_utils.c confile_utils.h \
file_utils.c file_utils.h \
initutils.c initutils.h \
log.c log.h \
storage/storage_utils.c storage/storage_utils.h \
string_utils.c string_utils.h
lxc_snapshot_SOURCES = tools/lxc_snapshot.c \
......@@ -545,6 +565,7 @@ lxc_snapshot_SOURCES = tools/lxc_snapshot.c \
confile_utils.c confile_utils.h \
file_utils.c file_utils.h \
initutils.c initutils.h \
log.c log.h \
string_utils.c string_utils.h
lxc_checkpoint_SOURCES = tools/lxc_checkpoint.c \
tools/arguments.c tools/arguments.h \
......@@ -555,16 +576,19 @@ lxc_checkpoint_SOURCES = tools/lxc_checkpoint.c \
confile_utils.c confile_utils.h \
file_utils.c file_utils.h \
initutils.c initutils.h \
log.c log.h \
string_utils.c string_utils.h
endif
if ENABLE_COMMANDS
# Binaries shipping with liblxc
init_lxc_SOURCES = cmd/lxc_init.c \
caps.c caps.h \
compiler.h \
error.c error.h \
file_utils.c file_utils.h \
initutils.c initutils.h \
log.c log.h \
memory_utils.h \
parse.c parse.h \
process_utils.c process_utils.h \
......
src/lxc/file_utils.c
......@@ -8,16 +8,16 @@
#include <linux/magic.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/stat.h>
#include <sys/sendfile.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <time.h>
#include "config.h"
#include "file_utils.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)
......
src/lxc/log.h
......@@ -16,6 +16,7 @@
#include <syslog.h>
#include <time.h>
#include "compiler.h"
#include "conf.h"
#include "config.h"
......@@ -84,7 +85,7 @@ struct lxc_log_category {
};
#ifndef NO_LXC_CONF
extern int lxc_log_use_global_fd;
__hidden extern int lxc_log_use_global_fd;
#endif
/*
......@@ -560,17 +561,18 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \
__internal_ret__; \
})
extern int lxc_log_fd;
extern int lxc_log_syslog(int facility);
extern void lxc_log_syslog_enable(void);
extern void lxc_log_syslog_disable(void);
extern int lxc_log_set_level(int *dest, int level);
extern int lxc_log_get_level(void);
extern bool lxc_log_has_valid_level(void);
extern int lxc_log_set_file(int *fd, const char *fname);
extern const char *lxc_log_get_file(void);
extern void lxc_log_set_prefix(const char *prefix);
extern const char *lxc_log_get_prefix(void);
extern void lxc_log_options_no_override(void);
#endif
__hidden extern int lxc_log_fd;
__hidden extern int lxc_log_syslog(int facility);
__hidden extern void lxc_log_syslog_enable(void);
__hidden extern void lxc_log_syslog_disable(void);
__hidden extern int lxc_log_set_level(int *dest, int level);
__hidden extern int lxc_log_get_level(void);
__hidden extern bool lxc_log_has_valid_level(void);
__hidden extern int lxc_log_set_file(int *fd, const char *fname);
__hidden extern const char *lxc_log_get_file(void);
__hidden extern void lxc_log_set_prefix(const char *prefix);
__hidden extern const char *lxc_log_get_prefix(void);
__hidden extern void lxc_log_options_no_override(void);
#endif /* __LXC_LOG_H */
src/lxc/utils.h
......@@ -203,12 +203,6 @@ extern int run_command(char *buf, size_t buf_size, int (*child_fn)(void *),
extern int run_command_status(char *buf, size_t buf_size, int (*child_fn)(void *),
void *args);
/* return copy of string @entry; do not fail. */
extern char *must_copy_string(const char *entry);
/* Re-allocate a pointer, do not fail */
extern void *must_realloc(void *orig, size_t sz);
extern bool lxc_nic_exists(char *nic);
static inline uint64_t lxc_getpagesize(void)
......
src/tests/Makefile.am
......@@ -12,6 +12,7 @@ lxc_test_api_reboot_SOURCES = api_reboot.c \
../lxc/confile_utils.c ../lxc/confile_utils.h \
../lxc/file_utils.c ../lxc/file_utils.h \
../lxc/initutils.c ../lxc/initutils.h \
../lxc/log.c ../lxc/log.h \
../lxc/network.c ../lxc/network.h \
../lxc/nl.c ../lxc/nl.h \
../lxc/string_utils.c ../lxc/string_utils.h
......@@ -26,6 +27,7 @@ lxc_test_attach_SOURCES = attach.c \
../lxc/confile_utils.c ../lxc/confile_utils.h \
../lxc/file_utils.c ../lxc/file_utils.h \
../lxc/initutils.c ../lxc/initutils.h \
../lxc/log.c ../lxc/log.h \
../lxc/network.c ../lxc/network.h \
../lxc/nl.c ../lxc/nl.h \
../lxc/string_utils.c ../lxc/string_utils.h
......@@ -40,6 +42,7 @@ lxc_test_cgpath_SOURCES = cgpath.c \
../lxc/confile_utils.c ../lxc/confile_utils.h \
../lxc/file_utils.c ../lxc/file_utils.h \
../lxc/initutils.c ../lxc/initutils.h \
../lxc/log.c ../lxc/log.h \
../lxc/network.c ../lxc/network.h \
../lxc/nl.c ../lxc/nl.h \
../lxc/string_utils.c ../lxc/string_utils.h
......@@ -56,6 +59,7 @@ lxc_test_config_jump_table_SOURCES = config_jump_table.c \
../lxc/confile_utils.c ../lxc/confile_utils.h \
../lxc/file_utils.c ../lxc/file_utils.h \
../lxc/initutils.c ../lxc/initutils.h \
../lxc/log.c ../lxc/log.h \
../lxc/network.c ../lxc/network.h \
../lxc/nl.c ../lxc/nl.h \
../lxc/string_utils.c ../lxc/string_utils.h
......@@ -86,15 +90,19 @@ lxc_test_parse_config_file_SOURCES = parse_config_file.c \
../lxc/confile_utils.c ../lxc/confile_utils.h \
../lxc/file_utils.c ../lxc/file_utils.h \
../lxc/initutils.c ../lxc/initutils.h \
../lxc/log.c ../lxc/log.h \
../lxc/network.c ../lxc/network.h \
../lxc/nl.c ../lxc/nl.h \
../lxc/string_utils.c ../lxc/string_utils.h
lxc_test_raw_clone_SOURCES = lxc_raw_clone.c \
lxctest.h \
../lxc/caps.c ../lxc/caps.h \
../lxc/file_utils.c ../lxc/file_utils.h \
../lxc/log.c ../lxc/log.h \
../lxc/namespace.c ../lxc/namespace.h \
../lxc/process_utils.c ../lxc/process_utils.h
../lxc/utils.c ../lxc/utils.h \
../lxc/string_utils.c ../lxc/string_utils.h
../lxc/process_utils.c ../lxc/process_utils.h \
../lxc/string_utils.c ../lxc/string_utils.h \
../lxc/utils.c ../lxc/utils.h
lxc_test_reboot_SOURCES = reboot.c
lxc_test_saveconfig_SOURCES = saveconfig.c
lxc_test_share_ns_SOURCES = share_ns.c \
......@@ -120,6 +128,7 @@ lxc_test_utils_SOURCES = lxc-test-utils.c \
../lxc/confile_utils.c ../lxc/confile_utils.h \
../lxc/file_utils.c ../lxc/file_utils.h \
../lxc/initutils.c ../lxc/initutils.h \
../lxc/log.c ../lxc/log.h \
../lxc/network.c ../lxc/network.h \
../lxc/nl.c ../lxc/nl.h \
../lxc/string_utils.c ../lxc/string_utils.h
......@@ -129,6 +138,8 @@ AM_CFLAGS=-DLXCROOTFSMOUNT=\"$(LXCROOTFSMOUNT)\" \
-DLXC_GLOBAL_CONF=\"$(LXC_GLOBAL_CONF)\" \
-DLXCINITDIR=\"$(LXCINITDIR)\" \
-DLIBEXECDIR=\"$(LIBEXECDIR)\" \
-DLOGPATH=\"$(LOGPATH)\" \
-DLXCTEMPLATEDIR=\"$(LXCTEMPLATEDIR)\" \
-DLXC_DEFAULT_CONFIG=\"$(LXC_DEFAULT_CONFIG)\" \
-DDEFAULT_CGROUP_PATTERN=\"$(DEFAULT_CGROUP_PATTERN)\" \
-DRUNTIME_PATH=\"$(RUNTIME_PATH)\" \
......
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