From 4c4214a769acb67a591de56ba189c808b47e4075 Mon Sep 17 00:00:00 2001 From: David Wei Date: Wed, 23 Apr 2025 08:18:39 -0700 Subject: [PATCH 1/2] ynl-gen-cpp: fix getting addressof optionals Signed-off-by: David Wei --- ynl-gen-cpp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ynl-gen-cpp.py b/ynl-gen-cpp.py index c3d8a86..52d7586 100755 --- a/ynl-gen-cpp.py +++ b/ynl-gen-cpp.py @@ -516,7 +516,7 @@ def _attr_policy(self, policy): return f"NLA_POLICY_BITFIELD32({mask})" def attr_put(self, ri, var): - line = f"ynl_attr_put(nlh, {self.enum_name}, &{var}->{self.c_name}, sizeof(struct nla_bitfield32))" + line = f"ynl_attr_put(nlh, {self.enum_name}, &(*{var}.{self.c_name}), sizeof(struct nla_bitfield32))" self._attr_put_line(ri, var, line) def _attr_get(self, ri, var): From be72dd8a00c40614f872449eaabac0025f0acf79 Mon Sep 17 00:00:00 2001 From: David Wei Date: Wed, 23 Apr 2025 08:23:57 -0700 Subject: [PATCH 2/2] ynl-gen-cpp: fix getting strings Signed-off-by: David Wei --- ynl-gen-cpp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ynl-gen-cpp.py b/ynl-gen-cpp.py index 52d7586..619b663 100755 --- a/ynl-gen-cpp.py +++ b/ynl-gen-cpp.py @@ -432,7 +432,7 @@ def attr_put(self, ri, var): def _attr_get(self, ri, var): return ( [ - f"{var}->{self.c_name}.assign(ynl_attr_get_str(attr), ynl_attr_data_len(attr));", + f"{var}->{self.c_name}.assign(ynl_attr_get_str(attr));", ], None, None,