The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxc-utils/pull/3

This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.

=== Description (from pull-request) ===
This was only necessary when the command line utilities were still in
the lxc tree.

Signed-off-by: Christian Brauner <christian.brau...@ubuntu.com>
From 9d6e3c5b1b7ad457fd059dadf95c6ffcb1e00242 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brau...@ubuntu.com>
Date: Thu, 8 Feb 2018 16:40:03 +0100
Subject: [PATCH] tree-wide: strip tool_* prefix from files

This was only necessary when the command line utilities were still in
the lxc tree.

Signed-off-by: Christian Brauner <christian.brau...@ubuntu.com>
---
 src/Makefile.am               | 142 +++++++++++++++++++++---------------------
 src/{tool_list.h => list.h}   |   0
 src/lxc_autostart.c           |   4 +-
 src/lxc_execute.c             |   4 +-
 src/lxc_start.c               |   4 +-
 src/{tool_utils.c => utils.c} |   0
 src/{tool_utils.h => utils.h} |   2 +-
 7 files changed, 78 insertions(+), 78 deletions(-)
 rename src/{tool_list.h => list.h} (100%)
 rename src/{tool_utils.c => utils.c} (100%)
 rename src/{tool_utils.h => utils.h} (99%)

diff --git a/src/Makefile.am b/src/Makefile.am
index 741f63e..f27c01e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 noinst_HEADERS = arguments.h \
-                tool_list.h \
-                tool_utils.h
+                list.h \
+                utils.h
 
 if IS_BIONIC
 noinst_HEADERS += include/ifaddrs.h
@@ -56,143 +56,143 @@ LDADD = -llxc
 lxc_attach_SOURCES = lxc_attach.c \
                     arguments.c \
                     arguments.h \
-                    tool_list.h \
-                    tool_utils.c \
-                    tool_utils.h
+                    list.h \
+                    utils.c \
+                    utils.h
 lxc_autostart_SOURCES = lxc_autostart.c \
                        arguments.c \
                        arguments.h \
-                       tool_list.h \
-                       tool_utils.c \
-                       tool_utils.h
+                       list.h \
+                       utils.c \
+                       utils.h
 lxc_cgroup_SOURCES = lxc_cgroup.c \
                     arguments.c \
                     arguments.h \
-                    tool_list.h \
-                    tool_utils.c \
-                    tool_utils.h
+                    list.h \
+                    utils.c \
+                    utils.h
 lxc_checkpoint_SOURCES = lxc_checkpoint.c \
                         arguments.c \
                         arguments.h \
-                        tool_list.h \
-                        tool_utils.c \
-                        tool_utils.h
+                        list.h \
+                        utils.c \
+                        utils.h
 lxc_config_SOURCES = lxc_config.c \
                     arguments.c \
                     arguments.h \
-                    tool_list.h \
-                    tool_utils.c \
-                    tool_utils.h
+                    list.h \
+                    utils.c \
+                    utils.h
 lxc_console_SOURCES = lxc_console.c \
                      arguments.c \
                      arguments.h \
-                     tool_list.h \
-                     tool_utils.c \
-                     tool_utils.h
+                     list.h \
+                     utils.c \
+                     utils.h
 lxc_copy_SOURCES = lxc_copy.c \
                   arguments.c \
                   arguments.h \
-                  tool_list.h \
-                  tool_utils.c \
-                  tool_utils.h
+                  list.h \
+                  utils.c \
+                  utils.h
 lxc_create_SOURCES = lxc_create.c \
                     arguments.c \
                     arguments.h \
-                    tool_list.h \
-                    tool_utils.c \
-                    tool_utils.h
+                    list.h \
+                    utils.c \
+                    utils.h
 lxc_destroy_SOURCES = lxc_destroy.c \
                      arguments.c \
                      arguments.h \
-                     tool_list.h \
-                     tool_utils.c \
-                     tool_utils.h
+                     list.h \
+                     utils.c \
+                     utils.h
 lxc_device_SOURCES = lxc_device.c \
                     arguments.c \
                     arguments.h \
-                    tool_list.h \
-                    tool_utils.c \
-                    tool_utils.h
+                    list.h \
+                    utils.c \
+                    utils.h
 lxc_execute_SOURCES = lxc_execute.c \
                      arguments.c \
                      arguments.h \
-                     tool_list.h \
-                     tool_utils.c \
-                     tool_utils.h
+                     list.h \
+                     utils.c \
+                     utils.h
 lxc_freeze_SOURCES = lxc_freeze.c \
                     arguments.c \
                     arguments.h \
-                    tool_list.h \
-                    tool_utils.c \
-                    tool_utils.h
+                    list.h \
+                    utils.c \
+                    utils.h
 lxc_info_SOURCES = lxc_info.c \
                   arguments.c \
                   arguments.h \
-                  tool_list.h \
-                  tool_utils.c \
-                  tool_utils.h
+                  list.h \
+                  utils.c \
+                  utils.h
 lxc_ls_SOURCES = lxc_ls.c \
                 arguments.c \
                 arguments.h \
-                tool_list.h \
-                tool_utils.c \
-                tool_utils.h
+                list.h \
+                utils.c \
+                utils.h
 lxc_monitor_SOURCES = lxc_monitor.c \
                      arguments.c \
                      arguments.h \
-                     tool_list.h \
-                     tool_utils.c \
-                     tool_utils.h
+                     list.h \
+                     utils.c \
+                     utils.h
 lxc_snapshot_SOURCES = lxc_snapshot.c \
                       arguments.c \
                       arguments.h \
-                      tool_list.h \
-                      tool_utils.c \
-                      tool_utils.h
+                      list.h \
+                      utils.c \
+                      utils.h
 lxc_start_SOURCES = lxc_start.c \
                    arguments.c \
                    arguments.h \
-                   tool_list.h \
-                   tool_utils.c \
-                   tool_utils.h
+                   list.h \
+                   utils.c \
+                   utils.h
 lxc_stop_SOURCES = lxc_stop.c \
                   arguments.c \
                   arguments.h \
-                  tool_list.h \
-                  tool_utils.c \
-                  tool_utils.h
+                  list.h \
+                  utils.c \
+                  utils.h
 lxc_top_SOURCES = lxc_top.c \
                  arguments.c \
                  arguments.h \
-                 tool_list.h \
-                 tool_utils.c \
-                 tool_utils.h
+                 list.h \
+                 utils.c \
+                 utils.h
 lxc_unfreeze_SOURCES = lxc_unfreeze.c \
                       arguments.c \
                       arguments.h \
-                      tool_list.h \
-                      tool_utils.c \
-                      tool_utils.h
+                      list.h \
+                      utils.c \
+                      utils.h
 lxc_unshare_SOURCES = lxc_unshare.c \
                      arguments.c \
                      arguments.h \
-                     tool_list.h \
-                     tool_utils.c \
-                     tool_utils.h
+                     list.h \
+                     utils.c \
+                     utils.h
 lxc_wait_SOURCES = lxc_wait.c \
                   arguments.c \
                   arguments.h \
-                  tool_list.h \
-                  tool_utils.c \
-                  tool_utils.h
+                  list.h \
+                  utils.c \
+                  utils.h
 
 if ENABLE_DEPRECATED
 lxc_clone_SOURCES = lxc_clone.c \
                    arguments.c \
                    arguments.h \
-                   tool_list.h \
-                   tool_utils.c \
-                   tool_utils.h
+                   list.h \
+                   utils.c \
+                   utils.h
 endif
 
 if !HAVE_GETSUBOPT
diff --git a/src/tool_list.h b/src/list.h
similarity index 100%
rename from src/tool_list.h
rename to src/list.h
diff --git a/src/lxc_autostart.c b/src/lxc_autostart.c
index 41d2e4b..7313d4e 100644
--- a/src/lxc_autostart.c
+++ b/src/lxc_autostart.c
@@ -27,8 +27,8 @@
 #include <lxc/lxccontainer.h>
 
 #include "arguments.h"
-#include "tool_list.h"
-#include "tool_utils.h"
+#include "list.h"
+#include "utils.h"
 
 static struct lxc_list *accumulate_list(char *input, char *delimiter, struct 
lxc_list *str_list);
 
diff --git a/src/lxc_execute.c b/src/lxc_execute.c
index dd58aed..2578a9b 100644
--- a/src/lxc_execute.c
+++ b/src/lxc_execute.c
@@ -36,8 +36,8 @@
 #include <lxc/lxccontainer.h>
 
 #include "arguments.h"
-#include "tool_list.h"
-#include "tool_utils.h"
+#include "list.h"
+#include "utils.h"
 
 static struct lxc_list defines;
 
diff --git a/src/lxc_start.c b/src/lxc_start.c
index 31a7cd6..1c6e78e 100644
--- a/src/lxc_start.c
+++ b/src/lxc_start.c
@@ -42,8 +42,8 @@
 #include <lxc/lxccontainer.h>
 
 #include "arguments.h"
-#include "tool_list.h"
-#include "tool_utils.h"
+#include "list.h"
+#include "utils.h"
 
 static struct lxc_list defines;
 
diff --git a/src/tool_utils.c b/src/utils.c
similarity index 100%
rename from src/tool_utils.c
rename to src/utils.c
diff --git a/src/tool_utils.h b/src/utils.h
similarity index 99%
rename from src/tool_utils.h
rename to src/utils.h
index e0cf2fc..76e1579 100644
--- a/src/tool_utils.h
+++ b/src/utils.h
@@ -31,7 +31,7 @@
 
 #include <lxc/lxccontainer.h>
 
-#include "tool_list.h"
+#include "list.h"
 
 #define TOOL_MAXPATHLEN 4096
 #define TOOL_NUMSTRLEN64 21
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel

Reply via email to