[PATCH net-next] tools: ynl-gen: use uapi header name for the header guard

[PATCH net-next] tools: ynl-gen: use uapi header name for the header guard

[Jakub Kicinski]

Chuck points out that we should use the uapi-header property
when generating the guard. Otherwise we may generate the same
guard as another file in the tree.

Tested-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
 tools/net/ynl/ynl-gen-c.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/net/ynl/ynl-gen-c.py b/tools/net/ynl/ynl-gen-c.py
index 897af958cee8..168fe612b029 100755
--- a/tools/net/ynl/ynl-gen-c.py
+++ b/tools/net/ynl/ynl-gen-c.py
@@ -805,6 +805,10 @@ from lib import SpecFamily, SpecAttrSet, SpecAttr, SpecOperation, SpecEnumSet, S
             self.uapi_header = self.yaml['uapi-header']
         else:
             self.uapi_header = f"linux/{self.name}.h"
+        if self.uapi_header.startswith("linux/") and self.uapi_header.endswith('.h'):
+            self.uapi_header_name = self.uapi_header[6:-2]
+        else:
+            self.uapi_header_name = self.name
 
     def resolve(self):
         self.resolve_up(super())
@@ -2124,7 +2128,7 @@ _C_KW = {
 
 
 def render_uapi(family, cw):
-    hdr_prot = f"_UAPI_LINUX_{family.name.upper()}_H"
+    hdr_prot = f"_UAPI_LINUX_{c_upper(family.uapi_header_name)}_H"
     cw.p('#ifndef ' + hdr_prot)
     cw.p('#define ' + hdr_prot)
     cw.nl()
-- 
2.41.0

Re: [PATCH net-next] tools: ynl-gen: use uapi header name for the header guard

[Przemek Kitszel]

On 10/4/23 00:57, Jakub Kicinski wrote:
> Chuck points out that we should use the uapi-header property
> when generating the guard. Otherwise we may generate the same
> guard as another file in the tree.
> 
> Tested-by: Chuck Lever <chuck.lever@oracle.com>
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> ---
>   tools/net/ynl/ynl-gen-c.py | 6 +++++-
>   1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/net/ynl/ynl-gen-c.py b/tools/net/ynl/ynl-gen-c.py
> index 897af958cee8..168fe612b029 100755
> --- a/tools/net/ynl/ynl-gen-c.py
> +++ b/tools/net/ynl/ynl-gen-c.py
> @@ -805,6 +805,10 @@ from lib import SpecFamily, SpecAttrSet, SpecAttr, SpecOperation, SpecEnumSet, S
>               self.uapi_header = self.yaml['uapi-header']
>           else:
>               self.uapi_header = f"linux/{self.name}.h"
> +        if self.uapi_header.startswith("linux/") and self.uapi_header.endswith('.h'):
> +            self.uapi_header_name = self.uapi_header[6:-2]
> +        else:
> +            self.uapi_header_name = self.name
>   
>       def resolve(self):
>           self.resolve_up(super())
> @@ -2124,7 +2128,7 @@ _C_KW = {
>   
>   
>   def render_uapi(family, cw):
> -    hdr_prot = f"_UAPI_LINUX_{family.name.upper()}_H"
> +    hdr_prot = f"_UAPI_LINUX_{c_upper(family.uapi_header_name)}_H"
>       cw.p('#ifndef ' + hdr_prot)
>       cw.p('#define ' + hdr_prot)
>       cw.nl()

Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>

Re: [PATCH net-next] tools: ynl-gen: use uapi header name for the header guard

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net-next.git (main)
by David S. Miller <davem@davemloft.net>:

On Tue,  3 Oct 2023 15:57:35 -0700 you wrote:
> Chuck points out that we should use the uapi-header property
> when generating the guard. Otherwise we may generate the same
> guard as another file in the tree.
> 
> Tested-by: Chuck Lever <chuck.lever@oracle.com>
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> 
> [...]

Here is the summary with links:
  - [net-next] tools: ynl-gen: use uapi header name for the header guard
    https://git.kernel.org/netdev/net-next/c/71ce60d375f5

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html