From 1c22d7ba86691dbd0fad6332cf627f468f26ee3e Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Mon, 9 Apr 2018 12:14:58 +0100 Subject: [PATCH] Remove redundant semicolons Signed-off-by: Radostin Stoyanov Signed-off-by: Andrei Vagin --- criu/arch/ppc64/vdso-pie.c | 2 +- criu/net.c | 2 +- criu/pie/restorer.c | 2 +- criu/proc_parse.c | 2 +- criu/pstree.c | 2 +- criu/sk-tcp.c | 2 +- criu/sk-unix.c | 4 ++-- criu/sysctl.c | 2 +- criu/tun.c | 2 +- soccr/soccr.c | 2 +- test/zdtm/static/maps06.c | 2 +- test/zdtm/static/mountpoints.c | 2 +- test/zdtm/static/session01.c | 2 +- test/zdtm/static/sk-netlink.c | 6 +++--- test/zdtm/transition/netlink00.c | 2 +- 15 files changed, 18 insertions(+), 18 deletions(-) diff --git a/criu/arch/ppc64/vdso-pie.c b/criu/arch/ppc64/vdso-pie.c index 2dd3030dc..a7e017342 100644 --- a/criu/arch/ppc64/vdso-pie.c +++ b/criu/arch/ppc64/vdso-pie.c @@ -116,7 +116,7 @@ static unsigned long put_trampoline(unsigned long at, struct vdso_symtable *sym) static inline void put_trampoline_call(unsigned long at, unsigned long to, unsigned long tr) { - uint32_t *addr = (uint32_t *)at;; + uint32_t *addr = (uint32_t *)at; *addr++ = 0x7C0802a6; /* mflr r0 */ *addr++ = 0x48000001 | ((long)(tr-at-4) & 0x3fffffc); /* bl tr */ diff --git a/criu/net.c b/criu/net.c index 94eafd8c5..6430bdfcb 100644 --- a/criu/net.c +++ b/criu/net.c @@ -2466,7 +2466,7 @@ static int iptables_restore(bool ipv6, char *buf, int size) int pfd[2], ret = -1; char *cmd4[] = {"iptables-restore", "-w", "--noflush", NULL}; char *cmd6[] = {"ip6tables-restore", "-w", "--noflush", NULL}; - char **cmd = ipv6 ? cmd6 : cmd4;; + char **cmd = ipv6 ? cmd6 : cmd4; if (pipe(pfd) < 0) { pr_perror("Unable to create pipe"); diff --git a/criu/pie/restorer.c b/criu/pie/restorer.c index 091026103..ab0c0d713 100644 --- a/criu/pie/restorer.c +++ b/criu/pie/restorer.c @@ -388,7 +388,7 @@ static int restore_signals(siginfo_t *ptr, int nr, bool group) if (ret) { pr_err("Unable to send siginfo %d %x with code %d\n", info->si_signo, info->si_code, ret); - return -1;; + return -1; } } diff --git a/criu/proc_parse.c b/criu/proc_parse.c index 54f0ffd8e..160a6fc58 100644 --- a/criu/proc_parse.c +++ b/criu/proc_parse.c @@ -1718,7 +1718,7 @@ static int parse_fdinfo_pid_s(int pid, int fd, int type, void *arg) struct bfd f; char *str; bool entry_met = false; - int ret, exit_code = -1;; + int ret, exit_code = -1; f.fd = open_proc(pid, "fdinfo/%d", fd); if (f.fd < 0) diff --git a/criu/pstree.c b/criu/pstree.c index 7ecdba00c..6047d29cc 100644 --- a/criu/pstree.c +++ b/criu/pstree.c @@ -607,7 +607,7 @@ void pstree_insert_pid(struct pid *pid_node, uint32_t ns_id) struct pstree_item *lookup_create_item(pid_t *pid, int level, uint32_t ns_id) { - struct pid *node;; + struct pid *node; node = lookup_create_pid(pid, level, NULL, ns_id); if (!node) diff --git a/criu/sk-tcp.c b/criu/sk-tcp.c index d1e250206..4c0f6903b 100644 --- a/criu/sk-tcp.c +++ b/criu/sk-tcp.c @@ -293,7 +293,7 @@ static int restore_tcp_conn_state(int sk, struct libsoccr_sk *socr, struct inet_ goto err_c; } - data.state = ii->ie->state;; + data.state = ii->ie->state; data.inq_len = tse->inq_len; data.inq_seq = tse->inq_seq; data.outq_len = tse->outq_len; diff --git a/criu/sk-unix.c b/criu/sk-unix.c index 0b0fa699c..fd80a0b3d 100644 --- a/criu/sk-unix.c +++ b/criu/sk-unix.c @@ -1309,7 +1309,7 @@ static int bind_deleted_unix_sk(int sk, struct unix_sk_info *ui, /* this shouldn't happen, since sun_addr is only 108 chars long */ if (ret < 0 || ret >= sizeof(temp)) { pr_err("snprintf of %s failed?\n", addr->sun_path); - return -1;; + return -1; } ret = rename(addr->sun_path, temp); @@ -1322,7 +1322,7 @@ static int bind_deleted_unix_sk(int sk, struct unix_sk_info *ui, sizeof(addr->sun_family) + ui->ue->name.len); if (ret < 0) { pr_perror("Can't bind socket after move"); - return -1;; + return -1; } ret = rename(temp, addr->sun_path); diff --git a/criu/sysctl.c b/criu/sysctl.c index 4b15e1506..e48476560 100644 --- a/criu/sysctl.c +++ b/criu/sysctl.c @@ -351,7 +351,7 @@ out: static int __nonuserns_sysctl_op(struct sysctl_req *req, size_t nr_req, int op) { - int ret, exit_code = -1;; + int ret, exit_code = -1; while (nr_req--) { int fd; diff --git a/criu/tun.c b/criu/tun.c index 742816afc..dbc471158 100644 --- a/criu/tun.c +++ b/criu/tun.c @@ -375,7 +375,7 @@ static int tunfile_open(struct file_desc *d, int *new_fd) if (!ti->tfe->netdev) /* just-opened tun file */ - goto ok;; + goto ok; tl = find_tun_link(ti->tfe->netdev); if (!tl) { diff --git a/soccr/soccr.c b/soccr/soccr.c index 2d49766dc..d63a2ce2b 100644 --- a/soccr/soccr.c +++ b/soccr/soccr.c @@ -593,7 +593,7 @@ static int send_fin(struct libsoccr_sk *sk, struct libsoccr_sk_data *data, uint32_t dst_v4 = sk->dst_addr->v4.sin_addr.s_addr; int ret, exit_code = -1, family; char errbuf[LIBNET_ERRBUF_SIZE]; - int mark = SOCCR_MARK;; + int mark = SOCCR_MARK; int libnet_type; libnet_t *l; diff --git a/test/zdtm/static/maps06.c b/test/zdtm/static/maps06.c index df57fdb40..14dd90f43 100644 --- a/test/zdtm/static/maps06.c +++ b/test/zdtm/static/maps06.c @@ -51,7 +51,7 @@ int main(int argc, char ** argv) for (i = 0; i < TEST_SIZE; i++) { int *addr; - addr = start + i * 3 * 4096;; + addr = start + i * 3 * 4096; if (addr[0] != i * 2) fail(); addr = start + (i * 3 + 1) * 4096; diff --git a/test/zdtm/static/mountpoints.c b/test/zdtm/static/mountpoints.c index 17fa9311c..00475cdc5 100644 --- a/test/zdtm/static/mountpoints.c +++ b/test/zdtm/static/mountpoints.c @@ -56,7 +56,7 @@ int ns_child(void *_arg) test_waitsig(); if (pid) { - int status = 1;; + int status = 1; kill(pid, SIGTERM); wait(&status); if (status) diff --git a/test/zdtm/static/session01.c b/test/zdtm/static/session01.c index bf861c3c7..451e5063d 100644 --- a/test/zdtm/static/session01.c +++ b/test/zdtm/static/session01.c @@ -210,7 +210,7 @@ int main(int argc, char ** argv) test_init(argc, argv); - testcases[0].master.pid = getpid();; + testcases[0].master.pid = getpid(); if (child(0)) goto err; diff --git a/test/zdtm/static/sk-netlink.c b/test/zdtm/static/sk-netlink.c index f334246e2..7f06f0259 100644 --- a/test/zdtm/static/sk-netlink.c +++ b/test/zdtm/static/sk-netlink.c @@ -76,7 +76,7 @@ int main(int argc, char ** argv) return 1; } - addr.nl_pid = getpid();; + addr.nl_pid = getpid(); addr.nl_groups = 1 << (UDEV_MONITOR_TEST - 1); if (connect(csk, (struct sockaddr *) &addr, sizeof(struct sockaddr_nl))) { pr_perror("connect"); @@ -98,7 +98,7 @@ int main(int argc, char ** argv) msg.msg_iovlen = 1; iov.iov_base = (void *) &req; - iov.iov_len = sizeof(req);; + iov.iov_len = sizeof(req); if (sendmsg(csk, &msg, 0) < 0) { pr_perror("Can't send request message"); @@ -134,7 +134,7 @@ int main(int argc, char ** argv) msg.msg_iovlen = 1; iov.iov_base = (void *) &req; - iov.iov_len = sizeof(req);; + iov.iov_len = sizeof(req); if (sendmsg(dsk, &msg, 0) < 0) { pr_perror("Can't send request message"); diff --git a/test/zdtm/transition/netlink00.c b/test/zdtm/transition/netlink00.c index 9a2ed1680..e69d579ba 100644 --- a/test/zdtm/transition/netlink00.c +++ b/test/zdtm/transition/netlink00.c @@ -285,7 +285,7 @@ int form_request_add() ((char *)rtap) + sizeof(struct rtattr)); req.nl.nlmsg_len = NLMSG_ALIGN(req.nl.nlmsg_len) + RTA_ALIGN(rtap->rta_len); - rtap = NLMSG_TAIL(&req.nl);; + rtap = NLMSG_TAIL(&req.nl); rtap->rta_type = RTA_OIF;//Output interface index rtap->rta_len = RTA_LENGTH(sizeof(int)); memcpy(((char *)rtap) + sizeof(struct rtattr),