Skip to content

Commit

Permalink
tools: lxc-copy: remove the trailing . & fix coding style of strncmp
Browse files Browse the repository at this point in the history
Signed-off-by: 2xsec <dh48.jeong@samsung.com>
  • Loading branch information
2xsec authored and Christian Brauner committed Jul 2, 2018
1 parent 50f9a97 commit b3dd9aa
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/lxc/tools/lxc_copy.c
Expand Up @@ -187,7 +187,7 @@ int main(int argc, char *argv[])
}

if (!my_args.newname && !(my_args.task == DESTROY)) {
ERROR("You must provide a NEWNAME for the clone.");
ERROR("You must provide a NEWNAME for the clone");
exit(ret);
}

Expand Down Expand Up @@ -603,7 +603,7 @@ static int my_parser(struct lxc_arguments *args, int c, char *arg)
return -1;
break;
case 'B':
if (!strncmp(arg, "overlay", strlen(arg)))
if (strncmp(arg, "overlay", strlen(arg)) == 0)
arg = "overlayfs";
args->bdevtype = arg;
break;
Expand Down Expand Up @@ -649,10 +649,10 @@ static int parse_bind_mnt(char *mntstring, enum mnttype type)
if (len == 1) { /* bind=src */
m->dest = construct_path(mntarray[0], false);
} else if (len == 2) { /* bind=src:option or bind=src:dest */
if (!strncmp(mntarray[1], "rw", strlen(mntarray[1])))
if (strncmp(mntarray[1], "rw", strlen(mntarray[1])) == 0)
m->options = strdup("rw");

if (!strncmp(mntarray[1], "ro", strlen(mntarray[1])))
if (strncmp(mntarray[1], "ro", strlen(mntarray[1])) == 0)
m->options = strdup("ro");

if (m->options)
Expand All @@ -672,8 +672,8 @@ static int parse_bind_mnt(char *mntstring, enum mnttype type)
if (!m->options)
m->options = strdup("rw");

if (!m->options || (strncmp(m->options, "rw", strlen(m->options)) &&
strncmp(m->options, "ro", strlen(m->options))))
if (!m->options || (strncmp(m->options, "rw", strlen(m->options)) != 0 &&
strncmp(m->options, "ro", strlen(m->options)) != 0))
goto err;

lxc_free_array((void **)mntarray, free);
Expand Down Expand Up @@ -771,7 +771,7 @@ static char *mount_tmpfs(const char *oldname, const char *newname,
if (arg->tmpfs && !arg->bdevtype) {
arg->bdevtype = "overlayfs";
} else if (arg->tmpfs && arg->bdevtype &&
strncmp(arg->bdevtype, "overlayfs", strlen(arg->bdevtype))) {
strncmp(arg->bdevtype, "overlayfs", strlen(arg->bdevtype)) != 0) {
ERROR("%s",
"A container can only be placed on a tmpfs when the "
"overlay storage driver is used");
Expand All @@ -794,7 +794,7 @@ static char *mount_tmpfs(const char *oldname, const char *newname,
goto err_free;

if (fcntl(fd, F_SETFD, FD_CLOEXEC)) {
ERROR("Failed to set close-on-exec on file descriptor.");
ERROR("Failed to set close-on-exec on file descriptor");
goto err_close;
}

Expand Down

0 comments on commit b3dd9aa

Please sign in to comment.