Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-01-23 02:14:37 +00:00
Code Issues Projects Releases Wiki Activity

clang-format/zdtm: fix clang complains about strange elseifs

Browse source 
Clang-format v13 on my Fedora 35 complains about these hunks, more over
reading the formating we had before is a pain:

} else /* comment */
	if (smth) {
	fail("")
	return -1;
}

Let's make explicit {} braces for else, this way it looks much better.

Fixes: 93dd984ca ("Run 'make indent' on all C files")
Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
This commit is contained in:
Pavel Tikhomirov 2021-11-23 15:06:03 +03:00 • committed by Andrei Vagin
parent d2b6faf8fd
commit 781676f102
2 changed files with 20 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
test/zdtm/static/mprotect00.c
View file

@ -44,10 +44,12 @@ static int check_prot(char *ptr, int prot)
fail("PROT_READ bypassed");
return -1;
}
} else /* we come here on return from SIGSEGV handler */
} else {
/* we come here on return from SIGSEGV handler */
if (prot & PROT_READ) {
fail("PROT_READ rejected");
return -1;
fail("PROT_READ rejected");
return -1;
}
}
if (!sigsetjmp(segv_ret, 1)) {
@ -56,10 +58,12 @@ static int check_prot(char *ptr, int prot)
fail("PROT_WRITE bypassed");
return -1;
}
} else /* we come here on return from SIGSEGV handler */
} else {
/* we come here on return from SIGSEGV handler */
if (prot & PROT_WRITE) {
fail("PROT_WRITE rejected");
return -1;
fail("PROT_WRITE rejected");
return -1;
}
}
if (signal(SIGSEGV, SIG_DFL) == SIG_ERR) {

16
test/zdtm/static/shm-mp.c
View file

@ -33,10 +33,12 @@ static int check_prot(char *ptr, char val, int prot)
fail("PROT_READ bypassed");
return -1;
}
} else /* we come here on return from SIGSEGV handler */
} else {
/* we come here on return from SIGSEGV handler */
if (prot & PROT_READ) {
fail("PROT_READ rejected");
return -1;
fail("PROT_READ rejected");
return -1;
}
}
if (!sigsetjmp(segv_ret, 1)) {
@ -45,10 +47,12 @@ static int check_prot(char *ptr, char val, int prot)
fail("PROT_WRITE bypassed");
return -1;
}
} else /* we come here on return from SIGSEGV handler */
} else {
/* we come here on return from SIGSEGV handler */
if (prot & PROT_WRITE) {
fail("PROT_WRITE rejected");
return -1;
fail("PROT_WRITE rejected");
return -1;
}
}
if (signal(SIGSEGV, SIG_DFL) == SIG_ERR) {