Merge pull request #2609 from 2xsec/bugfix

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);

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);
@@ -258,7 +246,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;
 

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))