diff --git a/home/nipa/nipa_out/999087/ynl/old-code/nl80211-user.c b/home/nipa/nipa_out/999087/ynl/new-code/nl80211-user.c index 4831af26a13a..897b2323e725 100644 --- a/home/nipa/nipa_out/999087/ynl/old-code/nl80211-user.c +++ b/home/nipa/nipa_out/999087/ynl/new-code/nl80211-user.c @@ -1607,8 +1607,6 @@ int nl80211_if_combination_attributes_parse(struct ynl_parse_arg *yarg, attr_limits = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) - return YNL_PARSE_CB_ERROR; n_limits++; } } else if (type == NL80211_IFACE_COMB_MAXNUM) { @@ -1692,8 +1690,6 @@ int nl80211_sar_attributes_parse(struct ynl_parse_arg *yarg, attr_specs = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) - return YNL_PARSE_CB_ERROR; n_specs++; } } @@ -1899,8 +1895,6 @@ int nl80211_frequency_attrs_parse(struct ynl_parse_arg *yarg, attr_wmm = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) - return YNL_PARSE_CB_ERROR; n_wmm++; } } else if (type == NL80211_FREQUENCY_ATTR_NO_HE) { @@ -2111,8 +2105,6 @@ int nl80211_band_attrs_parse(struct ynl_parse_arg *yarg, attr_freqs = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) - return YNL_PARSE_CB_ERROR; n_freqs++; } } else if (type == NL80211_BAND_ATTR_RATES) { @@ -2120,8 +2112,6 @@ int nl80211_band_attrs_parse(struct ynl_parse_arg *yarg, attr_rates = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) - return YNL_PARSE_CB_ERROR; n_rates++; } } else if (type == NL80211_BAND_ATTR_HT_MCS_SET) { @@ -2169,8 +2159,6 @@ int nl80211_band_attrs_parse(struct ynl_parse_arg *yarg, attr_iftype_data = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) - return YNL_PARSE_CB_ERROR; n_iftype_data++; } } else if (type == NL80211_BAND_ATTR_EDMG_CHANNELS) { @@ -2467,8 +2455,6 @@ int nl80211_get_wiphy_rsp_parse(const struct nlmsghdr *nlh, attr_interface_combinations = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) - return YNL_PARSE_CB_ERROR; n_interface_combinations++; } } else if (type == NL80211_ATTR_MAC) { @@ -2897,8 +2883,6 @@ int nl80211_get_wiphy_rsp_dump_parse(const struct nlmsghdr *nlh, attr_interface_combinations = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) - return YNL_PARSE_CB_ERROR; n_interface_combinations++; } } else if (type == NL80211_ATTR_MAC) { diff --git a/home/nipa/nipa_out/999087/ynl/old-code/nlctrl-user.c b/home/nipa/nipa_out/999087/ynl/new-code/nlctrl-user.c index b23c30699ca9..c7f503b6b56f 100644 --- a/home/nipa/nipa_out/999087/ynl/old-code/nlctrl-user.c +++ b/home/nipa/nipa_out/999087/ynl/new-code/nlctrl-user.c @@ -386,8 +386,6 @@ int nlctrl_getfamily_rsp_parse(const struct nlmsghdr *nlh, attr_mcast_groups = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) - return YNL_PARSE_CB_ERROR; n_mcast_groups++; } } else if (type == CTRL_ATTR_OPS) { @@ -395,8 +393,6 @@ int nlctrl_getfamily_rsp_parse(const struct nlmsghdr *nlh, attr_ops = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) - return YNL_PARSE_CB_ERROR; n_ops++; } } else if (type == CTRL_ATTR_VERSION) { diff --git a/home/nipa/nipa_out/999087/ynl/old-code/rt-link-user.c b/home/nipa/nipa_out/999087/ynl/new-code/rt-link-user.c index 2e3f9c698e9b..a4691bcb083b 100644 --- a/home/nipa/nipa_out/999087/ynl/old-code/rt-link-user.c +++ b/home/nipa/nipa_out/999087/ynl/new-code/rt-link-user.c @@ -4085,8 +4085,6 @@ int rt_link_link_offload_xstats_parse(struct ynl_parse_arg *yarg, attr_hw_s_info = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) - return YNL_PARSE_CB_ERROR; n_hw_s_info++; } } else if (type == IFLA_OFFLOAD_XSTATS_L3_STATS) { @@ -4405,7 +4403,6 @@ int rt_link_linkinfo_bond_attrs_put(struct nlmsghdr *nlh, unsigned int attr_type, struct rt_link_linkinfo_bond_attrs *obj) { - struct nlattr *array; struct nlattr *nest; unsigned int i; @@ -4424,11 +4421,15 @@ int rt_link_linkinfo_bond_attrs_put(struct nlmsghdr *nlh, ynl_attr_put_u8(nlh, IFLA_BOND_USE_CARRIER, obj->use_carrier); if (obj->_present.arp_interval) ynl_attr_put_u32(nlh, IFLA_BOND_ARP_INTERVAL, obj->arp_interval); - array = ynl_attr_nest_start(nlh, IFLA_BOND_ARP_IP_TARGET); - for (i = 0; i < obj->_count.arp_ip_target; i++) { - ynl_attr_put_u32(nlh, i, obj->arp_ip_target[i]); + { + struct nlattr *array; + + array = ynl_attr_nest_start(nlh, IFLA_BOND_ARP_IP_TARGET); + for (i = 0; i < obj->_count.arp_ip_target; i++) { + ynl_attr_put_u32(nlh, i, obj->arp_ip_target[i]); + } + ynl_attr_nest_end(nlh, array); } - ynl_attr_nest_end(nlh, array); if (obj->_present.arp_validate) ynl_attr_put_u32(nlh, IFLA_BOND_ARP_VALIDATE, obj->arp_validate); if (obj->_present.arp_all_targets) @@ -4473,10 +4474,14 @@ int rt_link_linkinfo_bond_attrs_put(struct nlmsghdr *nlh, ynl_attr_put_u8(nlh, IFLA_BOND_AD_LACP_ACTIVE, obj->ad_lacp_active); if (obj->_present.missed_max) ynl_attr_put_u8(nlh, IFLA_BOND_MISSED_MAX, obj->missed_max); - array = ynl_attr_nest_start(nlh, IFLA_BOND_NS_IP6_TARGET); - for (i = 0; i < obj->_count.ns_ip6_target; i++) - ynl_attr_put(nlh, i, obj->ns_ip6_target[i], 16); - ynl_attr_nest_end(nlh, array); + { + struct nlattr *array; + + array = ynl_attr_nest_start(nlh, IFLA_BOND_NS_IP6_TARGET); + for (i = 0; i < obj->_count.ns_ip6_target; i++) + ynl_attr_put(nlh, i, obj->ns_ip6_target[i], 16); + ynl_attr_nest_end(nlh, array); + } if (obj->_present.coupled_control) ynl_attr_put_u8(nlh, IFLA_BOND_COUPLED_CONTROL, obj->coupled_control); ynl_attr_nest_end(nlh, nest); diff --git a/home/nipa/nipa_out/999087/ynl/old-code/tc-user.c b/home/nipa/nipa_out/999087/ynl/new-code/tc-user.c index 2989196c8bb2..11ccb8632321 100644 --- a/home/nipa/nipa_out/999087/ynl/old-code/tc-user.c +++ b/home/nipa/nipa_out/999087/ynl/new-code/tc-user.c @@ -6331,7 +6331,6 @@ void tc_cake_stats_attrs_free(struct tc_cake_stats_attrs *obj) int tc_cake_stats_attrs_put(struct nlmsghdr *nlh, unsigned int attr_type, struct tc_cake_stats_attrs *obj) { - struct nlattr *array; struct nlattr *nest; unsigned int i; @@ -6352,10 +6351,14 @@ int tc_cake_stats_attrs_put(struct nlmsghdr *nlh, unsigned int attr_type, ynl_attr_put_u32(nlh, TCA_CAKE_STATS_MIN_ADJLEN, obj->min_adjlen); if (obj->_present.max_adjlen) ynl_attr_put_u32(nlh, TCA_CAKE_STATS_MAX_ADJLEN, obj->max_adjlen); - array = ynl_attr_nest_start(nlh, TCA_CAKE_STATS_TIN_STATS); - for (i = 0; i < obj->_count.tin_stats; i++) - tc_cake_tin_stats_attrs_put(nlh, i, &obj->tin_stats[i]); - ynl_attr_nest_end(nlh, array); + { + struct nlattr *array; + + array = ynl_attr_nest_start(nlh, TCA_CAKE_STATS_TIN_STATS); + for (i = 0; i < obj->_count.tin_stats; i++) + tc_cake_tin_stats_attrs_put(nlh, i, &obj->tin_stats[i]); + ynl_attr_nest_end(nlh, array); + } if (obj->_present.deficit) ynl_attr_put_s32(nlh, TCA_CAKE_STATS_DEFICIT, obj->deficit); if (obj->_present.cobalt_count) @@ -6436,8 +6439,6 @@ int tc_cake_stats_attrs_parse(struct ynl_parse_arg *yarg, attr_tin_stats = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) - return YNL_PARSE_CB_ERROR; n_tin_stats++; } } else if (type == TCA_CAKE_STATS_DEFICIT) { @@ -7572,7 +7573,6 @@ void tc_basic_attrs_free(struct tc_basic_attrs *obj) int tc_basic_attrs_put(struct nlmsghdr *nlh, unsigned int attr_type, struct tc_basic_attrs *obj) { - struct nlattr *array; struct nlattr *nest; unsigned int i; @@ -7581,10 +7581,14 @@ int tc_basic_attrs_put(struct nlmsghdr *nlh, unsigned int attr_type, ynl_attr_put_u32(nlh, TCA_BASIC_CLASSID, obj->classid); if (obj->_present.ematches) tc_ematch_attrs_put(nlh, TCA_BASIC_EMATCHES, &obj->ematches); - array = ynl_attr_nest_start(nlh, TCA_BASIC_ACT); - for (i = 0; i < obj->_count.act; i++) - tc_act_attrs_put(nlh, i, &obj->act[i]); - ynl_attr_nest_end(nlh, array); + { + struct nlattr *array; + + array = ynl_attr_nest_start(nlh, TCA_BASIC_ACT); + for (i = 0; i < obj->_count.act; i++) + tc_act_attrs_put(nlh, i, &obj->act[i]); + ynl_attr_nest_end(nlh, array); + } if (obj->_present.police) tc_police_attrs_put(nlh, TCA_BASIC_POLICE, &obj->police); if (obj->_len.pcnt) @@ -7631,8 +7635,6 @@ int tc_basic_attrs_parse(struct ynl_parse_arg *yarg, attr_act = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) - return YNL_PARSE_CB_ERROR; n_act++; } } else if (type == TCA_BASIC_POLICE) { @@ -7688,15 +7690,18 @@ void tc_bpf_attrs_free(struct tc_bpf_attrs *obj) int tc_bpf_attrs_put(struct nlmsghdr *nlh, unsigned int attr_type, struct tc_bpf_attrs *obj) { - struct nlattr *array; struct nlattr *nest; unsigned int i; nest = ynl_attr_nest_start(nlh, attr_type); - array = ynl_attr_nest_start(nlh, TCA_BPF_ACT); - for (i = 0; i < obj->_count.act; i++) - tc_act_attrs_put(nlh, i, &obj->act[i]); - ynl_attr_nest_end(nlh, array); + { + struct nlattr *array; + + array = ynl_attr_nest_start(nlh, TCA_BPF_ACT); + for (i = 0; i < obj->_count.act; i++) + tc_act_attrs_put(nlh, i, &obj->act[i]); + ynl_attr_nest_end(nlh, array); + } if (obj->_present.police) tc_police_attrs_put(nlh, TCA_BPF_POLICE, &obj->police); if (obj->_present.classid) @@ -7744,8 +7749,6 @@ int tc_bpf_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) attr_act = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) - return YNL_PARSE_CB_ERROR; n_act++; } } else if (type == TCA_BPF_POLICE) { @@ -7847,15 +7850,18 @@ void tc_cgroup_attrs_free(struct tc_cgroup_attrs *obj) int tc_cgroup_attrs_put(struct nlmsghdr *nlh, unsigned int attr_type, struct tc_cgroup_attrs *obj) { - struct nlattr *array; struct nlattr *nest; unsigned int i; nest = ynl_attr_nest_start(nlh, attr_type); - array = ynl_attr_nest_start(nlh, TCA_CGROUP_ACT); - for (i = 0; i < obj->_count.act; i++) - tc_act_attrs_put(nlh, i, &obj->act[i]); - ynl_attr_nest_end(nlh, array); + { + struct nlattr *array; + + array = ynl_attr_nest_start(nlh, TCA_CGROUP_ACT); + for (i = 0; i < obj->_count.act; i++) + tc_act_attrs_put(nlh, i, &obj->act[i]); + ynl_attr_nest_end(nlh, array); + } if (obj->_present.police) tc_police_attrs_put(nlh, TCA_CGROUP_POLICE, &obj->police); if (obj->_len.ematches) @@ -7888,8 +7894,6 @@ int tc_cgroup_attrs_parse(struct ynl_parse_arg *yarg, attr_act = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) - return YNL_PARSE_CB_ERROR; n_act++; } } else if (type == TCA_CGROUP_POLICE) { @@ -7961,7 +7965,6 @@ void tc_flower_attrs_free(struct tc_flower_attrs *obj) int tc_flower_attrs_put(struct nlmsghdr *nlh, unsigned int attr_type, struct tc_flower_attrs *obj) { - struct nlattr *array; struct nlattr *nest; unsigned int i; @@ -7970,10 +7973,14 @@ int tc_flower_attrs_put(struct nlmsghdr *nlh, unsigned int attr_type, ynl_attr_put_u32(nlh, TCA_FLOWER_CLASSID, obj->classid); if (obj->_len.indev) ynl_attr_put_str(nlh, TCA_FLOWER_INDEV, obj->indev); - array = ynl_attr_nest_start(nlh, TCA_FLOWER_ACT); - for (i = 0; i < obj->_count.act; i++) - tc_act_attrs_put(nlh, i, &obj->act[i]); - ynl_attr_nest_end(nlh, array); + { + struct nlattr *array; + + array = ynl_attr_nest_start(nlh, TCA_FLOWER_ACT); + for (i = 0; i < obj->_count.act; i++) + tc_act_attrs_put(nlh, i, &obj->act[i]); + ynl_attr_nest_end(nlh, array); + } if (obj->_len.key_eth_dst) ynl_attr_put(nlh, TCA_FLOWER_KEY_ETH_DST, obj->key_eth_dst, obj->_len.key_eth_dst); if (obj->_len.key_eth_dst_mask) @@ -8234,8 +8241,6 @@ int tc_flower_attrs_parse(struct ynl_parse_arg *yarg, attr_act = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) - return YNL_PARSE_CB_ERROR; n_act++; } } else if (type == TCA_FLOWER_KEY_ETH_DST) { @@ -8913,7 +8918,6 @@ void tc_fw_attrs_free(struct tc_fw_attrs *obj) int tc_fw_attrs_put(struct nlmsghdr *nlh, unsigned int attr_type, struct tc_fw_attrs *obj) { - struct nlattr *array; struct nlattr *nest; unsigned int i; @@ -8924,10 +8928,14 @@ int tc_fw_attrs_put(struct nlmsghdr *nlh, unsigned int attr_type, tc_police_attrs_put(nlh, TCA_FW_POLICE, &obj->police); if (obj->_len.indev) ynl_attr_put_str(nlh, TCA_FW_INDEV, obj->indev); - array = ynl_attr_nest_start(nlh, TCA_FW_ACT); - for (i = 0; i < obj->_count.act; i++) - tc_act_attrs_put(nlh, i, &obj->act[i]); - ynl_attr_nest_end(nlh, array); + { + struct nlattr *array; + + array = ynl_attr_nest_start(nlh, TCA_FW_ACT); + for (i = 0; i < obj->_count.act; i++) + tc_act_attrs_put(nlh, i, &obj->act[i]); + ynl_attr_nest_end(nlh, array); + } if (obj->_present.mask) ynl_attr_put_u32(nlh, TCA_FW_MASK, obj->mask); ynl_attr_nest_end(nlh, nest); @@ -8982,8 +8990,6 @@ int tc_fw_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) attr_act = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) - return YNL_PARSE_CB_ERROR; n_act++; } } else if (type == TCA_FW_MASK) { @@ -9019,17 +9025,20 @@ void tc_matchall_attrs_free(struct tc_matchall_attrs *obj) int tc_matchall_attrs_put(struct nlmsghdr *nlh, unsigned int attr_type, struct tc_matchall_attrs *obj) { - struct nlattr *array; struct nlattr *nest; unsigned int i; nest = ynl_attr_nest_start(nlh, attr_type); if (obj->_present.classid) ynl_attr_put_u32(nlh, TCA_MATCHALL_CLASSID, obj->classid); - array = ynl_attr_nest_start(nlh, TCA_MATCHALL_ACT); - for (i = 0; i < obj->_count.act; i++) - tc_act_attrs_put(nlh, i, &obj->act[i]); - ynl_attr_nest_end(nlh, array); + { + struct nlattr *array; + + array = ynl_attr_nest_start(nlh, TCA_MATCHALL_ACT); + for (i = 0; i < obj->_count.act; i++) + tc_act_attrs_put(nlh, i, &obj->act[i]); + ynl_attr_nest_end(nlh, array); + } if (obj->_present.flags) ynl_attr_put_u32(nlh, TCA_MATCHALL_FLAGS, obj->flags); if (obj->_len.pcnt) @@ -9067,8 +9076,6 @@ int tc_matchall_attrs_parse(struct ynl_parse_arg *yarg, attr_act = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) - return YNL_PARSE_CB_ERROR; n_act++; } } else if (type == TCA_MATCHALL_FLAGS) { @@ -9117,7 +9124,6 @@ void tc_route_attrs_free(struct tc_route_attrs *obj) int tc_route_attrs_put(struct nlmsghdr *nlh, unsigned int attr_type, struct tc_route_attrs *obj) { - struct nlattr *array; struct nlattr *nest; unsigned int i; @@ -9132,10 +9138,14 @@ int tc_route_attrs_put(struct nlmsghdr *nlh, unsigned int attr_type, ynl_attr_put_u32(nlh, TCA_ROUTE4_IIF, obj->iif); if (obj->_present.police) tc_police_attrs_put(nlh, TCA_ROUTE4_POLICE, &obj->police); - array = ynl_attr_nest_start(nlh, TCA_ROUTE4_ACT); - for (i = 0; i < obj->_count.act; i++) - tc_act_attrs_put(nlh, i, &obj->act[i]); - ynl_attr_nest_end(nlh, array); + { + struct nlattr *array; + + array = ynl_attr_nest_start(nlh, TCA_ROUTE4_ACT); + for (i = 0; i < obj->_count.act; i++) + tc_act_attrs_put(nlh, i, &obj->act[i]); + ynl_attr_nest_end(nlh, array); + } ynl_attr_nest_end(nlh, nest); return 0; @@ -9193,8 +9203,6 @@ int tc_route_attrs_parse(struct ynl_parse_arg *yarg, attr_act = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) - return YNL_PARSE_CB_ERROR; n_act++; } } @@ -9229,7 +9237,6 @@ void tc_u32_attrs_free(struct tc_u32_attrs *obj) int tc_u32_attrs_put(struct nlmsghdr *nlh, unsigned int attr_type, struct tc_u32_attrs *obj) { - struct nlattr *array; struct nlattr *nest; unsigned int i; @@ -9246,10 +9253,14 @@ int tc_u32_attrs_put(struct nlmsghdr *nlh, unsigned int attr_type, ynl_attr_put(nlh, TCA_U32_SEL, obj->sel, obj->_len.sel); if (obj->_present.police) tc_police_attrs_put(nlh, TCA_U32_POLICE, &obj->police); - array = ynl_attr_nest_start(nlh, TCA_U32_ACT); - for (i = 0; i < obj->_count.act; i++) - tc_act_attrs_put(nlh, i, &obj->act[i]); - ynl_attr_nest_end(nlh, array); + { + struct nlattr *array; + + array = ynl_attr_nest_start(nlh, TCA_U32_ACT); + for (i = 0; i < obj->_count.act; i++) + tc_act_attrs_put(nlh, i, &obj->act[i]); + ynl_attr_nest_end(nlh, array); + } if (obj->_len.indev) ynl_attr_put_str(nlh, TCA_U32_INDEV, obj->indev); if (obj->_len.pcnt) @@ -9327,8 +9338,6 @@ int tc_u32_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) attr_act = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) - return YNL_PARSE_CB_ERROR; n_act++; } } else if (type == TCA_U32_INDEV) {