The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxc/pull/2609
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) ===
Hello,
removed unused variables & function.
Thanks.
From 01c8b1cd9df92df0ea16bf5c68c9c432790e3ba1 Mon Sep 17 00:00:00 2001
From: 2xsec <dh48.je...@samsung.com>
Date: Wed, 12 Sep 2018 17:29:09 +0900
Subject: [PATCH 1/2] remove unused variables
Signed-off-by: 2xsec <dh48.je...@samsung.com>
---
src/lxc/confile.c | 2 --
src/lxc/file_utils.c | 1 -
src/lxc/storage/rsync.c | 1 -
3 files changed, 4 deletions(-)
diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index b6c5b91b6..21e2d4a7e 100644
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -2257,7 +2257,6 @@ static int set_config_namespace_clone(const char *key,
const char *value,
{
char *ns, *token;
int cloneflag = 0;
- char *saveptr = NULL;
if (lxc_config_value_empty(value))
return clr_config_namespace_clone(key, lxc_conf, data);
@@ -2293,7 +2292,6 @@ static int set_config_namespace_keep(const char *key,
const char *value,
{
char *ns, *token;
int cloneflag = 0;
- char *saveptr = NULL;
if (lxc_config_value_empty(value))
return clr_config_namespace_keep(key, lxc_conf, data);
diff --git a/src/lxc/file_utils.c b/src/lxc/file_utils.c
index 3bdde2e3a..16897d627 100644
--- a/src/lxc/file_utils.c
+++ b/src/lxc/file_utils.c
@@ -258,7 +258,6 @@ bool is_fs_type(const struct statfs *fs, fs_type_magic
magic_val)
bool has_fs_type(const char *path, fs_type_magic magic_val)
{
- bool has_type;
int ret;
struct statfs sb;
diff --git a/src/lxc/storage/rsync.c b/src/lxc/storage/rsync.c
index ca2da186e..39d09e98d 100644
--- a/src/lxc/storage/rsync.c
+++ b/src/lxc/storage/rsync.c
@@ -47,7 +47,6 @@ int lxc_storage_rsync_exec_wrapper(void *data)
int lxc_rsync_exec_wrapper(void *data)
{
- int ret;
struct rsync_data_char *args = data;
if (!lxc_switch_uid_gid(0, 0))
From 8b7421f2e587c149a49e2ec99ad829264400c729 Mon Sep 17 00:00:00 2001
From: 2xsec <dh48.je...@samsung.com>
Date: Wed, 12 Sep 2018 17:31:40 +0900
Subject: [PATCH 2/2] file_utils: remove unused function
Signed-off-by: 2xsec <dh48.je...@samsung.com>
---
src/lxc/file_utils.c | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/src/lxc/file_utils.c b/src/lxc/file_utils.c
index 16897d627..9a7bd160e 100644
--- a/src/lxc/file_utils.c
+++ b/src/lxc/file_utils.c
@@ -239,18 +239,6 @@ int lxc_make_tmpfile(char *template, bool rm)
return fd;
}
-/* In overlayfs, st_dev is unreliable. So on overlayfs we don't do the
- * lxc_rmdir_onedev()
- */
-static bool is_native_overlayfs(const char *path)
-{
- if (has_fs_type(path, OVERLAY_SUPER_MAGIC) ||
- has_fs_type(path, OVERLAYFS_SUPER_MAGIC))
- return true;
-
- return false;
-}
-
bool is_fs_type(const struct statfs *fs, fs_type_magic magic_val)
{
return (fs->f_type == (fs_type_magic)magic_val);
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
