On Fri, May 26, 2017 at 12:33 PM, Stephen Smalley <sds@xxxxxxxxxxxxx> wrote: > On Fri, 2017-05-26 at 12:16 -0400, Paul Moore wrote: >> On Fri, May 26, 2017 at 12:15 PM, Stephen Smalley <sds@xxxxxxxxxxxxx> >> wrote: >> > On Fri, 2017-05-26 at 11:58 -0400, Paul Moore wrote: >> > > From: Paul Moore <paul@xxxxxxxxxxxxxx> >> > > >> > > The results of running './tools/check-syntax -f' across the repo. >> > > >> > > Signed-off-by: Paul Moore <paul@xxxxxxxxxxxxxx> >> > > --- >> > > tests/cap_userns/userns_child_exec.c | 455 ++++++++++++++++++ >> > > ---- >> > > ------------ >> > > tests/mmap/mprotect_stack_thread.c | 3 >> > > tests/mmap/shmat.c | 2 >> > > tests/unix_socket/client.c | 14 + >> > > tests/unix_socket/server.c | 8 - >> > > 5 files changed, 253 insertions(+), 229 deletions(-) >> >> ... >> >> > > diff --git a/tests/mmap/shmat.c b/tests/mmap/shmat.c >> > > index 4467d64..56baaca 100644 >> > > --- a/tests/mmap/shmat.c >> > > +++ b/tests/mmap/shmat.c >> > > @@ -15,7 +15,7 @@ int main(void) >> > > exit(1); >> > > } >> > > execmem = shmat(shmid, 0, SHM_EXEC); >> > > - if (execmem == ((void *) -1)) { >> > > + if (execmem == ((void *) - 1)) { >> > >> > That doesn't seem like an improvement. >> >> I agree that astyle sometimes makes some odd choices, but I think the >> occasional oddity is far outweighed by having an automated style >> verification. If you can figure out the magic astyle command line to >> fix the above that would be great, I tried some time ago and couldn't >> find anything. >> >> I haven't pushed these two patches yet because I realize they could >> be >> a bit contentious, I can drop them if you prefer. > > No, that's fine. Just seems like a bug in astyle. Okay, it's merged. Any preference for Perl formatting? I'm tempted to just go with the perltidy default if no one voices an opinion by the middle of next week. -- paul moore www.paul-moore.com