From df3ab009952f365d993e1febbbb1e910d7bb77e6 Mon Sep 17 00:00:00 2001 From: 2xsec Date: Thu, 28 Jun 2018 23:07:01 +0900 Subject: [PATCH] tools: lxc-wait: share internal API symbols Signed-off-by: 2xsec --- src/lxc/Makefile.am | 2 +- src/lxc/tools/lxc_wait.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am index 8324eb1fe..81c0d17ba 100644 --- a/src/lxc/Makefile.am +++ b/src/lxc/Makefile.am @@ -283,7 +283,7 @@ lxc_stop_SOURCES = tools/lxc_stop.c tools/arguments.c lxc_top_SOURCES = tools/lxc_top.c tools/arguments.c tools/tool_utils.c lxc_unfreeze_SOURCES = tools/lxc_unfreeze.c tools/arguments.c lxc_unshare_SOURCES = tools/lxc_unshare.c tools/arguments.c tools/tool_utils.c -lxc_wait_SOURCES = tools/lxc_wait.c tools/arguments.c tools/tool_utils.c +lxc_wait_SOURCES = tools/lxc_wait.c tools/arguments.c lxc_create_SOURCES = tools/lxc_create.c tools/arguments.c tools/tool_utils.c lxc_snapshot_SOURCES = tools/lxc_snapshot.c tools/arguments.c tools/tool_utils.c lxc_checkpoint_SOURCES = tools/lxc_checkpoint.c tools/arguments.c tools/tool_utils.c diff --git a/src/lxc/tools/lxc_wait.c b/src/lxc/tools/lxc_wait.c index 346c546ee..01ea3fa51 100644 --- a/src/lxc/tools/lxc_wait.c +++ b/src/lxc/tools/lxc_wait.c @@ -33,12 +33,14 @@ #include #include "arguments.h" -#include "tool_utils.h" +#include "log.h" + +lxc_log_define(lxc_wait, lxc); static int my_checker(const struct lxc_arguments *args) { if (!args->states) { - lxc_error(args, "missing state option to wait for."); + ERROR("Missing state option to wait for."); return -1; } @@ -107,7 +109,7 @@ int main(int argc, char *argv[]) exit(EXIT_FAILURE); if (!c->may_control(c)) { - lxc_error(&my_args, "Insufficent privileges to control %s", c->name); + ERROR("Insufficent privileges to control %s", c->name); lxc_container_put(c); exit(EXIT_FAILURE); } @@ -116,14 +118,14 @@ int main(int argc, char *argv[]) c->clear_config(c); if (!c->load_config(c, my_args.rcfile)) { - lxc_error(&my_args, "Failed to load rcfile"); + ERROR("Failed to load rcfile"); lxc_container_put(c); exit(EXIT_FAILURE); } c->configfile = strdup(my_args.rcfile); if (!c->configfile) { - lxc_error(&my_args, "Out of memory setting new config filename"); + ERROR("Out of memory setting new config filename"); lxc_container_put(c); exit(EXIT_FAILURE); } -- 2.47.3