pkg/declextract: rename generated names for consistency

Currently we append "$auto", or "$auto_record", or prepend "auto_",
or insert "auto" somewhere in the middle.
Use more consistent naming: always append "$auto".

3 files changed, 51 insertions, 51 deletions

diff --git a/tools/syz-declextract/testdata/netlink.c.json b/tools/syz-declextract/testdata/netlink.c.json
index e4e485182..99b18aae8 100644
--- a/tools/syz-declextract/testdata/netlink.c.json
+++ b/tools/syz-declextract/testdata/netlink.c.json
@@ -104,7 +104,7 @@
 					"name": "NETLINK_BAR_CMD_FOO",
 					"func": "NETLINK_BAR_CMD_FOO",
 					"access": "user",
-					"policy": "foo_genl_policy$auto_netlink"
+					"policy": "foo_genl_policy_netlink"
 				}
 			],
 			"source_file": "netlink.c"
@@ -120,13 +120,13 @@
 					"name": "NETLINK_FOO_CMD_FOO",
 					"func": "foo_cmd",
 					"access": "admin",
-					"policy": "foo_genl_policy$auto_netlink"
+					"policy": "foo_genl_policy_netlink"
 				},
 				{
 					"name": "NETLINK_FOO_CMD_BAR",
 					"func": "bar_cmd",
 					"access": "ns_admin",
-					"policy": "foo_genl_policy$auto_netlink"
+					"policy": "foo_genl_policy_netlink"
 				}
 			],
 			"source_file": "netlink.c"
@@ -134,7 +134,7 @@
 	],
 	"netlink_policies": [
 		{
-			"name": "foo_genl_nested_policy$auto_netlink",
+			"name": "foo_genl_nested_policy_netlink",
 			"attrs": [
 				{
 					"name": "NETLINK_FOO_NESTED_ATTR1",
@@ -147,7 +147,7 @@
 			]
 		},
 		{
-			"name": "foo_genl_policy$auto_netlink",
+			"name": "foo_genl_policy_netlink",
 			"attrs": [
 				{
 					"name": "NETLINK_FOO_ATTR1",
@@ -165,7 +165,7 @@
 				{
 					"name": "NETLINK_FOO_ATTR4",
 					"kind": "NLA_NESTED",
-					"nested_policy": "foo_genl_nested_policy$auto_netlink"
+					"nested_policy": "foo_genl_nested_policy_netlink"
 				},
 				{
 					"name": "NETLINK_FOO_ATTR5",
@@ -191,7 +191,7 @@
 			]
 		},
 		{
-			"name": "genl_policy_reject_all$auto_netlink"
+			"name": "genl_policy_reject_all_netlink"
 		}
 	]
 }
\ No newline at end of file
diff --git a/tools/syz-declextract/testdata/netlink.c.txt b/tools/syz-declextract/testdata/netlink.c.txt
index 4b67a444d..87b3ae122 100644
--- a/tools/syz-declextract/testdata/netlink.c.txt
+++ b/tools/syz-declextract/testdata/netlink.c.txt
@@ -9,38 +9,38 @@ include <linux/types.h>
 include <net/netlink.h>
 include <include/uapi/netlink_family.h>
 
-resource genl_BAR_family_id_auto[int16]
-resource genl_foo_family_family_id_auto[int16]
-type msghdr_BAR_auto[CMD, POLICY] msghdr_netlink[netlink_msg_t[genl_BAR_family_id_auto, genlmsghdr_t[CMD], POLICY]]
-type msghdr_foo_family_auto[CMD, POLICY] msghdr_netlink[netlink_msg_t[genl_foo_family_family_id_auto, genlmsghdr_t[CMD], POLICY]]
-syz_genetlink_get_family_id$auto_BAR(name ptr[in, string["BAR"]], fd sock_nl_generic) genl_BAR_family_id_auto
-syz_genetlink_get_family_id$auto_foo_family(name ptr[in, string["foo family"]], fd sock_nl_generic) genl_foo_family_family_id_auto
-sendmsg$auto_NETLINK_BAR_CMD_FOO(fd sock_nl_generic, msg ptr[in, msghdr_BAR_auto[NETLINK_BAR_CMD_FOO, foo_genl_policy$auto_netlink]], f flags[send_flags])
-sendmsg$auto_NETLINK_FOO_CMD_BAR(fd sock_nl_generic, msg ptr[in, msghdr_foo_family_auto[NETLINK_FOO_CMD_BAR, foo_genl_policy$auto_netlink]], f flags[send_flags])
-sendmsg$auto_NETLINK_FOO_CMD_FOO(fd sock_nl_generic, msg ptr[in, msghdr_foo_family_auto[NETLINK_FOO_CMD_FOO, foo_genl_policy$auto_netlink]], f flags[send_flags])
-
-foo_genl_nested_policy$auto_netlink [
+resource genl_bar_family_id$auto[int16]
+resource genl_foo_family_family_id$auto[int16]
+type msghdr_bar$auto[CMD, POLICY] msghdr_netlink[netlink_msg_t[genl_bar_family_id$auto, genlmsghdr_t[CMD], POLICY]]
+type msghdr_foo_family$auto[CMD, POLICY] msghdr_netlink[netlink_msg_t[genl_foo_family_family_id$auto, genlmsghdr_t[CMD], POLICY]]
+syz_genetlink_get_family_id$auto_bar(name ptr[in, string["BAR"]], fd sock_nl_generic) genl_bar_family_id$auto
+syz_genetlink_get_family_id$auto_foo_family(name ptr[in, string["foo family"]], fd sock_nl_generic) genl_foo_family_family_id$auto
+sendmsg$auto_NETLINK_BAR_CMD_FOO(fd sock_nl_generic, msg ptr[in, msghdr_bar$auto[NETLINK_BAR_CMD_FOO, foo_genl_policy_netlink$auto]], f flags[send_flags])
+sendmsg$auto_NETLINK_FOO_CMD_BAR(fd sock_nl_generic, msg ptr[in, msghdr_foo_family$auto[NETLINK_FOO_CMD_BAR, foo_genl_policy_netlink$auto]], f flags[send_flags])
+sendmsg$auto_NETLINK_FOO_CMD_FOO(fd sock_nl_generic, msg ptr[in, msghdr_foo_family$auto[NETLINK_FOO_CMD_FOO, foo_genl_policy_netlink$auto]], f flags[send_flags])
+
+foo_genl_nested_policy_netlink$auto [
 	NETLINK_FOO_NESTED_ATTR1	nlattr[NETLINK_FOO_NESTED_ATTR1, int32]
 	NETLINK_FOO_NESTED_ATTR2	nlattr[NETLINK_FOO_NESTED_ATTR2, int32]
 ] [varlen]
 
-foo_genl_policy$auto_netlink [
+foo_genl_policy_netlink$auto [
 	NETLINK_FOO_ATTR1	nlattr[NETLINK_FOO_ATTR1, int32]
 	NETLINK_FOO_ATTR2	nlattr[NETLINK_FOO_ATTR2, stringnoz]
 	NETLINK_FOO_ATTR3	nlnest[NETLINK_FOO_ATTR3, array[nl_generic_attr]]
-	NETLINK_FOO_ATTR4	nlnest[NETLINK_FOO_ATTR4, array[foo_genl_nested_policy$auto_netlink]]
-	NETLINK_FOO_ATTR5	nlattr[NETLINK_FOO_ATTR5, netlink_foo_struct1$auto_record]
-	NETLINK_FOO_ATTR6	nlattr[NETLINK_FOO_ATTR6, array[netlink_foo_struct2$auto_record, 0:10]]
-	NETLINK_FOO_ATTR7	nlattr[NETLINK_FOO_ATTR7, netlink_foo_struct2$auto_record]
+	NETLINK_FOO_ATTR4	nlnest[NETLINK_FOO_ATTR4, array[foo_genl_nested_policy_netlink$auto]]
+	NETLINK_FOO_ATTR5	nlattr[NETLINK_FOO_ATTR5, netlink_foo_struct1$auto]
+	NETLINK_FOO_ATTR6	nlattr[NETLINK_FOO_ATTR6, array[netlink_foo_struct2$auto, 0:10]]
+	NETLINK_FOO_ATTR7	nlattr[NETLINK_FOO_ATTR7, netlink_foo_struct2$auto]
 ] [varlen]
 
-netlink_foo_struct1$auto_record {
+netlink_foo_struct1$auto {
 	a	int32
 	b	int32
 	c	int32
 }
 
-netlink_foo_struct2$auto_record {
+netlink_foo_struct2$auto {
 	a	int64
 	b	int64
 	c	int64
diff --git a/tools/syz-declextract/testdata/types.c.txt b/tools/syz-declextract/testdata/types.c.txt
index d7586effc..88da34315 100644
--- a/tools/syz-declextract/testdata/types.c.txt
+++ b/tools/syz-declextract/testdata/types.c.txt
@@ -8,78 +8,78 @@ include <vdso/bits.h>
 include <linux/types.h>
 include <net/netlink.h>
 
-auto_bitfield_enum = a, b, c
+bitfield_enum$auto = a, b, c
 
-types_syscall$auto(p ptr[inout, anon_struct$auto_record], y ptr[inout, void], b ptr[inout, bitfields$auto_record], pid pid, f int32, v ptr[inout, various$auto_record])
+types_syscall$auto(p ptr[inout, anon_struct$auto], y ptr[inout, void], b ptr[inout, bitfields$auto], pid pid, f int32, v ptr[inout, various$auto])
 
-anon_struct$auto_record {
-	a		anon_struct_a$auto_record
+anon_struct$auto {
+	a		anon_struct_a$auto
 	b		void
-	anon_struct_2	anon_struct_2$auto_record
-	anon_struct_3	anon_struct_3$auto_record
-	foo		anon_t$auto_record
+	anon_struct_2	anon_struct_2$auto
+	anon_struct_3	anon_struct_3$auto
+	foo		anon_t$auto
 	forward		ptr[inout, auto_todo]
-	array		array[anon_struct_array$auto_record, 4]
-	ptr		ptr[inout, anon_struct_ptr$auto_record]
-	ptr_array	array[ptr[inout, anon_struct_ptr_array$auto_record], 4]
+	array		array[anon_struct_array$auto, 4]
+	ptr		ptr[inout, anon_struct_ptr$auto]
+	ptr_array	array[ptr[inout, anon_struct_ptr_array$auto], 4]
 }
 
-anon_struct_2$auto_record {
+anon_struct_2$auto {
 	y	int32
 }
 
-anon_struct_3$auto_record [
+anon_struct_3$auto [
 	q	int32
 	w	intptr
 ]
 
-anon_struct_a$auto_record {
+anon_struct_a$auto {
 	x	int32
 }
 
-anon_struct_array$auto_record {
+anon_struct_array$auto {
 	a	int32
 	b	int32
 }
 
-anon_struct_ptr$auto_record {
+anon_struct_ptr$auto {
 	a	int32
 	b	int32
 }
 
-anon_struct_ptr_array$auto_record {
+anon_struct_ptr_array$auto {
 	a	int32
 	b	int32
 }
 
-anon_t$auto_record {
+anon_t$auto {
 	f	int32
 }
 
-bitfields$auto_record {
+bitfields$auto {
 	a		int32:1
 	bitfields_1	const[0, int32:2]
 	b		int32:3
 	d		intptr:2
 	pad		const[0, intptr:3]
-	e		flags[auto_bitfield_enum, int32:10]
+	e		flags[bitfield_enum$auto, int32:10]
 	l		len[p, int32:10]
 	p		ptr[inout, int32]
 } [align[32]]
 
-packed_t$auto_record {
+packed_t$auto {
 	x	int8
 	y	int32
 } [packed, align[32]]
 
-recursive$auto_record {
-	various	various$auto_record
+recursive$auto {
+	various	various$auto
 }
 
-various$auto_record {
-	recursive	ptr[inout, various$auto_record, opt]
-	next		ptr[inout, recursive$auto_record, opt]
-	packed		packed_t$auto_record
+various$auto {
+	recursive	ptr[inout, various$auto, opt]
+	next		ptr[inout, recursive$auto, opt]
+	packed		packed_t$auto
 }
 
 define a	0