* [Buildroot] [PATCH] support / toolchain: use consistent code style for C code
@ 2020-02-08 19:44 Peter Korsgaard
2020-02-08 21:12 ` Yann E. MORIN
0 siblings, 1 reply; 2+ messages in thread
From: Peter Korsgaard @ 2020-02-08 19:44 UTC (permalink / raw)
To: buildroot
Most, but not all our C code follows the Linux kernel code style (as
documented in Documentation/process/coding-style.rst). Adjust the few
places doing differently:
- Braces:
..but the preferred way, as shown to us by the prophets Kernighan
and Ritchie, is to put the opening brace last on the line
- Spaces after keywords:
Use a space after (most) keywords
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
| 3 +--
toolchain/toolchain-wrapper.c | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
--git a/support/scripts/check-kernel-headers.sh b/support/scripts/check-kernel-headers.sh
index d1864cb05e..841df98b64 100755
--- a/support/scripts/check-kernel-headers.sh
+++ b/support/scripts/check-kernel-headers.sh
@@ -53,8 +53,7 @@ int main(int argc __attribute__((unused)),
int l = LINUX_VERSION_CODE & ~0xFF;
int h = KERNEL_VERSION(${HDR_M},${HDR_m},0);
- if(l != h)
- {
+ if (l != h) {
printf("Incorrect selection of kernel headers: ");
printf("expected %d.%d.x, got %d.%d.x\n", ${HDR_M}, ${HDR_m},
((LINUX_VERSION_CODE>>16) & 0xFF),
diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c
index b7705a4cbf..8cfc963ccd 100644
--- a/toolchain/toolchain-wrapper.c
+++ b/toolchain/toolchain-wrapper.c
@@ -434,7 +434,7 @@ int main(int argc, char **argv)
/* Both args below can be set at compile/link time
* and are ignored correctly when not used
*/
- if(i == argc)
+ if (i == argc)
*cur++ = "-fPIE";
if (!found_shared)
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Buildroot] [PATCH] support / toolchain: use consistent code style for C code
2020-02-08 19:44 [Buildroot] [PATCH] support / toolchain: use consistent code style for C code Peter Korsgaard
@ 2020-02-08 21:12 ` Yann E. MORIN
0 siblings, 0 replies; 2+ messages in thread
From: Yann E. MORIN @ 2020-02-08 21:12 UTC (permalink / raw)
To: buildroot
Peter, All,
On 2020-02-08 20:44 +0100, Peter Korsgaard spake thusly:
> Most, but not all our C code follows the Linux kernel code style (as
> documented in Documentation/process/coding-style.rst). Adjust the few
> places doing differently:
>
> - Braces:
> ..but the preferred way, as shown to us by the prophets Kernighan
> and Ritchie, is to put the opening brace last on the line
>
> - Spaces after keywords:
> Use a space after (most) keywords
>
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
I just dropped the 'support /' from the title, because both really are
pretty much about the toolchain "infra".
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> support/scripts/check-kernel-headers.sh | 3 +--
> toolchain/toolchain-wrapper.c | 2 +-
> 2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/support/scripts/check-kernel-headers.sh b/support/scripts/check-kernel-headers.sh
> index d1864cb05e..841df98b64 100755
> --- a/support/scripts/check-kernel-headers.sh
> +++ b/support/scripts/check-kernel-headers.sh
> @@ -53,8 +53,7 @@ int main(int argc __attribute__((unused)),
> int l = LINUX_VERSION_CODE & ~0xFF;
> int h = KERNEL_VERSION(${HDR_M},${HDR_m},0);
>
> - if(l != h)
> - {
> + if (l != h) {
> printf("Incorrect selection of kernel headers: ");
> printf("expected %d.%d.x, got %d.%d.x\n", ${HDR_M}, ${HDR_m},
> ((LINUX_VERSION_CODE>>16) & 0xFF),
> diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c
> index b7705a4cbf..8cfc963ccd 100644
> --- a/toolchain/toolchain-wrapper.c
> +++ b/toolchain/toolchain-wrapper.c
> @@ -434,7 +434,7 @@ int main(int argc, char **argv)
> /* Both args below can be set at compile/link time
> * and are ignored correctly when not used
> */
> - if(i == argc)
> + if (i == argc)
> *cur++ = "-fPIE";
>
> if (!found_shared)
> --
> 2.20.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-02-08 21:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-08 19:44 [Buildroot] [PATCH] support / toolchain: use consistent code style for C code Peter Korsgaard
2020-02-08 21:12 ` Yann E. MORIN
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).