[CRIU] [PATCH 1/3] remove some double ;;s

Tycho Andersen tycho.andersen at canonical.com
Tue Mar 31 08:32:34 PDT 2015


Signed-off-by: Tycho Andersen <tycho.andersen at canonical.com>
---
 cr-restore.c       | 2 +-
 fsnotify.c         | 2 +-
 mount.c            | 2 +-
 page-xfer.c        | 2 +-
 parasite-syscall.c | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cr-restore.c b/cr-restore.c
index 823bf15..a4786a5 100644
--- a/cr-restore.c
+++ b/cr-restore.c
@@ -398,7 +398,7 @@ static int restore_priv_vma_content(pid_t pid)
 	 * Read page contents.
 	 */
 	while (1) {
-		unsigned long off, i, nr_pages;;
+		unsigned long off, i, nr_pages;
 		struct iovec iov;
 
 		ret = pr.get_pagemap(&pr, &iov);
diff --git a/fsnotify.c b/fsnotify.c
index f4222d9..a069fbe 100644
--- a/fsnotify.c
+++ b/fsnotify.c
@@ -211,7 +211,7 @@ struct watch_list {
 static int dump_inotify_entry(union fdinfo_entries *e, void *arg)
 {
 	struct watch_list *wd_list = (struct watch_list *) arg;
-	struct inotify_wd_entry *wd_entry = (struct inotify_wd_entry *) e;;
+	struct inotify_wd_entry *wd_entry = (struct inotify_wd_entry *) e;
 	InotifyWdEntry *we = &wd_entry->e;
 
 	pr_info("wd: wd 0x%08x s_dev 0x%08x i_ino 0x%16"PRIx64" mask 0x%08x\n",
diff --git a/mount.c b/mount.c
index 021c6e3..8fbe281 100644
--- a/mount.c
+++ b/mount.c
@@ -817,7 +817,7 @@ static int open_mountpoint(struct mount_info *pm)
 		goto out;
 	}
 
-	return __open_mountpoint(pm, fd);;
+	return __open_mountpoint(pm, fd);
 out:
 	if (ns_old >= 0)
 		 restore_ns(ns_old, &mnt_ns_desc);
diff --git a/page-xfer.c b/page-xfer.c
index c594aba..8fff767 100644
--- a/page-xfer.c
+++ b/page-xfer.c
@@ -781,7 +781,7 @@ int check_parent_local_xfer(int fd_type, int id)
 
 	pfd = openat(get_service_fd(IMG_FD_OFF), CR_PARENT_LINK, O_RDONLY);
 	if (pfd < 0 && errno == ENOENT)
-		return 0;;
+		return 0;
 
 	snprintf(path, sizeof(path), imgset_template[fd_type].fmt, id);
 	ret = fstatat(pfd, path, &st, 0);
diff --git a/parasite-syscall.c b/parasite-syscall.c
index e8eeffb..fa43627 100644
--- a/parasite-syscall.c
+++ b/parasite-syscall.c
@@ -501,7 +501,7 @@ static int parasite_init_daemon(struct parasite_ctl *ctl, struct ns_id *net)
 	args->log_level = log_get_loglevel();
 
 	if (prepare_tsock(ctl, pid, args, net))
-		goto err;;
+		goto err;
 
 	/* after this we can catch parasite errors in chld handler */
 	if (setup_child_handler())
@@ -1175,7 +1175,7 @@ static int parasite_start_daemon(struct parasite_ctl *ctl, struct pstree_item *i
 		return -1;
 
 	if (parasite_init_daemon(ctl, dmpi(item)->netns))
-		return -1;;
+		return -1;
 
 	return 0;
 }
-- 
2.1.0



More information about the CRIU mailing list