mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-08-30 20:39:33 +00:00
Code Issues Releases Wiki Activity

conf: coding style fixes

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner
2018-07-22 15:43:47 +02:00
parent fd14fdb827
commit 6b74139780
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/lxc/conf.c
View File

@@ -648,22 +648,21 @@ unsigned long add_required_remount_flags(const char *s, const char *d,
#endif #endif
} }
static int add_shmount_to_list(struct lxc_conf *conf) { static int add_shmount_to_list(struct lxc_conf *conf)
{
char new_mount[MAXPATHLEN]; char new_mount[MAXPATHLEN];
/* Offset for the leading '/' since the path_cont /* Offset for the leading '/' since the path_cont
* is absolute inside the container */ * is absolute inside the container.
int ret = -1, offset = 1; */
int offset = 1, ret = -1;
ret = snprintf(new_mount, sizeof(new_mount), "%s %s none bind,create=dir 0 0", ret = snprintf(new_mount, sizeof(new_mount),
conf->shmount.path_host, conf->shmount.path_cont + offset); "%s %s none bind,create=dir 0 0", conf->shmount.path_host,
conf->shmount.path_cont + offset);
if (ret < 0 || (size_t)ret >= sizeof(new_mount)) if (ret < 0 || (size_t)ret >= sizeof(new_mount))
return -1; return -1;
ret = add_elem_to_mount_list(new_mount, conf); return add_elem_to_mount_list(new_mount, conf);
if (ret < 0)
ERROR("Failed to add new mount \"%s\" to the config", new_mount);
return ret;
} }
static int lxc_mount_auto_mounts(struct lxc_conf *conf, int flags, struct lxc_handler *handler) static int lxc_mount_auto_mounts(struct lxc_conf *conf, int flags, struct lxc_handler *handler)
@@ -806,7 +805,7 @@ static int lxc_mount_auto_mounts(struct lxc_conf *conf, int flags, struct lxc_ha
int ret = add_shmount_to_list(conf); int ret = add_shmount_to_list(conf);
if (ret < 0) { if (ret < 0) {
ERROR("Failed to add shmount entry to container config"); ERROR("Failed to add shmount entry to container config");
return ret; return -1;
} }
} }