Commit 348b1695 authored by Radostin Stoyanov's avatar Radostin Stoyanov Committed by Andrei Vagin

Remove redundant semicolons

Signed-off-by: 's avatarRadostin Stoyanov <rstoyanov1@gmail.com>
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent 4a6cf33b
...@@ -116,7 +116,7 @@ static unsigned long put_trampoline(unsigned long at, struct vdso_symtable *sym) ...@@ -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, static inline void put_trampoline_call(unsigned long at, unsigned long to,
unsigned long tr) unsigned long tr)
{ {
uint32_t *addr = (uint32_t *)at;; uint32_t *addr = (uint32_t *)at;
*addr++ = 0x7C0802a6; /* mflr r0 */ *addr++ = 0x7C0802a6; /* mflr r0 */
*addr++ = 0x48000001 | ((long)(tr-at-4) & 0x3fffffc); /* bl tr */ *addr++ = 0x48000001 | ((long)(tr-at-4) & 0x3fffffc); /* bl tr */
......
...@@ -2459,7 +2459,7 @@ static int iptables_restore(bool ipv6, char *buf, int size) ...@@ -2459,7 +2459,7 @@ static int iptables_restore(bool ipv6, char *buf, int size)
int pfd[2], ret = -1; int pfd[2], ret = -1;
char *cmd4[] = {"iptables-restore", "-w", "--noflush", NULL}; char *cmd4[] = {"iptables-restore", "-w", "--noflush", NULL};
char *cmd6[] = {"ip6tables-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) { if (pipe(pfd) < 0) {
pr_perror("Unable to create pipe"); pr_perror("Unable to create pipe");
......
...@@ -374,7 +374,7 @@ static int restore_signals(siginfo_t *ptr, int nr, bool group) ...@@ -374,7 +374,7 @@ static int restore_signals(siginfo_t *ptr, int nr, bool group)
if (ret) { if (ret) {
pr_err("Unable to send siginfo %d %x with code %d\n", pr_err("Unable to send siginfo %d %x with code %d\n",
info->si_signo, info->si_code, ret); info->si_signo, info->si_code, ret);
return -1;; return -1;
} }
} }
......
...@@ -1645,7 +1645,7 @@ static int parse_fdinfo_pid_s(int pid, int fd, int type, void *arg) ...@@ -1645,7 +1645,7 @@ static int parse_fdinfo_pid_s(int pid, int fd, int type, void *arg)
struct bfd f; struct bfd f;
char *str; char *str;
bool entry_met = false; bool entry_met = false;
int ret, exit_code = -1;; int ret, exit_code = -1;
f.fd = open_proc(pid, "fdinfo/%d", fd); f.fd = open_proc(pid, "fdinfo/%d", fd);
if (f.fd < 0) if (f.fd < 0)
......
...@@ -435,7 +435,7 @@ void pstree_insert_pid(struct pid *pid_node) ...@@ -435,7 +435,7 @@ void pstree_insert_pid(struct pid *pid_node)
struct pstree_item *lookup_create_item(pid_t pid) struct pstree_item *lookup_create_item(pid_t pid)
{ {
struct pid *node;; struct pid *node;
node = lookup_create_pid(pid, NULL); node = lookup_create_pid(pid, NULL);
if (!node) if (!node)
......
...@@ -292,7 +292,7 @@ static int restore_tcp_conn_state(int sk, struct libsoccr_sk *socr, struct inet_ ...@@ -292,7 +292,7 @@ static int restore_tcp_conn_state(int sk, struct libsoccr_sk *socr, struct inet_
goto err_c; goto err_c;
} }
data.state = ii->ie->state;; data.state = ii->ie->state;
data.inq_len = tse->inq_len; data.inq_len = tse->inq_len;
data.inq_seq = tse->inq_seq; data.inq_seq = tse->inq_seq;
data.outq_len = tse->outq_len; data.outq_len = tse->outq_len;
......
...@@ -1309,7 +1309,7 @@ static int bind_deleted_unix_sk(int sk, struct unix_sk_info *ui, ...@@ -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 */ /* this shouldn't happen, since sun_addr is only 108 chars long */
if (ret < 0 || ret >= sizeof(temp)) { if (ret < 0 || ret >= sizeof(temp)) {
pr_err("snprintf of %s failed?\n", addr->sun_path); pr_err("snprintf of %s failed?\n", addr->sun_path);
return -1;; return -1;
} }
ret = rename(addr->sun_path, temp); ret = rename(addr->sun_path, temp);
...@@ -1322,7 +1322,7 @@ static int bind_deleted_unix_sk(int sk, struct unix_sk_info *ui, ...@@ -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); sizeof(addr->sun_family) + ui->ue->name.len);
if (ret < 0) { if (ret < 0) {
pr_perror("Can't bind socket after move"); pr_perror("Can't bind socket after move");
return -1;; return -1;
} }
ret = rename(temp, addr->sun_path); ret = rename(temp, addr->sun_path);
......
...@@ -351,7 +351,7 @@ out: ...@@ -351,7 +351,7 @@ out:
static int __nonuserns_sysctl_op(struct sysctl_req *req, size_t nr_req, int op) 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--) { while (nr_req--) {
int fd; int fd;
......
...@@ -375,7 +375,7 @@ static int tunfile_open(struct file_desc *d, int *new_fd) ...@@ -375,7 +375,7 @@ static int tunfile_open(struct file_desc *d, int *new_fd)
if (!ti->tfe->netdev) if (!ti->tfe->netdev)
/* just-opened tun file */ /* just-opened tun file */
goto ok;; goto ok;
tl = find_tun_link(ti->tfe->netdev); tl = find_tun_link(ti->tfe->netdev);
if (!tl) { if (!tl) {
......
...@@ -593,7 +593,7 @@ static int send_fin(struct libsoccr_sk *sk, struct libsoccr_sk_data *data, ...@@ -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; uint32_t dst_v4 = sk->dst_addr->v4.sin_addr.s_addr;
int ret, exit_code = -1, family; int ret, exit_code = -1, family;
char errbuf[LIBNET_ERRBUF_SIZE]; char errbuf[LIBNET_ERRBUF_SIZE];
int mark = SOCCR_MARK;; int mark = SOCCR_MARK;
int libnet_type; int libnet_type;
libnet_t *l; libnet_t *l;
......
...@@ -51,7 +51,7 @@ int main(int argc, char ** argv) ...@@ -51,7 +51,7 @@ int main(int argc, char ** argv)
for (i = 0; i < TEST_SIZE; i++) { for (i = 0; i < TEST_SIZE; i++) {
int *addr; int *addr;
addr = start + i * 3 * 4096;; addr = start + i * 3 * 4096;
if (addr[0] != i * 2) if (addr[0] != i * 2)
fail(); fail();
addr = start + (i * 3 + 1) * 4096; addr = start + (i * 3 + 1) * 4096;
......
...@@ -56,7 +56,7 @@ int ns_child(void *_arg) ...@@ -56,7 +56,7 @@ int ns_child(void *_arg)
test_waitsig(); test_waitsig();
if (pid) { if (pid) {
int status = 1;; int status = 1;
kill(pid, SIGTERM); kill(pid, SIGTERM);
wait(&status); wait(&status);
if (status) if (status)
......
...@@ -202,7 +202,7 @@ int main(int argc, char ** argv) ...@@ -202,7 +202,7 @@ int main(int argc, char ** argv)
test_init(argc, argv); test_init(argc, argv);
testcases[0].master.pid = getpid();; testcases[0].master.pid = getpid();
if (child(0)) if (child(0))
goto err; goto err;
......
...@@ -76,7 +76,7 @@ int main(int argc, char ** argv) ...@@ -76,7 +76,7 @@ int main(int argc, char ** argv)
return 1; return 1;
} }
addr.nl_pid = getpid();; addr.nl_pid = getpid();
addr.nl_groups = 1 << (UDEV_MONITOR_TEST - 1); addr.nl_groups = 1 << (UDEV_MONITOR_TEST - 1);
if (connect(csk, (struct sockaddr *) &addr, sizeof(struct sockaddr_nl))) { if (connect(csk, (struct sockaddr *) &addr, sizeof(struct sockaddr_nl))) {
pr_perror("connect"); pr_perror("connect");
...@@ -98,7 +98,7 @@ int main(int argc, char ** argv) ...@@ -98,7 +98,7 @@ int main(int argc, char ** argv)
msg.msg_iovlen = 1; msg.msg_iovlen = 1;
iov.iov_base = (void *) &req; iov.iov_base = (void *) &req;
iov.iov_len = sizeof(req);; iov.iov_len = sizeof(req);
if (sendmsg(csk, &msg, 0) < 0) { if (sendmsg(csk, &msg, 0) < 0) {
pr_perror("Can't send request message"); pr_perror("Can't send request message");
...@@ -134,7 +134,7 @@ int main(int argc, char ** argv) ...@@ -134,7 +134,7 @@ int main(int argc, char ** argv)
msg.msg_iovlen = 1; msg.msg_iovlen = 1;
iov.iov_base = (void *) &req; iov.iov_base = (void *) &req;
iov.iov_len = sizeof(req);; iov.iov_len = sizeof(req);
if (sendmsg(dsk, &msg, 0) < 0) { if (sendmsg(dsk, &msg, 0) < 0) {
pr_perror("Can't send request message"); pr_perror("Can't send request message");
......
...@@ -285,7 +285,7 @@ int form_request_add() ...@@ -285,7 +285,7 @@ int form_request_add()
((char *)rtap) + sizeof(struct rtattr)); ((char *)rtap) + sizeof(struct rtattr));
req.nl.nlmsg_len = NLMSG_ALIGN(req.nl.nlmsg_len) + RTA_ALIGN(rtap->rta_len); 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_type = RTA_OIF;//Output interface index
rtap->rta_len = RTA_LENGTH(sizeof(int)); rtap->rta_len = RTA_LENGTH(sizeof(int));
memcpy(((char *)rtap) + sizeof(struct rtattr), memcpy(((char *)rtap) + sizeof(struct rtattr),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment