[lxc-devel] [lxc/master] remove unused argument
2xsec on Github
lxc-bot at linuxcontainers.org
Fri Oct 5 02:12:30 UTC 2018
A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 381 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20181005/1caec0f4/attachment.bin>
-------------- next part --------------
From 720132e13e5f355fa8c2a3719bdfdae55d2f1d0b Mon Sep 17 00:00:00 2001
From: 2xsec <dh48.jeong at samsung.com>
Date: Fri, 5 Oct 2018 11:07:02 +0900
Subject: [PATCH 1/2] tools: lxc-start: remove unused argument
Signed-off-by: 2xsec <dh48.jeong at samsung.com>
---
src/lxc/tools/lxc_start.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lxc/tools/lxc_start.c b/src/lxc/tools/lxc_start.c
index 74d2e06ea..4553cb5ca 100644
--- a/src/lxc/tools/lxc_start.c
+++ b/src/lxc/tools/lxc_start.c
@@ -52,7 +52,7 @@
lxc_log_define(lxc_start, lxc);
static int my_parser(struct lxc_arguments *args, int c, char *arg);
-static int ensure_path(struct lxc_arguments *args, char **confpath, const char *path);
+static int ensure_path(char **confpath, const char *path);
static struct lxc_list defines;
@@ -144,7 +144,7 @@ static int my_parser(struct lxc_arguments *args, int c, char *arg)
return 0;
}
-static int ensure_path(struct lxc_arguments *args, char **confpath, const char *path)
+static int ensure_path(char **confpath, const char *path)
{
int fd;
char *fullpath = NULL;
@@ -300,7 +300,7 @@ int main(int argc, char *argv[])
}
if (my_args.pidfile)
- if (ensure_path(&my_args, &c->pidfile, my_args.pidfile) < 0) {
+ if (ensure_path(&c->pidfile, my_args.pidfile) < 0) {
ERROR("Failed to ensure pidfile '%s'", my_args.pidfile);
goto out;
}
From 70e72c56277cc5327359fef75e19826598369773 Mon Sep 17 00:00:00 2001
From: 2xsec <dh48.jeong at samsung.com>
Date: Fri, 5 Oct 2018 11:08:41 +0900
Subject: [PATCH 2/2] tools: lxc-unshare: remove unnecessary initialization
Signed-off-by: 2xsec <dh48.jeong at samsung.com>
---
src/lxc/tools/lxc_unshare.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/lxc/tools/lxc_unshare.c b/src/lxc/tools/lxc_unshare.c
index 3aa703e5f..295464e9d 100644
--- a/src/lxc/tools/lxc_unshare.c
+++ b/src/lxc/tools/lxc_unshare.c
@@ -108,7 +108,6 @@ Options :\n\
.log_priority = "ERROR",
.log_file = "none",
.daemonize = 0,
- .pidfile = NULL,
};
static int my_parser(struct lxc_arguments *args, int c, char *arg)
More information about the lxc-devel
mailing list