diff --git a/home/nipa/nipa_out/1002112/ynl/old-code/devlink-user.c b/home/nipa/nipa_out/1002112/ynl/new-code/devlink-user.c index 4b18bd218398..3186d5a404bb 100644 --- a/home/nipa/nipa_out/1002112/ynl/old-code/devlink-user.c +++ b/home/nipa/nipa_out/1002112/ynl/new-code/devlink-user.c @@ -982,6 +982,7 @@ int devlink_dl_dpipe_match_value_parse(struct ynl_parse_arg *yarg, unsigned int n_dpipe_match = 0; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; int i; parg.ys = yarg->ys; @@ -995,8 +996,6 @@ int devlink_dl_dpipe_match_value_parse(struct ynl_parse_arg *yarg, if (type == DEVLINK_ATTR_DPIPE_MATCH) { n_dpipe_match++; } else if (type == DEVLINK_ATTR_DPIPE_VALUE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1005,8 +1004,6 @@ int devlink_dl_dpipe_match_value_parse(struct ynl_parse_arg *yarg, dst->dpipe_value = malloc(len); memcpy(dst->dpipe_value, ynl_attr_data(attr), len); } else if (type == DEVLINK_ATTR_DPIPE_VALUE_MASK) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1103,6 +1100,7 @@ int devlink_dl_dpipe_action_value_parse(struct ynl_parse_arg *yarg, unsigned int n_dpipe_action = 0; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; int i; parg.ys = yarg->ys; @@ -1116,8 +1114,6 @@ int devlink_dl_dpipe_action_value_parse(struct ynl_parse_arg *yarg, if (type == DEVLINK_ATTR_DPIPE_ACTION) { n_dpipe_action++; } else if (type == DEVLINK_ATTR_DPIPE_VALUE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1126,8 +1122,6 @@ int devlink_dl_dpipe_action_value_parse(struct ynl_parse_arg *yarg, dst->dpipe_value = malloc(len); memcpy(dst->dpipe_value, ynl_attr_data(attr), len); } else if (type == DEVLINK_ATTR_DPIPE_VALUE_MASK) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1171,13 +1165,12 @@ int devlink_dl_dpipe_field_parse(struct ynl_parse_arg *yarg, { struct devlink_dl_dpipe_field *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_DPIPE_FIELD_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1217,13 +1210,12 @@ int devlink_dl_resource_parse(struct ynl_parse_arg *yarg, { struct devlink_dl_resource *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_RESOURCE_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1308,13 +1300,12 @@ int devlink_dl_info_version_parse(struct ynl_parse_arg *yarg, { struct devlink_dl_info_version *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_INFO_VERSION_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1324,8 +1315,6 @@ int devlink_dl_info_version_parse(struct ynl_parse_arg *yarg, memcpy(dst->info_version_name, ynl_attr_get_str(attr), len); dst->info_version_name[len] = 0; } else if (type == DEVLINK_ATTR_INFO_VERSION_VALUE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1350,6 +1339,7 @@ int devlink_dl_fmsg_parse(struct ynl_parse_arg *yarg, { struct devlink_dl_fmsg *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); @@ -1371,8 +1361,6 @@ int devlink_dl_fmsg_parse(struct ynl_parse_arg *yarg, return YNL_PARSE_CB_ERROR; dst->_present.fmsg_nest_end = 1; } else if (type == DEVLINK_ATTR_FMSG_OBJ_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1921,6 +1909,7 @@ int devlink_dl_dpipe_table_parse(struct ynl_parse_arg *yarg, struct devlink_dl_dpipe_table *dst = yarg->data; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; parg.ys = yarg->ys; @@ -1928,8 +1917,6 @@ int devlink_dl_dpipe_table_parse(struct ynl_parse_arg *yarg, unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_DPIPE_TABLE_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2046,6 +2033,7 @@ int devlink_dl_dpipe_header_parse(struct ynl_parse_arg *yarg, struct devlink_dl_dpipe_header *dst = yarg->data; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; parg.ys = yarg->ys; @@ -2053,8 +2041,6 @@ int devlink_dl_dpipe_header_parse(struct ynl_parse_arg *yarg, unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_DPIPE_HEADER_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2349,6 +2335,7 @@ int devlink_get_rsp_parse(const struct nlmsghdr *nlh, struct devlink_get_rsp *dst; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; dst = yarg->data; parg.ys = yarg->ys; @@ -2357,8 +2344,6 @@ int devlink_get_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_BUS_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2368,8 +2353,6 @@ int devlink_get_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->bus_name, ynl_attr_get_str(attr), len); dst->bus_name[len] = 0; } else if (type == DEVLINK_ATTR_DEV_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2495,6 +2478,7 @@ int devlink_port_get_rsp_parse(const struct nlmsghdr *nlh, { struct devlink_port_get_rsp *dst; const struct nlattr *attr; + unsigned int len; dst = yarg->data; @@ -2502,8 +2486,6 @@ int devlink_port_get_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_BUS_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2513,8 +2495,6 @@ int devlink_port_get_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->bus_name, ynl_attr_get_str(attr), len); dst->bus_name[len] = 0; } else if (type == DEVLINK_ATTR_DEV_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2576,6 +2556,7 @@ int devlink_port_get_rsp_dump_parse(const struct nlmsghdr *nlh, { struct devlink_port_get_rsp_dump *dst; const struct nlattr *attr; + unsigned int len; dst = yarg->data; @@ -2583,8 +2564,6 @@ int devlink_port_get_rsp_dump_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_BUS_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2594,8 +2573,6 @@ int devlink_port_get_rsp_dump_parse(const struct nlmsghdr *nlh, memcpy(dst->bus_name, ynl_attr_get_str(attr), len); dst->bus_name[len] = 0; } else if (type == DEVLINK_ATTR_DEV_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2730,6 +2707,7 @@ int devlink_port_new_rsp_parse(const struct nlmsghdr *nlh, { struct devlink_port_new_rsp *dst; const struct nlattr *attr; + unsigned int len; dst = yarg->data; @@ -2737,8 +2715,6 @@ int devlink_port_new_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_BUS_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2748,8 +2724,6 @@ int devlink_port_new_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->bus_name, ynl_attr_get_str(attr), len); dst->bus_name[len] = 0; } else if (type == DEVLINK_ATTR_DEV_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2936,6 +2910,7 @@ int devlink_sb_get_rsp_parse(const struct nlmsghdr *nlh, { struct devlink_sb_get_rsp *dst; const struct nlattr *attr; + unsigned int len; dst = yarg->data; @@ -2943,8 +2918,6 @@ int devlink_sb_get_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_BUS_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2954,8 +2927,6 @@ int devlink_sb_get_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->bus_name, ynl_attr_get_str(attr), len); dst->bus_name[len] = 0; } else if (type == DEVLINK_ATTR_DEV_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3088,6 +3059,7 @@ int devlink_sb_pool_get_rsp_parse(const struct nlmsghdr *nlh, { struct devlink_sb_pool_get_rsp *dst; const struct nlattr *attr; + unsigned int len; dst = yarg->data; @@ -3095,8 +3067,6 @@ int devlink_sb_pool_get_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_BUS_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3106,8 +3076,6 @@ int devlink_sb_pool_get_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->bus_name, ynl_attr_get_str(attr), len); dst->bus_name[len] = 0; } else if (type == DEVLINK_ATTR_DEV_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3291,6 +3259,7 @@ int devlink_sb_port_pool_get_rsp_parse(const struct nlmsghdr *nlh, { struct devlink_sb_port_pool_get_rsp *dst; const struct nlattr *attr; + unsigned int len; dst = yarg->data; @@ -3298,8 +3267,6 @@ int devlink_sb_port_pool_get_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_BUS_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3309,8 +3276,6 @@ int devlink_sb_port_pool_get_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->bus_name, ynl_attr_get_str(attr), len); dst->bus_name[len] = 0; } else if (type == DEVLINK_ATTR_DEV_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3504,6 +3469,7 @@ int devlink_sb_tc_pool_bind_get_rsp_parse(const struct nlmsghdr *nlh, { struct devlink_sb_tc_pool_bind_get_rsp *dst; const struct nlattr *attr; + unsigned int len; dst = yarg->data; @@ -3511,8 +3477,6 @@ int devlink_sb_tc_pool_bind_get_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_BUS_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3522,8 +3486,6 @@ int devlink_sb_tc_pool_bind_get_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->bus_name, ynl_attr_get_str(attr), len); dst->bus_name[len] = 0; } else if (type == DEVLINK_ATTR_DEV_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3795,6 +3757,7 @@ int devlink_eswitch_get_rsp_parse(const struct nlmsghdr *nlh, { struct devlink_eswitch_get_rsp *dst; const struct nlattr *attr; + unsigned int len; dst = yarg->data; @@ -3802,8 +3765,6 @@ int devlink_eswitch_get_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_BUS_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3813,8 +3774,6 @@ int devlink_eswitch_get_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->bus_name, ynl_attr_get_str(attr), len); dst->bus_name[len] = 0; } else if (type == DEVLINK_ATTR_DEV_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3940,6 +3899,7 @@ int devlink_dpipe_table_get_rsp_parse(const struct nlmsghdr *nlh, struct devlink_dpipe_table_get_rsp *dst; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; dst = yarg->data; parg.ys = yarg->ys; @@ -3948,8 +3908,6 @@ int devlink_dpipe_table_get_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_BUS_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3959,8 +3917,6 @@ int devlink_dpipe_table_get_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->bus_name, ynl_attr_get_str(attr), len); dst->bus_name[len] = 0; } else if (type == DEVLINK_ATTR_DEV_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4047,6 +4003,7 @@ int devlink_dpipe_entries_get_rsp_parse(const struct nlmsghdr *nlh, struct devlink_dpipe_entries_get_rsp *dst; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; dst = yarg->data; parg.ys = yarg->ys; @@ -4055,8 +4012,6 @@ int devlink_dpipe_entries_get_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_BUS_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4066,8 +4021,6 @@ int devlink_dpipe_entries_get_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->bus_name, ynl_attr_get_str(attr), len); dst->bus_name[len] = 0; } else if (type == DEVLINK_ATTR_DEV_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4153,6 +4106,7 @@ int devlink_dpipe_headers_get_rsp_parse(const struct nlmsghdr *nlh, struct devlink_dpipe_headers_get_rsp *dst; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; dst = yarg->data; parg.ys = yarg->ys; @@ -4161,8 +4115,6 @@ int devlink_dpipe_headers_get_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_BUS_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4172,8 +4124,6 @@ int devlink_dpipe_headers_get_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->bus_name, ynl_attr_get_str(attr), len); dst->bus_name[len] = 0; } else if (type == DEVLINK_ATTR_DEV_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4329,6 +4279,7 @@ int devlink_resource_dump_rsp_parse(const struct nlmsghdr *nlh, struct devlink_resource_dump_rsp *dst; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; dst = yarg->data; parg.ys = yarg->ys; @@ -4337,8 +4288,6 @@ int devlink_resource_dump_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_BUS_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4348,8 +4297,6 @@ int devlink_resource_dump_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->bus_name, ynl_attr_get_str(attr), len); dst->bus_name[len] = 0; } else if (type == DEVLINK_ATTR_DEV_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4429,6 +4376,7 @@ int devlink_reload_rsp_parse(const struct nlmsghdr *nlh, { struct devlink_reload_rsp *dst; const struct nlattr *attr; + unsigned int len; dst = yarg->data; @@ -4436,8 +4384,6 @@ int devlink_reload_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_BUS_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4447,8 +4393,6 @@ int devlink_reload_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->bus_name, ynl_attr_get_str(attr), len); dst->bus_name[len] = 0; } else if (type == DEVLINK_ATTR_DEV_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4535,6 +4479,7 @@ int devlink_param_get_rsp_parse(const struct nlmsghdr *nlh, { struct devlink_param_get_rsp *dst; const struct nlattr *attr; + unsigned int len; dst = yarg->data; @@ -4542,8 +4487,6 @@ int devlink_param_get_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_BUS_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4553,8 +4496,6 @@ int devlink_param_get_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->bus_name, ynl_attr_get_str(attr), len); dst->bus_name[len] = 0; } else if (type == DEVLINK_ATTR_DEV_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4564,8 +4505,6 @@ int devlink_param_get_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->dev_name, ynl_attr_get_str(attr), len); dst->dev_name[len] = 0; } else if (type == DEVLINK_ATTR_PARAM_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4735,6 +4674,7 @@ int devlink_region_get_rsp_parse(const struct nlmsghdr *nlh, { struct devlink_region_get_rsp *dst; const struct nlattr *attr; + unsigned int len; dst = yarg->data; @@ -4742,8 +4682,6 @@ int devlink_region_get_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_BUS_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4753,8 +4691,6 @@ int devlink_region_get_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->bus_name, ynl_attr_get_str(attr), len); dst->bus_name[len] = 0; } else if (type == DEVLINK_ATTR_DEV_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4769,8 +4705,6 @@ int devlink_region_get_rsp_parse(const struct nlmsghdr *nlh, dst->_present.port_index = 1; dst->port_index = ynl_attr_get_u32(attr); } else if (type == DEVLINK_ATTR_REGION_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4904,6 +4838,7 @@ int devlink_region_new_rsp_parse(const struct nlmsghdr *nlh, { struct devlink_region_new_rsp *dst; const struct nlattr *attr; + unsigned int len; dst = yarg->data; @@ -4911,8 +4846,6 @@ int devlink_region_new_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_BUS_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4922,8 +4855,6 @@ int devlink_region_new_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->bus_name, ynl_attr_get_str(attr), len); dst->bus_name[len] = 0; } else if (type == DEVLINK_ATTR_DEV_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4938,8 +4869,6 @@ int devlink_region_new_rsp_parse(const struct nlmsghdr *nlh, dst->_present.port_index = 1; dst->port_index = ynl_attr_get_u32(attr); } else if (type == DEVLINK_ATTR_REGION_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5044,6 +4973,7 @@ int devlink_region_read_rsp_parse(const struct nlmsghdr *nlh, { struct devlink_region_read_rsp *dst; const struct nlattr *attr; + unsigned int len; dst = yarg->data; @@ -5051,8 +4981,6 @@ int devlink_region_read_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_BUS_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5062,8 +4990,6 @@ int devlink_region_read_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->bus_name, ynl_attr_get_str(attr), len); dst->bus_name[len] = 0; } else if (type == DEVLINK_ATTR_DEV_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5078,8 +5004,6 @@ int devlink_region_read_rsp_parse(const struct nlmsghdr *nlh, dst->_present.port_index = 1; dst->port_index = ynl_attr_get_u32(attr); } else if (type == DEVLINK_ATTR_REGION_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5185,6 +5109,7 @@ int devlink_port_param_get_rsp_parse(const struct nlmsghdr *nlh, { struct devlink_port_param_get_rsp *dst; const struct nlattr *attr; + unsigned int len; dst = yarg->data; @@ -5192,8 +5117,6 @@ int devlink_port_param_get_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_BUS_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5203,8 +5126,6 @@ int devlink_port_param_get_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->bus_name, ynl_attr_get_str(attr), len); dst->bus_name[len] = 0; } else if (type == DEVLINK_ATTR_DEV_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5376,6 +5297,7 @@ int devlink_info_get_rsp_parse(const struct nlmsghdr *nlh, struct devlink_info_get_rsp *dst; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; int i; dst = yarg->data; @@ -5392,8 +5314,6 @@ int devlink_info_get_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_BUS_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5403,8 +5323,6 @@ int devlink_info_get_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->bus_name, ynl_attr_get_str(attr), len); dst->bus_name[len] = 0; } else if (type == DEVLINK_ATTR_DEV_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5414,8 +5332,6 @@ int devlink_info_get_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->dev_name, ynl_attr_get_str(attr), len); dst->dev_name[len] = 0; } else if (type == DEVLINK_ATTR_INFO_DRIVER_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5425,8 +5341,6 @@ int devlink_info_get_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->info_driver_name, ynl_attr_get_str(attr), len); dst->info_driver_name[len] = 0; } else if (type == DEVLINK_ATTR_INFO_SERIAL_NUMBER) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5442,8 +5356,6 @@ int devlink_info_get_rsp_parse(const struct nlmsghdr *nlh, } else if (type == DEVLINK_ATTR_INFO_VERSION_STORED) { n_info_version_stored++; } else if (type == DEVLINK_ATTR_INFO_BOARD_SERIAL_NUMBER) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5615,6 +5527,7 @@ int devlink_health_reporter_get_rsp_parse(const struct nlmsghdr *nlh, { struct devlink_health_reporter_get_rsp *dst; const struct nlattr *attr; + unsigned int len; dst = yarg->data; @@ -5622,8 +5535,6 @@ int devlink_health_reporter_get_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_BUS_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5633,8 +5544,6 @@ int devlink_health_reporter_get_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->bus_name, ynl_attr_get_str(attr), len); dst->bus_name[len] = 0; } else if (type == DEVLINK_ATTR_DEV_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5649,8 +5558,6 @@ int devlink_health_reporter_get_rsp_parse(const struct nlmsghdr *nlh, dst->_present.port_index = 1; dst->port_index = ynl_attr_get_u32(attr); } else if (type == DEVLINK_ATTR_HEALTH_REPORTER_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -6081,6 +5988,7 @@ int devlink_trap_get_rsp_parse(const struct nlmsghdr *nlh, { struct devlink_trap_get_rsp *dst; const struct nlattr *attr; + unsigned int len; dst = yarg->data; @@ -6088,8 +5996,6 @@ int devlink_trap_get_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_BUS_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -6099,8 +6005,6 @@ int devlink_trap_get_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->bus_name, ynl_attr_get_str(attr), len); dst->bus_name[len] = 0; } else if (type == DEVLINK_ATTR_DEV_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -6110,8 +6014,6 @@ int devlink_trap_get_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->dev_name, ynl_attr_get_str(attr), len); dst->dev_name[len] = 0; } else if (type == DEVLINK_ATTR_TRAP_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -6279,6 +6181,7 @@ int devlink_trap_group_get_rsp_parse(const struct nlmsghdr *nlh, { struct devlink_trap_group_get_rsp *dst; const struct nlattr *attr; + unsigned int len; dst = yarg->data; @@ -6286,8 +6189,6 @@ int devlink_trap_group_get_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_BUS_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -6297,8 +6198,6 @@ int devlink_trap_group_get_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->bus_name, ynl_attr_get_str(attr), len); dst->bus_name[len] = 0; } else if (type == DEVLINK_ATTR_DEV_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -6308,8 +6207,6 @@ int devlink_trap_group_get_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->dev_name, ynl_attr_get_str(attr), len); dst->dev_name[len] = 0; } else if (type == DEVLINK_ATTR_TRAP_GROUP_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -6482,6 +6379,7 @@ int devlink_trap_policer_get_rsp_parse(const struct nlmsghdr *nlh, { struct devlink_trap_policer_get_rsp *dst; const struct nlattr *attr; + unsigned int len; dst = yarg->data; @@ -6489,8 +6387,6 @@ int devlink_trap_policer_get_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_BUS_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -6500,8 +6396,6 @@ int devlink_trap_policer_get_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->bus_name, ynl_attr_get_str(attr), len); dst->bus_name[len] = 0; } else if (type == DEVLINK_ATTR_DEV_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -6717,6 +6611,7 @@ int devlink_rate_get_rsp_parse(const struct nlmsghdr *nlh, { struct devlink_rate_get_rsp *dst; const struct nlattr *attr; + unsigned int len; dst = yarg->data; @@ -6724,8 +6619,6 @@ int devlink_rate_get_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_BUS_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -6735,8 +6628,6 @@ int devlink_rate_get_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->bus_name, ynl_attr_get_str(attr), len); dst->bus_name[len] = 0; } else if (type == DEVLINK_ATTR_DEV_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -6751,8 +6642,6 @@ int devlink_rate_get_rsp_parse(const struct nlmsghdr *nlh, dst->_present.port_index = 1; dst->port_index = ynl_attr_get_u32(attr); } else if (type == DEVLINK_ATTR_RATE_NODE_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -7024,6 +6913,7 @@ int devlink_linecard_get_rsp_parse(const struct nlmsghdr *nlh, { struct devlink_linecard_get_rsp *dst; const struct nlattr *attr; + unsigned int len; dst = yarg->data; @@ -7031,8 +6921,6 @@ int devlink_linecard_get_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_BUS_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -7042,8 +6930,6 @@ int devlink_linecard_get_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->bus_name, ynl_attr_get_str(attr), len); dst->bus_name[len] = 0; } else if (type == DEVLINK_ATTR_DEV_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -7215,6 +7101,7 @@ int devlink_selftests_get_rsp_parse(const struct nlmsghdr *nlh, { struct devlink_selftests_get_rsp *dst; const struct nlattr *attr; + unsigned int len; dst = yarg->data; @@ -7222,8 +7109,6 @@ int devlink_selftests_get_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == DEVLINK_ATTR_BUS_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -7233,8 +7118,6 @@ int devlink_selftests_get_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->bus_name, ynl_attr_get_str(attr), len); dst->bus_name[len] = 0; } else if (type == DEVLINK_ATTR_DEV_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; diff --git a/home/nipa/nipa_out/1002112/ynl/old-code/dpll-user.c b/home/nipa/nipa_out/1002112/ynl/new-code/dpll-user.c index 8bbabbbad9e4..a4a81e2ffca2 100644 --- a/home/nipa/nipa_out/1002112/ynl/old-code/dpll-user.c +++ b/home/nipa/nipa_out/1002112/ynl/new-code/dpll-user.c @@ -544,6 +544,7 @@ int dpll_device_get_rsp_parse(const struct nlmsghdr *nlh, unsigned int n_mode_supported = 0; struct dpll_device_get_rsp *dst; const struct nlattr *attr; + unsigned int len; int i; dst = yarg->data; @@ -560,8 +561,6 @@ int dpll_device_get_rsp_parse(const struct nlmsghdr *nlh, dst->_present.id = 1; dst->id = ynl_attr_get_u32(attr); } else if (type == DPLL_A_MODULE_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -858,6 +857,7 @@ int dpll_pin_get_rsp_parse(const struct nlmsghdr *nlh, struct dpll_pin_get_rsp *dst; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; int i; dst = yarg->data; @@ -883,8 +883,6 @@ int dpll_pin_get_rsp_parse(const struct nlmsghdr *nlh, dst->_present.id = 1; dst->id = ynl_attr_get_u32(attr); } else if (type == DPLL_A_PIN_BOARD_LABEL) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -894,8 +892,6 @@ int dpll_pin_get_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->board_label, ynl_attr_get_str(attr), len); dst->board_label[len] = 0; } else if (type == DPLL_A_PIN_PANEL_LABEL) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -905,8 +901,6 @@ int dpll_pin_get_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->panel_label, ynl_attr_get_str(attr), len); dst->panel_label[len] = 0; } else if (type == DPLL_A_PIN_PACKAGE_LABEL) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; diff --git a/home/nipa/nipa_out/1002112/ynl/old-code/ethtool-user.c b/home/nipa/nipa_out/1002112/ynl/new-code/ethtool-user.c index 397701e52a10..7c2d0f1acd61 100644 --- a/home/nipa/nipa_out/1002112/ynl/old-code/ethtool-user.c +++ b/home/nipa/nipa_out/1002112/ynl/new-code/ethtool-user.c @@ -1065,6 +1065,7 @@ int ethtool_header_parse(struct ynl_parse_arg *yarg, { struct ethtool_header *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); @@ -1075,8 +1076,6 @@ int ethtool_header_parse(struct ynl_parse_arg *yarg, dst->_present.dev_index = 1; dst->dev_index = ynl_attr_get_u32(attr); } else if (type == ETHTOOL_A_HEADER_DEV_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1270,13 +1269,12 @@ int ethtool_fec_stat_parse(struct ynl_parse_arg *yarg, { struct ethtool_fec_stat *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == ETHTOOL_A_FEC_STAT_CORRECTED) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1286,8 +1284,6 @@ int ethtool_fec_stat_parse(struct ynl_parse_arg *yarg, dst->corrected = malloc(len); memcpy(dst->corrected, ynl_attr_data(attr), len); } else if (type == ETHTOOL_A_FEC_STAT_UNCORR) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1297,8 +1293,6 @@ int ethtool_fec_stat_parse(struct ynl_parse_arg *yarg, dst->uncorr = malloc(len); memcpy(dst->uncorr, ynl_attr_data(attr), len); } else if (type == ETHTOOL_A_FEC_STAT_CORR_BITS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1755,6 +1749,7 @@ int ethtool_bitset_bit_parse(struct ynl_parse_arg *yarg, { struct ethtool_bitset_bit *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); @@ -1765,8 +1760,6 @@ int ethtool_bitset_bit_parse(struct ynl_parse_arg *yarg, dst->_present.index = 1; dst->index = ynl_attr_get_u32(attr); } else if (type == ETHTOOL_A_BITSET_BIT_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1839,6 +1832,7 @@ int ethtool_string_parse(struct ynl_parse_arg *yarg, { struct ethtool_string *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); @@ -1849,8 +1843,6 @@ int ethtool_string_parse(struct ynl_parse_arg *yarg, dst->_present.index = 1; dst->index = ynl_attr_get_u32(attr); } else if (type == ETHTOOL_A_STRING_VALUE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2130,6 +2122,7 @@ int ethtool_bitset_parse(struct ynl_parse_arg *yarg, struct ethtool_bitset *dst = yarg->data; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; parg.ys = yarg->ys; @@ -2155,8 +2148,6 @@ int ethtool_bitset_parse(struct ynl_parse_arg *yarg, if (ethtool_bitset_bits_parse(&parg, attr)) return YNL_PARSE_CB_ERROR; } else if (type == ETHTOOL_A_BITSET_VALUE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2165,8 +2156,6 @@ int ethtool_bitset_parse(struct ynl_parse_arg *yarg, dst->value = malloc(len); memcpy(dst->value, ynl_attr_data(attr), len); } else if (type == ETHTOOL_A_BITSET_MASK) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3365,6 +3354,7 @@ int ethtool_wol_get_rsp_parse(const struct nlmsghdr *nlh, struct ethtool_wol_get_rsp *dst; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; dst = yarg->data; parg.ys = yarg->ys; @@ -3391,8 +3381,6 @@ int ethtool_wol_get_rsp_parse(const struct nlmsghdr *nlh, if (ethtool_bitset_parse(&parg, attr)) return YNL_PARSE_CB_ERROR; } else if (type == ETHTOOL_A_WOL_SOPASS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5963,6 +5951,7 @@ int ethtool_module_eeprom_get_rsp_parse(const struct nlmsghdr *nlh, struct ethtool_module_eeprom_get_rsp *dst; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; dst = yarg->data; parg.ys = yarg->ys; @@ -5980,8 +5969,6 @@ int ethtool_module_eeprom_get_rsp_parse(const struct nlmsghdr *nlh, if (ethtool_header_parse(&parg, attr)) return YNL_PARSE_CB_ERROR; } else if (type == ETHTOOL_A_MODULE_EEPROM_DATA) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -6702,6 +6689,7 @@ int ethtool_rss_get_rsp_parse(const struct nlmsghdr *nlh, struct ethtool_rss_get_rsp *dst; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; dst = yarg->data; parg.ys = yarg->ys; @@ -6729,8 +6717,6 @@ int ethtool_rss_get_rsp_parse(const struct nlmsghdr *nlh, dst->_present.hfunc = 1; dst->hfunc = ynl_attr_get_u32(attr); } else if (type == ETHTOOL_A_RSS_INDIR) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -6740,8 +6726,6 @@ int ethtool_rss_get_rsp_parse(const struct nlmsghdr *nlh, dst->indir = malloc(len); memcpy(dst->indir, ynl_attr_data(attr), len); } else if (type == ETHTOOL_A_RSS_HKEY) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -7542,6 +7526,7 @@ int ethtool_phy_get_rsp_parse(const struct nlmsghdr *nlh, struct ethtool_phy_get_rsp *dst; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; dst = yarg->data; parg.ys = yarg->ys; @@ -7564,8 +7549,6 @@ int ethtool_phy_get_rsp_parse(const struct nlmsghdr *nlh, dst->_present.index = 1; dst->index = ynl_attr_get_u32(attr); } else if (type == ETHTOOL_A_PHY_DRVNAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -7575,8 +7558,6 @@ int ethtool_phy_get_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->drvname, ynl_attr_get_str(attr), len); dst->drvname[len] = 0; } else if (type == ETHTOOL_A_PHY_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -7596,8 +7577,6 @@ int ethtool_phy_get_rsp_parse(const struct nlmsghdr *nlh, dst->_present.upstream_index = 1; dst->upstream_index = ynl_attr_get_u32(attr); } else if (type == ETHTOOL_A_PHY_UPSTREAM_SFP_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -7607,8 +7586,6 @@ int ethtool_phy_get_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->upstream_sfp_name, ynl_attr_get_str(attr), len); dst->upstream_sfp_name[len] = 0; } else if (type == ETHTOOL_A_PHY_DOWNSTREAM_SFP_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -8090,6 +8067,7 @@ int ethtool_rss_create_act_rsp_parse(const struct nlmsghdr *nlh, struct ethtool_rss_create_act_rsp *dst; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; dst = yarg->data; parg.ys = yarg->ys; @@ -8117,8 +8095,6 @@ int ethtool_rss_create_act_rsp_parse(const struct nlmsghdr *nlh, dst->_present.hfunc = 1; dst->hfunc = ynl_attr_get_u32(attr); } else if (type == ETHTOOL_A_RSS_INDIR) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -8128,8 +8104,6 @@ int ethtool_rss_create_act_rsp_parse(const struct nlmsghdr *nlh, dst->indir = malloc(len); memcpy(dst->indir, ynl_attr_data(attr), len); } else if (type == ETHTOOL_A_RSS_HKEY) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -8331,6 +8305,7 @@ int ethtool_module_fw_flash_ntf_rsp_parse(const struct nlmsghdr *nlh, struct ethtool_module_fw_flash_ntf_rsp *dst; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; dst = yarg->data; parg.ys = yarg->ys; @@ -8353,8 +8328,6 @@ int ethtool_module_fw_flash_ntf_rsp_parse(const struct nlmsghdr *nlh, dst->_present.status = 1; dst->status = ynl_attr_get_u32(attr); } else if (type == ETHTOOL_A_MODULE_FW_FLASH_STATUS_MSG) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; diff --git a/home/nipa/nipa_out/1002112/ynl/old-code/fou-user.c b/home/nipa/nipa_out/1002112/ynl/new-code/fou-user.c index af194dc8fac3..43987767910f 100644 --- a/home/nipa/nipa_out/1002112/ynl/old-code/fou-user.c +++ b/home/nipa/nipa_out/1002112/ynl/new-code/fou-user.c @@ -170,6 +170,7 @@ int fou_get_rsp_parse(const struct nlmsghdr *nlh, struct ynl_parse_arg *yarg) { const struct nlattr *attr; struct fou_get_rsp *dst; + unsigned int len; dst = yarg->data; @@ -206,8 +207,6 @@ int fou_get_rsp_parse(const struct nlmsghdr *nlh, struct ynl_parse_arg *yarg) dst->_present.peer_v4 = 1; dst->peer_v4 = ynl_attr_get_u32(attr); } else if (type == FOU_ATTR_LOCAL_V6) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -216,8 +215,6 @@ int fou_get_rsp_parse(const struct nlmsghdr *nlh, struct ynl_parse_arg *yarg) dst->local_v6 = malloc(len); memcpy(dst->local_v6, ynl_attr_data(attr), len); } else if (type == FOU_ATTR_PEER_V6) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; diff --git a/home/nipa/nipa_out/1002112/ynl/old-code/handshake-user.c b/home/nipa/nipa_out/1002112/ynl/new-code/handshake-user.c index 0d640d9e9819..a7cdc08406d5 100644 --- a/home/nipa/nipa_out/1002112/ynl/old-code/handshake-user.c +++ b/home/nipa/nipa_out/1002112/ynl/new-code/handshake-user.c @@ -161,6 +161,7 @@ int handshake_accept_rsp_parse(const struct nlmsghdr *nlh, unsigned int n_certificate = 0; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; int i; dst = yarg->data; @@ -199,8 +200,6 @@ int handshake_accept_rsp_parse(const struct nlmsghdr *nlh, } else if (type == HANDSHAKE_A_ACCEPT_CERTIFICATE) { n_certificate++; } else if (type == HANDSHAKE_A_ACCEPT_PEERNAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; diff --git a/home/nipa/nipa_out/1002112/ynl/old-code/mptcp_pm-user.c b/home/nipa/nipa_out/1002112/ynl/new-code/mptcp_pm-user.c index 252061605c6a..96268534cfc3 100644 --- a/home/nipa/nipa_out/1002112/ynl/old-code/mptcp_pm-user.c +++ b/home/nipa/nipa_out/1002112/ynl/new-code/mptcp_pm-user.c @@ -131,6 +131,7 @@ int mptcp_pm_address_parse(struct ynl_parse_arg *yarg, { struct mptcp_pm_address *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); @@ -151,8 +152,6 @@ int mptcp_pm_address_parse(struct ynl_parse_arg *yarg, dst->_present.addr4 = 1; dst->addr4 = ynl_attr_get_u32(attr); } else if (type == MPTCP_PM_ADDR_ATTR_ADDR6) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; diff --git a/home/nipa/nipa_out/1002112/ynl/old-code/nfsd-user.c b/home/nipa/nipa_out/1002112/ynl/new-code/nfsd-user.c index 74c6a9cb2bfe..c130af92dc1e 100644 --- a/home/nipa/nipa_out/1002112/ynl/old-code/nfsd-user.c +++ b/home/nipa/nipa_out/1002112/ynl/new-code/nfsd-user.c @@ -190,13 +190,12 @@ int nfsd_sock_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) { struct nfsd_sock *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == NFSD_A_SOCK_ADDR) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -205,8 +204,6 @@ int nfsd_sock_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) dst->addr = malloc(len); memcpy(dst->addr, ynl_attr_data(attr), len); } else if (type == NFSD_A_SOCK_TRANSPORT_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -229,6 +226,7 @@ int nfsd_rpc_status_get_rsp_parse(const struct nlmsghdr *nlh, struct nfsd_rpc_status_get_rsp *dst; unsigned int n_compound_ops = 0; const struct nlattr *attr; + unsigned int len; int i; dst = yarg->data; @@ -280,8 +278,6 @@ int nfsd_rpc_status_get_rsp_parse(const struct nlmsghdr *nlh, dst->_present.daddr4 = 1; dst->daddr4 = ynl_attr_get_u32(attr); } else if (type == NFSD_A_RPC_STATUS_SADDR6) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -290,8 +286,6 @@ int nfsd_rpc_status_get_rsp_parse(const struct nlmsghdr *nlh, dst->saddr6 = malloc(len); memcpy(dst->saddr6, ynl_attr_data(attr), len); } else if (type == NFSD_A_RPC_STATUS_DADDR6) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -421,6 +415,7 @@ int nfsd_threads_get_rsp_parse(const struct nlmsghdr *nlh, struct nfsd_threads_get_rsp *dst; unsigned int n_threads = 0; const struct nlattr *attr; + unsigned int len; int i; dst = yarg->data; @@ -444,8 +439,6 @@ int nfsd_threads_get_rsp_parse(const struct nlmsghdr *nlh, dst->_present.leasetime = 1; dst->leasetime = ynl_attr_get_u32(attr); } else if (type == NFSD_A_SERVER_SCOPE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -769,6 +762,7 @@ int nfsd_pool_mode_get_rsp_parse(const struct nlmsghdr *nlh, { struct nfsd_pool_mode_get_rsp *dst; const struct nlattr *attr; + unsigned int len; dst = yarg->data; @@ -776,8 +770,6 @@ int nfsd_pool_mode_get_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == NFSD_A_POOL_MODE_MODE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; diff --git a/home/nipa/nipa_out/1002112/ynl/old-code/nl80211-user.c b/home/nipa/nipa_out/1002112/ynl/new-code/nl80211-user.c index 4831af26a13a..297ca3efd716 100644 --- a/home/nipa/nipa_out/1002112/ynl/old-code/nl80211-user.c +++ b/home/nipa/nipa_out/1002112/ynl/new-code/nl80211-user.c @@ -1261,6 +1261,7 @@ int nl80211_iftype_data_attrs_parse(struct ynl_parse_arg *yarg, { struct nl80211_iftype_data_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; dst->idx = idx; @@ -1268,8 +1269,6 @@ int nl80211_iftype_data_attrs_parse(struct ynl_parse_arg *yarg, unsigned int type = ynl_attr_type(attr); if (type == NL80211_BAND_IFTYPE_ATTR_IFTYPES) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1278,8 +1277,6 @@ int nl80211_iftype_data_attrs_parse(struct ynl_parse_arg *yarg, dst->iftypes = malloc(len); memcpy(dst->iftypes, ynl_attr_data(attr), len); } else if (type == NL80211_BAND_IFTYPE_ATTR_HE_CAP_MAC) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1288,8 +1285,6 @@ int nl80211_iftype_data_attrs_parse(struct ynl_parse_arg *yarg, dst->he_cap_mac = malloc(len); memcpy(dst->he_cap_mac, ynl_attr_data(attr), len); } else if (type == NL80211_BAND_IFTYPE_ATTR_HE_CAP_PHY) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1298,8 +1293,6 @@ int nl80211_iftype_data_attrs_parse(struct ynl_parse_arg *yarg, dst->he_cap_phy = malloc(len); memcpy(dst->he_cap_phy, ynl_attr_data(attr), len); } else if (type == NL80211_BAND_IFTYPE_ATTR_HE_CAP_MCS_SET) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1308,8 +1301,6 @@ int nl80211_iftype_data_attrs_parse(struct ynl_parse_arg *yarg, dst->he_cap_mcs_set = malloc(len); memcpy(dst->he_cap_mcs_set, ynl_attr_data(attr), len); } else if (type == NL80211_BAND_IFTYPE_ATTR_HE_CAP_PPE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1318,8 +1309,6 @@ int nl80211_iftype_data_attrs_parse(struct ynl_parse_arg *yarg, dst->he_cap_ppe = malloc(len); memcpy(dst->he_cap_ppe, ynl_attr_data(attr), len); } else if (type == NL80211_BAND_IFTYPE_ATTR_HE_6GHZ_CAPA) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1328,8 +1317,6 @@ int nl80211_iftype_data_attrs_parse(struct ynl_parse_arg *yarg, dst->he_6ghz_capa = malloc(len); memcpy(dst->he_6ghz_capa, ynl_attr_data(attr), len); } else if (type == NL80211_BAND_IFTYPE_ATTR_VENDOR_ELEMS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1338,8 +1325,6 @@ int nl80211_iftype_data_attrs_parse(struct ynl_parse_arg *yarg, dst->vendor_elems = malloc(len); memcpy(dst->vendor_elems, ynl_attr_data(attr), len); } else if (type == NL80211_BAND_IFTYPE_ATTR_EHT_CAP_MAC) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1348,8 +1333,6 @@ int nl80211_iftype_data_attrs_parse(struct ynl_parse_arg *yarg, dst->eht_cap_mac = malloc(len); memcpy(dst->eht_cap_mac, ynl_attr_data(attr), len); } else if (type == NL80211_BAND_IFTYPE_ATTR_EHT_CAP_PHY) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1358,8 +1341,6 @@ int nl80211_iftype_data_attrs_parse(struct ynl_parse_arg *yarg, dst->eht_cap_phy = malloc(len); memcpy(dst->eht_cap_phy, ynl_attr_data(attr), len); } else if (type == NL80211_BAND_IFTYPE_ATTR_EHT_CAP_MCS_SET) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1368,8 +1349,6 @@ int nl80211_iftype_data_attrs_parse(struct ynl_parse_arg *yarg, dst->eht_cap_mcs_set = malloc(len); memcpy(dst->eht_cap_mcs_set, ynl_attr_data(attr), len); } else if (type == NL80211_BAND_IFTYPE_ATTR_EHT_CAP_PPE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1588,6 +1567,7 @@ int nl80211_if_combination_attributes_parse(struct ynl_parse_arg *yarg, { struct nl80211_if_combination_attributes *dst = yarg->data; const struct nlattr *attr_limits; + const struct nlattr *attr2; const struct nlattr *attr; struct ynl_parse_arg parg; unsigned int n_limits = 0; @@ -1603,11 +1583,9 @@ int nl80211_if_combination_attributes_parse(struct ynl_parse_arg *yarg, unsigned int type = ynl_attr_type(attr); if (type == NL80211_IFACE_COMB_LIMITS) { - const struct nlattr *attr2; - attr_limits = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) + if (__ynl_attr_validate(yarg, attr2, type)) return YNL_PARSE_CB_ERROR; n_limits++; } @@ -1669,6 +1647,7 @@ int nl80211_sar_attributes_parse(struct ynl_parse_arg *yarg, { struct nl80211_sar_attributes *dst = yarg->data; const struct nlattr *attr_specs; + const struct nlattr *attr2; const struct nlattr *attr; struct ynl_parse_arg parg; unsigned int n_specs = 0; @@ -1688,11 +1667,9 @@ int nl80211_sar_attributes_parse(struct ynl_parse_arg *yarg, dst->_present.type = 1; dst->type = ynl_attr_get_u32(attr); } else if (type == NL80211_SAR_ATTR_SPECS) { - const struct nlattr *attr2; - attr_specs = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) + if (__ynl_attr_validate(yarg, attr2, type)) return YNL_PARSE_CB_ERROR; n_specs++; } @@ -1749,9 +1726,11 @@ int nl80211_frequency_attrs_parse(struct ynl_parse_arg *yarg, { struct nl80211_frequency_attrs *dst = yarg->data; const struct nlattr *attr_wmm; + const struct nlattr *attr2; const struct nlattr *attr; struct ynl_parse_arg parg; unsigned int n_wmm = 0; + unsigned int len; int i; parg.ys = yarg->ys; @@ -1795,8 +1774,6 @@ int nl80211_frequency_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.dfs_state = 1; dst->dfs_state = ynl_attr_get_u32(attr); } else if (type == NL80211_FREQUENCY_ATTR_DFS_TIME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1805,8 +1782,6 @@ int nl80211_frequency_attrs_parse(struct ynl_parse_arg *yarg, dst->dfs_time = malloc(len); memcpy(dst->dfs_time, ynl_attr_data(attr), len); } else if (type == NL80211_FREQUENCY_ATTR_NO_HT40_MINUS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1815,8 +1790,6 @@ int nl80211_frequency_attrs_parse(struct ynl_parse_arg *yarg, dst->no_ht40_minus = malloc(len); memcpy(dst->no_ht40_minus, ynl_attr_data(attr), len); } else if (type == NL80211_FREQUENCY_ATTR_NO_HT40_PLUS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1825,8 +1798,6 @@ int nl80211_frequency_attrs_parse(struct ynl_parse_arg *yarg, dst->no_ht40_plus = malloc(len); memcpy(dst->no_ht40_plus, ynl_attr_data(attr), len); } else if (type == NL80211_FREQUENCY_ATTR_NO_80MHZ) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1835,8 +1806,6 @@ int nl80211_frequency_attrs_parse(struct ynl_parse_arg *yarg, dst->no_80mhz = malloc(len); memcpy(dst->no_80mhz, ynl_attr_data(attr), len); } else if (type == NL80211_FREQUENCY_ATTR_NO_160MHZ) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1845,8 +1814,6 @@ int nl80211_frequency_attrs_parse(struct ynl_parse_arg *yarg, dst->no_160mhz = malloc(len); memcpy(dst->no_160mhz, ynl_attr_data(attr), len); } else if (type == NL80211_FREQUENCY_ATTR_DFS_CAC_TIME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1855,8 +1822,6 @@ int nl80211_frequency_attrs_parse(struct ynl_parse_arg *yarg, dst->dfs_cac_time = malloc(len); memcpy(dst->dfs_cac_time, ynl_attr_data(attr), len); } else if (type == NL80211_FREQUENCY_ATTR_INDOOR_ONLY) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1865,8 +1830,6 @@ int nl80211_frequency_attrs_parse(struct ynl_parse_arg *yarg, dst->indoor_only = malloc(len); memcpy(dst->indoor_only, ynl_attr_data(attr), len); } else if (type == NL80211_FREQUENCY_ATTR_IR_CONCURRENT) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1875,8 +1838,6 @@ int nl80211_frequency_attrs_parse(struct ynl_parse_arg *yarg, dst->ir_concurrent = malloc(len); memcpy(dst->ir_concurrent, ynl_attr_data(attr), len); } else if (type == NL80211_FREQUENCY_ATTR_NO_20MHZ) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1885,8 +1846,6 @@ int nl80211_frequency_attrs_parse(struct ynl_parse_arg *yarg, dst->no_20mhz = malloc(len); memcpy(dst->no_20mhz, ynl_attr_data(attr), len); } else if (type == NL80211_FREQUENCY_ATTR_NO_10MHZ) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1895,17 +1854,13 @@ int nl80211_frequency_attrs_parse(struct ynl_parse_arg *yarg, dst->no_10mhz = malloc(len); memcpy(dst->no_10mhz, ynl_attr_data(attr), len); } else if (type == NL80211_FREQUENCY_ATTR_WMM) { - const struct nlattr *attr2; - attr_wmm = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) + if (__ynl_attr_validate(yarg, attr2, type)) return YNL_PARSE_CB_ERROR; n_wmm++; } } else if (type == NL80211_FREQUENCY_ATTR_NO_HE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1919,8 +1874,6 @@ int nl80211_frequency_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.offset = 1; dst->offset = ynl_attr_get_u32(attr); } else if (type == NL80211_FREQUENCY_ATTR_1MHZ) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1929,8 +1882,6 @@ int nl80211_frequency_attrs_parse(struct ynl_parse_arg *yarg, dst->_1mhz = malloc(len); memcpy(dst->_1mhz, ynl_attr_data(attr), len); } else if (type == NL80211_FREQUENCY_ATTR_2MHZ) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1939,8 +1890,6 @@ int nl80211_frequency_attrs_parse(struct ynl_parse_arg *yarg, dst->_2mhz = malloc(len); memcpy(dst->_2mhz, ynl_attr_data(attr), len); } else if (type == NL80211_FREQUENCY_ATTR_4MHZ) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1949,8 +1898,6 @@ int nl80211_frequency_attrs_parse(struct ynl_parse_arg *yarg, dst->_4mhz = malloc(len); memcpy(dst->_4mhz, ynl_attr_data(attr), len); } else if (type == NL80211_FREQUENCY_ATTR_8MHZ) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1959,8 +1906,6 @@ int nl80211_frequency_attrs_parse(struct ynl_parse_arg *yarg, dst->_8mhz = malloc(len); memcpy(dst->_8mhz, ynl_attr_data(attr), len); } else if (type == NL80211_FREQUENCY_ATTR_16MHZ) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1969,8 +1914,6 @@ int nl80211_frequency_attrs_parse(struct ynl_parse_arg *yarg, dst->_16mhz = malloc(len); memcpy(dst->_16mhz, ynl_attr_data(attr), len); } else if (type == NL80211_FREQUENCY_ATTR_NO_320MHZ) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1979,8 +1922,6 @@ int nl80211_frequency_attrs_parse(struct ynl_parse_arg *yarg, dst->no_320mhz = malloc(len); memcpy(dst->no_320mhz, ynl_attr_data(attr), len); } else if (type == NL80211_FREQUENCY_ATTR_NO_EHT) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1989,8 +1930,6 @@ int nl80211_frequency_attrs_parse(struct ynl_parse_arg *yarg, dst->no_eht = malloc(len); memcpy(dst->no_eht, ynl_attr_data(attr), len); } else if (type == NL80211_FREQUENCY_ATTR_PSD) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1999,8 +1938,6 @@ int nl80211_frequency_attrs_parse(struct ynl_parse_arg *yarg, dst->psd = malloc(len); memcpy(dst->psd, ynl_attr_data(attr), len); } else if (type == NL80211_FREQUENCY_ATTR_DFS_CONCURRENT) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2009,8 +1946,6 @@ int nl80211_frequency_attrs_parse(struct ynl_parse_arg *yarg, dst->dfs_concurrent = malloc(len); memcpy(dst->dfs_concurrent, ynl_attr_data(attr), len); } else if (type == NL80211_FREQUENCY_ATTR_NO_6GHZ_VLP_CLIENT) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2019,8 +1954,6 @@ int nl80211_frequency_attrs_parse(struct ynl_parse_arg *yarg, dst->no_6ghz_vlp_client = malloc(len); memcpy(dst->no_6ghz_vlp_client, ynl_attr_data(attr), len); } else if (type == NL80211_FREQUENCY_ATTR_NO_6GHZ_AFC_CLIENT) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2029,8 +1962,6 @@ int nl80211_frequency_attrs_parse(struct ynl_parse_arg *yarg, dst->no_6ghz_afc_client = malloc(len); memcpy(dst->no_6ghz_afc_client, ynl_attr_data(attr), len); } else if (type == NL80211_FREQUENCY_ATTR_CAN_MONITOR) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2039,8 +1970,6 @@ int nl80211_frequency_attrs_parse(struct ynl_parse_arg *yarg, dst->can_monitor = malloc(len); memcpy(dst->can_monitor, ynl_attr_data(attr), len); } else if (type == NL80211_FREQUENCY_ATTR_ALLOW_6GHZ_VLP_AP) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2088,10 +2017,12 @@ int nl80211_band_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *attr_freqs; const struct nlattr *attr_rates; unsigned int n_iftype_data = 0; + const struct nlattr *attr2; const struct nlattr *attr; struct ynl_parse_arg parg; unsigned int n_freqs = 0; unsigned int n_rates = 0; + unsigned int len; int i; parg.ys = yarg->ys; @@ -2107,26 +2038,20 @@ int nl80211_band_attrs_parse(struct ynl_parse_arg *yarg, unsigned int type = ynl_attr_type(attr); if (type == NL80211_BAND_ATTR_FREQS) { - const struct nlattr *attr2; - attr_freqs = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) + if (__ynl_attr_validate(yarg, attr2, type)) return YNL_PARSE_CB_ERROR; n_freqs++; } } else if (type == NL80211_BAND_ATTR_RATES) { - const struct nlattr *attr2; - attr_rates = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) + if (__ynl_attr_validate(yarg, attr2, type)) return YNL_PARSE_CB_ERROR; n_rates++; } } else if (type == NL80211_BAND_ATTR_HT_MCS_SET) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2150,8 +2075,6 @@ int nl80211_band_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.ht_ampdu_density = 1; dst->ht_ampdu_density = ynl_attr_get_u8(attr); } else if (type == NL80211_BAND_ATTR_VHT_MCS_SET) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2165,17 +2088,13 @@ int nl80211_band_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.vht_capa = 1; dst->vht_capa = ynl_attr_get_u32(attr); } else if (type == NL80211_BAND_ATTR_IFTYPE_DATA) { - const struct nlattr *attr2; - attr_iftype_data = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) + if (__ynl_attr_validate(yarg, attr2, type)) return YNL_PARSE_CB_ERROR; n_iftype_data++; } } else if (type == NL80211_BAND_ATTR_EDMG_CHANNELS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2184,8 +2103,6 @@ int nl80211_band_attrs_parse(struct ynl_parse_arg *yarg, dst->edmg_channels = malloc(len); memcpy(dst->edmg_channels, ynl_attr_data(attr), len); } else if (type == NL80211_BAND_ATTR_EDMG_BW_CONFIG) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2194,8 +2111,6 @@ int nl80211_band_attrs_parse(struct ynl_parse_arg *yarg, dst->edmg_bw_config = malloc(len); memcpy(dst->edmg_bw_config, ynl_attr_data(attr), len); } else if (type == NL80211_BAND_ATTR_S1G_MCS_NSS_SET) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2204,8 +2119,6 @@ int nl80211_band_attrs_parse(struct ynl_parse_arg *yarg, dst->s1g_mcs_nss_set = malloc(len); memcpy(dst->s1g_mcs_nss_set, ynl_attr_data(attr), len); } else if (type == NL80211_BAND_ATTR_S1G_CAPA) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2377,8 +2290,10 @@ int nl80211_get_wiphy_rsp_parse(const struct nlmsghdr *nlh, unsigned int n_interface_combinations = 0; unsigned int n_supported_commands = 0; struct nl80211_get_wiphy_rsp *dst; + const struct nlattr *attr2; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; int i; dst = yarg->data; @@ -2398,8 +2313,6 @@ int nl80211_get_wiphy_rsp_parse(const struct nlmsghdr *nlh, dst->_present.bands = 1; dst->bands = ynl_attr_get_u32(attr); } else if (type == NL80211_ATTR_CIPHER_SUITES) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2413,8 +2326,6 @@ int nl80211_get_wiphy_rsp_parse(const struct nlmsghdr *nlh, return YNL_PARSE_CB_ERROR; dst->_present.control_port_ethertype = 1; } else if (type == NL80211_ATTR_EXT_CAPA) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2423,8 +2334,6 @@ int nl80211_get_wiphy_rsp_parse(const struct nlmsghdr *nlh, dst->ext_capa = malloc(len); memcpy(dst->ext_capa, ynl_attr_data(attr), len); } else if (type == NL80211_ATTR_EXT_CAPA_MASK) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2433,8 +2342,6 @@ int nl80211_get_wiphy_rsp_parse(const struct nlmsghdr *nlh, dst->ext_capa_mask = malloc(len); memcpy(dst->ext_capa_mask, ynl_attr_data(attr), len); } else if (type == NL80211_ATTR_EXT_FEATURES) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2453,8 +2360,6 @@ int nl80211_get_wiphy_rsp_parse(const struct nlmsghdr *nlh, dst->_present.generation = 1; dst->generation = ynl_attr_get_u32(attr); } else if (type == NL80211_ATTR_HT_CAPABILITY_MASK) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2463,17 +2368,13 @@ int nl80211_get_wiphy_rsp_parse(const struct nlmsghdr *nlh, dst->ht_capability_mask = malloc(len); memcpy(dst->ht_capability_mask, ynl_attr_data(attr), len); } else if (type == NL80211_ATTR_INTERFACE_COMBINATIONS) { - const struct nlattr *attr2; - attr_interface_combinations = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) + if (__ynl_attr_validate(yarg, attr2, type)) return YNL_PARSE_CB_ERROR; n_interface_combinations++; } } else if (type == NL80211_ATTR_MAC) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2492,8 +2393,6 @@ int nl80211_get_wiphy_rsp_parse(const struct nlmsghdr *nlh, dst->_present.max_match_sets = 1; dst->max_match_sets = ynl_attr_get_u8(attr); } else if (type == NL80211_ATTR_MAX_NUM_AKM_SUITES) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2587,11 +2486,9 @@ int nl80211_get_wiphy_rsp_parse(const struct nlmsghdr *nlh, return YNL_PARSE_CB_ERROR; dst->_present.support_ap_uapsd = 1; } else if (type == NL80211_ATTR_SUPPORTED_COMMANDS) { - const struct nlattr *attr2; - attr_supported_commands = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) + if (__ynl_attr_validate(yarg, attr2, type)) return YNL_PARSE_CB_ERROR; n_supported_commands++; } @@ -2646,8 +2543,6 @@ int nl80211_get_wiphy_rsp_parse(const struct nlmsghdr *nlh, if (nl80211_txq_stats_attrs_parse(&parg, attr)) return YNL_PARSE_CB_ERROR; } else if (type == NL80211_ATTR_VHT_CAPABILITY_MASK) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2700,8 +2595,6 @@ int nl80211_get_wiphy_rsp_parse(const struct nlmsghdr *nlh, dst->_present.wiphy_frag_threshold = 1; dst->wiphy_frag_threshold = ynl_attr_get_u32(attr); } else if (type == NL80211_ATTR_WIPHY_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2807,8 +2700,10 @@ int nl80211_get_wiphy_rsp_dump_parse(const struct nlmsghdr *nlh, unsigned int n_interface_combinations = 0; struct nl80211_get_wiphy_rsp_dump *dst; unsigned int n_supported_commands = 0; + const struct nlattr *attr2; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; int i; dst = yarg->data; @@ -2828,8 +2723,6 @@ int nl80211_get_wiphy_rsp_dump_parse(const struct nlmsghdr *nlh, dst->_present.bands = 1; dst->bands = ynl_attr_get_u32(attr); } else if (type == NL80211_ATTR_CIPHER_SUITES) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2843,8 +2736,6 @@ int nl80211_get_wiphy_rsp_dump_parse(const struct nlmsghdr *nlh, return YNL_PARSE_CB_ERROR; dst->_present.control_port_ethertype = 1; } else if (type == NL80211_ATTR_EXT_CAPA) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2853,8 +2744,6 @@ int nl80211_get_wiphy_rsp_dump_parse(const struct nlmsghdr *nlh, dst->ext_capa = malloc(len); memcpy(dst->ext_capa, ynl_attr_data(attr), len); } else if (type == NL80211_ATTR_EXT_CAPA_MASK) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2863,8 +2752,6 @@ int nl80211_get_wiphy_rsp_dump_parse(const struct nlmsghdr *nlh, dst->ext_capa_mask = malloc(len); memcpy(dst->ext_capa_mask, ynl_attr_data(attr), len); } else if (type == NL80211_ATTR_EXT_FEATURES) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2883,8 +2770,6 @@ int nl80211_get_wiphy_rsp_dump_parse(const struct nlmsghdr *nlh, dst->_present.generation = 1; dst->generation = ynl_attr_get_u32(attr); } else if (type == NL80211_ATTR_HT_CAPABILITY_MASK) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2893,17 +2778,13 @@ int nl80211_get_wiphy_rsp_dump_parse(const struct nlmsghdr *nlh, dst->ht_capability_mask = malloc(len); memcpy(dst->ht_capability_mask, ynl_attr_data(attr), len); } else if (type == NL80211_ATTR_INTERFACE_COMBINATIONS) { - const struct nlattr *attr2; - attr_interface_combinations = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) + if (__ynl_attr_validate(yarg, attr2, type)) return YNL_PARSE_CB_ERROR; n_interface_combinations++; } } else if (type == NL80211_ATTR_MAC) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2922,8 +2803,6 @@ int nl80211_get_wiphy_rsp_dump_parse(const struct nlmsghdr *nlh, dst->_present.max_match_sets = 1; dst->max_match_sets = ynl_attr_get_u8(attr); } else if (type == NL80211_ATTR_MAX_NUM_AKM_SUITES) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3017,11 +2896,9 @@ int nl80211_get_wiphy_rsp_dump_parse(const struct nlmsghdr *nlh, return YNL_PARSE_CB_ERROR; dst->_present.support_ap_uapsd = 1; } else if (type == NL80211_ATTR_SUPPORTED_COMMANDS) { - const struct nlattr *attr2; - attr_supported_commands = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) + if (__ynl_attr_validate(yarg, attr2, type)) return YNL_PARSE_CB_ERROR; n_supported_commands++; } @@ -3076,8 +2953,6 @@ int nl80211_get_wiphy_rsp_dump_parse(const struct nlmsghdr *nlh, if (nl80211_txq_stats_attrs_parse(&parg, attr)) return YNL_PARSE_CB_ERROR; } else if (type == NL80211_ATTR_VHT_CAPABILITY_MASK) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3130,8 +3005,6 @@ int nl80211_get_wiphy_rsp_dump_parse(const struct nlmsghdr *nlh, dst->_present.wiphy_frag_threshold = 1; dst->wiphy_frag_threshold = ynl_attr_get_u32(attr); } else if (type == NL80211_ATTR_WIPHY_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3289,6 +3162,7 @@ int nl80211_get_interface_rsp_parse(const struct nlmsghdr *nlh, struct nl80211_get_interface_rsp *dst; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; dst = yarg->data; parg.ys = yarg->ys; @@ -3297,8 +3171,6 @@ int nl80211_get_interface_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == NL80211_ATTR_IFNAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3328,8 +3200,6 @@ int nl80211_get_interface_rsp_parse(const struct nlmsghdr *nlh, dst->_present.wdev = 1; dst->wdev = ynl_attr_get_u64(attr); } else if (type == NL80211_ATTR_MAC) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3402,6 +3272,7 @@ int nl80211_get_interface_rsp_dump_parse(const struct nlmsghdr *nlh, struct nl80211_get_interface_rsp_dump *dst; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; dst = yarg->data; parg.ys = yarg->ys; @@ -3410,8 +3281,6 @@ int nl80211_get_interface_rsp_dump_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == NL80211_ATTR_IFNAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3441,8 +3310,6 @@ int nl80211_get_interface_rsp_dump_parse(const struct nlmsghdr *nlh, dst->_present.wdev = 1; dst->wdev = ynl_attr_get_u64(attr); } else if (type == NL80211_ATTR_MAC) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; diff --git a/home/nipa/nipa_out/1002112/ynl/old-code/nlctrl-user.c b/home/nipa/nipa_out/1002112/ynl/new-code/nlctrl-user.c index b23c30699ca9..13d5ace04f28 100644 --- a/home/nipa/nipa_out/1002112/ynl/old-code/nlctrl-user.c +++ b/home/nipa/nipa_out/1002112/ynl/new-code/nlctrl-user.c @@ -179,6 +179,7 @@ int nlctrl_mcast_group_attrs_parse(struct ynl_parse_arg *yarg, { struct nlctrl_mcast_group_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; dst->idx = idx; @@ -186,8 +187,6 @@ int nlctrl_mcast_group_attrs_parse(struct ynl_parse_arg *yarg, unsigned int type = ynl_attr_type(attr); if (type == CTRL_ATTR_MCAST_GRP_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -339,9 +338,11 @@ int nlctrl_getfamily_rsp_parse(const struct nlmsghdr *nlh, struct nlctrl_getfamily_rsp *dst; unsigned int n_mcast_groups = 0; const struct nlattr *attr_ops; + const struct nlattr *attr2; const struct nlattr *attr; struct ynl_parse_arg parg; unsigned int n_ops = 0; + unsigned int len; int i; dst = yarg->data; @@ -361,8 +362,6 @@ int nlctrl_getfamily_rsp_parse(const struct nlmsghdr *nlh, dst->_present.family_id = 1; dst->family_id = ynl_attr_get_u16(attr); } else if (type == CTRL_ATTR_FAMILY_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -382,20 +381,16 @@ int nlctrl_getfamily_rsp_parse(const struct nlmsghdr *nlh, dst->_present.maxattr = 1; dst->maxattr = ynl_attr_get_u32(attr); } else if (type == CTRL_ATTR_MCAST_GROUPS) { - const struct nlattr *attr2; - attr_mcast_groups = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) + if (__ynl_attr_validate(yarg, attr2, type)) return YNL_PARSE_CB_ERROR; n_mcast_groups++; } } else if (type == CTRL_ATTR_OPS) { - const struct nlattr *attr2; - attr_ops = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) + if (__ynl_attr_validate(yarg, attr2, type)) return YNL_PARSE_CB_ERROR; n_ops++; } @@ -514,9 +509,13 @@ struct nlctrl_getfamily_list *nlctrl_getfamily_dump(struct ynl_sock *ys) int nlctrl_getpolicy_rsp_parse(const struct nlmsghdr *nlh, struct ynl_parse_arg *yarg) { + const struct nlattr *attr_policy_id, *attr_attr_id; struct nlctrl_getpolicy_rsp *dst; + const struct nlattr *attr_op_id; const struct nlattr *attr; struct ynl_parse_arg parg; + __u32 policy_id, attr_id; + __u32 op_id; dst = yarg->data; parg.ys = yarg->ys; @@ -530,9 +529,6 @@ int nlctrl_getpolicy_rsp_parse(const struct nlmsghdr *nlh, dst->_present.family_id = 1; dst->family_id = ynl_attr_get_u16(attr); } else if (type == CTRL_ATTR_OP_POLICY) { - const struct nlattr *attr_op_id; - __u32 op_id; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; dst->_present.op_policy = 1; @@ -543,9 +539,6 @@ int nlctrl_getpolicy_rsp_parse(const struct nlmsghdr *nlh, op_id = ynl_attr_type(attr_op_id); nlctrl_op_policy_attrs_parse(&parg, attr_op_id, op_id); } else if (type == CTRL_ATTR_POLICY) { - const struct nlattr *attr_policy_id, *attr_attr_id; - __u32 policy_id, attr_id; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; dst->_present.policy = 1; diff --git a/home/nipa/nipa_out/1002112/ynl/old-code/ovpn-user.c b/home/nipa/nipa_out/1002112/ynl/new-code/ovpn-user.c index 553718b6c226..249a1e947c58 100644 --- a/home/nipa/nipa_out/1002112/ynl/old-code/ovpn-user.c +++ b/home/nipa/nipa_out/1002112/ynl/new-code/ovpn-user.c @@ -429,6 +429,7 @@ int ovpn_peer_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) { struct ovpn_peer *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); @@ -444,8 +445,6 @@ int ovpn_peer_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) dst->_present.remote_ipv4 = 1; dst->remote_ipv4 = ynl_attr_get_u32(attr); } else if (type == OVPN_A_PEER_REMOTE_IPV6) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -479,8 +478,6 @@ int ovpn_peer_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) dst->_present.vpn_ipv4 = 1; dst->vpn_ipv4 = ynl_attr_get_u32(attr); } else if (type == OVPN_A_PEER_VPN_IPV6) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -494,8 +491,6 @@ int ovpn_peer_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) dst->_present.local_ipv4 = 1; dst->local_ipv4 = ynl_attr_get_u32(attr); } else if (type == OVPN_A_PEER_LOCAL_IPV6) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; diff --git a/home/nipa/nipa_out/1002112/ynl/old-code/ovs_datapath-user.c b/home/nipa/nipa_out/1002112/ynl/new-code/ovs_datapath-user.c index 3665e18d55ca..82e2e969dc04 100644 --- a/home/nipa/nipa_out/1002112/ynl/old-code/ovs_datapath-user.c +++ b/home/nipa/nipa_out/1002112/ynl/new-code/ovs_datapath-user.c @@ -81,6 +81,7 @@ int ovs_datapath_get_rsp_parse(const struct nlmsghdr *nlh, { struct ovs_datapath_get_rsp *dst; const struct nlattr *attr; + unsigned int len; void *hdr; dst = yarg->data; @@ -92,8 +93,6 @@ int ovs_datapath_get_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == OVS_DP_ATTR_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -108,8 +107,6 @@ int ovs_datapath_get_rsp_parse(const struct nlmsghdr *nlh, dst->_present.upcall_pid = 1; dst->upcall_pid = ynl_attr_get_u32(attr); } else if (type == OVS_DP_ATTR_STATS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -121,8 +118,6 @@ int ovs_datapath_get_rsp_parse(const struct nlmsghdr *nlh, dst->stats = malloc(len); memcpy(dst->stats, ynl_attr_data(attr), len); } else if (type == OVS_DP_ATTR_MEGAFLOW_STATS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -144,8 +139,6 @@ int ovs_datapath_get_rsp_parse(const struct nlmsghdr *nlh, dst->_present.masks_cache_size = 1; dst->masks_cache_size = ynl_attr_get_u32(attr); } else if (type == OVS_DP_ATTR_PER_CPU_PIDS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; diff --git a/home/nipa/nipa_out/1002112/ynl/old-code/ovs_flow-user.c b/home/nipa/nipa_out/1002112/ynl/new-code/ovs_flow-user.c index 28a14c133345..c36c3630cc45 100644 --- a/home/nipa/nipa_out/1002112/ynl/old-code/ovs_flow-user.c +++ b/home/nipa/nipa_out/1002112/ynl/new-code/ovs_flow-user.c @@ -403,13 +403,12 @@ int ovs_flow_ovs_nsh_key_attrs_parse(struct ynl_parse_arg *yarg, { struct ovs_flow_ovs_nsh_key_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == OVS_NSH_KEY_ATTR_BASE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -418,8 +417,6 @@ int ovs_flow_ovs_nsh_key_attrs_parse(struct ynl_parse_arg *yarg, dst->base = malloc(len); memcpy(dst->base, ynl_attr_data(attr), len); } else if (type == OVS_NSH_KEY_ATTR_MD1) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -428,8 +425,6 @@ int ovs_flow_ovs_nsh_key_attrs_parse(struct ynl_parse_arg *yarg, dst->md1 = malloc(len); memcpy(dst->md1, ynl_attr_data(attr), len); } else if (type == OVS_NSH_KEY_ATTR_MD2) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -472,6 +467,7 @@ int ovs_flow_userspace_attrs_parse(struct ynl_parse_arg *yarg, { struct ovs_flow_userspace_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); @@ -482,8 +478,6 @@ int ovs_flow_userspace_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.pid = 1; dst->pid = ynl_attr_get_u32(attr); } else if (type == OVS_USERSPACE_ATTR_USERDATA) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -531,6 +525,7 @@ int ovs_flow_psample_attrs_parse(struct ynl_parse_arg *yarg, { struct ovs_flow_psample_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); @@ -541,8 +536,6 @@ int ovs_flow_psample_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.group = 1; dst->group = ynl_attr_get_u32(attr); } else if (type == OVS_PSAMPLE_ATTR_COOKIE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -633,6 +626,7 @@ int ovs_flow_nat_attrs_parse(struct ynl_parse_arg *yarg, { struct ovs_flow_nat_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); @@ -646,8 +640,6 @@ int ovs_flow_nat_attrs_parse(struct ynl_parse_arg *yarg, return YNL_PARSE_CB_ERROR; dst->_present.dst = 1; } else if (type == OVS_NAT_ATTR_IP_MIN) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -656,8 +648,6 @@ int ovs_flow_nat_attrs_parse(struct ynl_parse_arg *yarg, dst->ip_min = malloc(len); memcpy(dst->ip_min, ynl_attr_data(attr), len); } else if (type == OVS_NAT_ATTR_IP_MAX) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -757,6 +747,7 @@ int ovs_flow_tunnel_key_attrs_parse(struct ynl_parse_arg *yarg, struct ovs_flow_tunnel_key_attrs *dst = yarg->data; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; parg.ys = yarg->ys; @@ -801,8 +792,6 @@ int ovs_flow_tunnel_key_attrs_parse(struct ynl_parse_arg *yarg, return YNL_PARSE_CB_ERROR; dst->_present.oam = 1; } else if (type == OVS_TUNNEL_KEY_ATTR_GENEVE_OPTS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -831,8 +820,6 @@ int ovs_flow_tunnel_key_attrs_parse(struct ynl_parse_arg *yarg, if (ovs_flow_vxlan_ext_attrs_parse(&parg, attr)) return YNL_PARSE_CB_ERROR; } else if (type == OVS_TUNNEL_KEY_ATTR_IPV6_SRC) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -841,8 +828,6 @@ int ovs_flow_tunnel_key_attrs_parse(struct ynl_parse_arg *yarg, dst->ipv6_src = malloc(len); memcpy(dst->ipv6_src, ynl_attr_data(attr), len); } else if (type == OVS_TUNNEL_KEY_ATTR_IPV6_DST) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -851,8 +836,6 @@ int ovs_flow_tunnel_key_attrs_parse(struct ynl_parse_arg *yarg, dst->ipv6_dst = malloc(len); memcpy(dst->ipv6_dst, ynl_attr_data(attr), len); } else if (type == OVS_TUNNEL_KEY_ATTR_PAD) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -861,8 +844,6 @@ int ovs_flow_tunnel_key_attrs_parse(struct ynl_parse_arg *yarg, dst->pad = malloc(len); memcpy(dst->pad, ynl_attr_data(attr), len); } else if (type == OVS_TUNNEL_KEY_ATTR_ERSPAN_OPTS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -924,6 +905,7 @@ int ovs_flow_ct_attrs_parse(struct ynl_parse_arg *yarg, struct ovs_flow_ct_attrs *dst = yarg->data; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; parg.ys = yarg->ys; @@ -940,8 +922,6 @@ int ovs_flow_ct_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.zone = 1; dst->zone = ynl_attr_get_u16(attr); } else if (type == OVS_CT_ATTR_MARK) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -950,8 +930,6 @@ int ovs_flow_ct_attrs_parse(struct ynl_parse_arg *yarg, dst->mark = malloc(len); memcpy(dst->mark, ynl_attr_data(attr), len); } else if (type == OVS_CT_ATTR_LABELS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -960,8 +938,6 @@ int ovs_flow_ct_attrs_parse(struct ynl_parse_arg *yarg, dst->labels = malloc(len); memcpy(dst->labels, ynl_attr_data(attr), len); } else if (type == OVS_CT_ATTR_HELPER) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -989,8 +965,6 @@ int ovs_flow_ct_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.eventmask = 1; dst->eventmask = ynl_attr_get_u32(attr); } else if (type == OVS_CT_ATTR_TIMEOUT) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1111,6 +1085,7 @@ int ovs_flow_key_attrs_parse(struct ynl_parse_arg *yarg, struct ovs_flow_key_attrs *dst = yarg->data; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; parg.ys = yarg->ys; @@ -1137,8 +1112,6 @@ int ovs_flow_key_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.in_port = 1; dst->in_port = ynl_attr_get_u32(attr); } else if (type == OVS_KEY_ATTR_ETHERNET) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1160,8 +1133,6 @@ int ovs_flow_key_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.ethertype = 1; dst->ethertype = ynl_attr_get_u16(attr); } else if (type == OVS_KEY_ATTR_IPV4) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1173,8 +1144,6 @@ int ovs_flow_key_attrs_parse(struct ynl_parse_arg *yarg, dst->ipv4 = malloc(len); memcpy(dst->ipv4, ynl_attr_data(attr), len); } else if (type == OVS_KEY_ATTR_IPV6) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1186,8 +1155,6 @@ int ovs_flow_key_attrs_parse(struct ynl_parse_arg *yarg, dst->ipv6 = malloc(len); memcpy(dst->ipv6, ynl_attr_data(attr), len); } else if (type == OVS_KEY_ATTR_TCP) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1199,8 +1166,6 @@ int ovs_flow_key_attrs_parse(struct ynl_parse_arg *yarg, dst->tcp = malloc(len); memcpy(dst->tcp, ynl_attr_data(attr), len); } else if (type == OVS_KEY_ATTR_UDP) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1212,8 +1177,6 @@ int ovs_flow_key_attrs_parse(struct ynl_parse_arg *yarg, dst->udp = malloc(len); memcpy(dst->udp, ynl_attr_data(attr), len); } else if (type == OVS_KEY_ATTR_ICMP) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1225,8 +1188,6 @@ int ovs_flow_key_attrs_parse(struct ynl_parse_arg *yarg, dst->icmp = malloc(len); memcpy(dst->icmp, ynl_attr_data(attr), len); } else if (type == OVS_KEY_ATTR_ICMPV6) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1238,8 +1199,6 @@ int ovs_flow_key_attrs_parse(struct ynl_parse_arg *yarg, dst->icmpv6 = malloc(len); memcpy(dst->icmpv6, ynl_attr_data(attr), len); } else if (type == OVS_KEY_ATTR_ARP) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1251,8 +1210,6 @@ int ovs_flow_key_attrs_parse(struct ynl_parse_arg *yarg, dst->arp = malloc(len); memcpy(dst->arp, ynl_attr_data(attr), len); } else if (type == OVS_KEY_ATTR_ND) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1278,8 +1235,6 @@ int ovs_flow_key_attrs_parse(struct ynl_parse_arg *yarg, if (ovs_flow_tunnel_key_attrs_parse(&parg, attr)) return YNL_PARSE_CB_ERROR; } else if (type == OVS_KEY_ATTR_SCTP) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1306,8 +1261,6 @@ int ovs_flow_key_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.recirc_id = 1; dst->recirc_id = ynl_attr_get_u32(attr); } else if (type == OVS_KEY_ATTR_MPLS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1334,8 +1287,6 @@ int ovs_flow_key_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.ct_mark = 1; dst->ct_mark = ynl_attr_get_u32(attr); } else if (type == OVS_KEY_ATTR_CT_LABELS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1344,8 +1295,6 @@ int ovs_flow_key_attrs_parse(struct ynl_parse_arg *yarg, dst->ct_labels = malloc(len); memcpy(dst->ct_labels, ynl_attr_data(attr), len); } else if (type == OVS_KEY_ATTR_CT_ORIG_TUPLE_IPV4) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1357,8 +1306,6 @@ int ovs_flow_key_attrs_parse(struct ynl_parse_arg *yarg, dst->ct_orig_tuple_ipv4 = malloc(len); memcpy(dst->ct_orig_tuple_ipv4, ynl_attr_data(attr), len); } else if (type == OVS_KEY_ATTR_CT_ORIG_TUPLE_IPV6) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1381,8 +1328,6 @@ int ovs_flow_key_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.packet_type = 1; dst->packet_type = ynl_attr_get_u32(attr); } else if (type == OVS_KEY_ATTR_ND_EXTENSIONS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1391,8 +1336,6 @@ int ovs_flow_key_attrs_parse(struct ynl_parse_arg *yarg, dst->nd_extensions = malloc(len); memcpy(dst->nd_extensions, ynl_attr_data(attr), len); } else if (type == OVS_KEY_ATTR_TUNNEL_INFO) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1401,8 +1344,6 @@ int ovs_flow_key_attrs_parse(struct ynl_parse_arg *yarg, dst->tunnel_info = malloc(len); memcpy(dst->tunnel_info, ynl_attr_data(attr), len); } else if (type == OVS_KEY_ATTR_IPV6_EXTHDRS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1673,6 +1614,7 @@ int ovs_flow_action_attrs_parse(struct ynl_parse_arg *yarg, struct ovs_flow_action_attrs *dst = yarg->data; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; parg.ys = yarg->ys; @@ -1703,8 +1645,6 @@ int ovs_flow_action_attrs_parse(struct ynl_parse_arg *yarg, if (ovs_flow_key_attrs_parse(&parg, attr)) return YNL_PARSE_CB_ERROR; } else if (type == OVS_ACTION_ATTR_PUSH_VLAN) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1734,8 +1674,6 @@ int ovs_flow_action_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.recirc = 1; dst->recirc = ynl_attr_get_u32(attr); } else if (type == OVS_ACTION_ATTR_HASH) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1747,8 +1685,6 @@ int ovs_flow_action_attrs_parse(struct ynl_parse_arg *yarg, dst->hash = malloc(len); memcpy(dst->hash, ynl_attr_data(attr), len); } else if (type == OVS_ACTION_ATTR_PUSH_MPLS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1788,8 +1724,6 @@ int ovs_flow_action_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.trunc = 1; dst->trunc = ynl_attr_get_u32(attr); } else if (type == OVS_ACTION_ATTR_PUSH_ETH) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1842,8 +1776,6 @@ int ovs_flow_action_attrs_parse(struct ynl_parse_arg *yarg, if (ovs_flow_check_pkt_len_attrs_parse(&parg, attr)) return YNL_PARSE_CB_ERROR; } else if (type == OVS_ACTION_ATTR_ADD_MPLS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1903,6 +1835,7 @@ int ovs_flow_get_rsp_parse(const struct nlmsghdr *nlh, struct ovs_flow_get_rsp *dst; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; void *hdr; dst = yarg->data; @@ -1924,8 +1857,6 @@ int ovs_flow_get_rsp_parse(const struct nlmsghdr *nlh, if (ovs_flow_key_attrs_parse(&parg, attr)) return YNL_PARSE_CB_ERROR; } else if (type == OVS_FLOW_ATTR_UFID) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1943,8 +1874,6 @@ int ovs_flow_get_rsp_parse(const struct nlmsghdr *nlh, if (ovs_flow_key_attrs_parse(&parg, attr)) return YNL_PARSE_CB_ERROR; } else if (type == OVS_FLOW_ATTR_STATS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; diff --git a/home/nipa/nipa_out/1002112/ynl/old-code/ovs_vport-user.c b/home/nipa/nipa_out/1002112/ynl/new-code/ovs_vport-user.c index 346d2ba420af..fe8034ef32a5 100644 --- a/home/nipa/nipa_out/1002112/ynl/old-code/ovs_vport-user.c +++ b/home/nipa/nipa_out/1002112/ynl/new-code/ovs_vport-user.c @@ -238,6 +238,7 @@ int ovs_vport_get_rsp_parse(const struct nlmsghdr *nlh, struct ovs_vport_get_rsp *dst; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; void *hdr; dst = yarg->data; @@ -260,8 +261,6 @@ int ovs_vport_get_rsp_parse(const struct nlmsghdr *nlh, dst->_present.type = 1; dst->type = ynl_attr_get_u32(attr); } else if (type == OVS_VPORT_ATTR_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -271,8 +270,6 @@ int ovs_vport_get_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->name, ynl_attr_get_str(attr), len); dst->name[len] = 0; } else if (type == OVS_VPORT_ATTR_UPCALL_PID) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -282,8 +279,6 @@ int ovs_vport_get_rsp_parse(const struct nlmsghdr *nlh, dst->upcall_pid = malloc(len); memcpy(dst->upcall_pid, ynl_attr_data(attr), len); } else if (type == OVS_VPORT_ATTR_STATS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; diff --git a/home/nipa/nipa_out/1002112/ynl/old-code/rt-addr-user.c b/home/nipa/nipa_out/1002112/ynl/new-code/rt-addr-user.c index 5e366c7e4d96..d96a88a62557 100644 --- a/home/nipa/nipa_out/1002112/ynl/old-code/rt-addr-user.c +++ b/home/nipa/nipa_out/1002112/ynl/new-code/rt-addr-user.c @@ -155,6 +155,7 @@ int rt_addr_getaddr_rsp_parse(const struct nlmsghdr *nlh, { struct rt_addr_getaddr_rsp *dst; const struct nlattr *attr; + unsigned int len; void *hdr; dst = yarg->data; @@ -166,8 +167,6 @@ int rt_addr_getaddr_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == IFA_ADDRESS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -176,8 +175,6 @@ int rt_addr_getaddr_rsp_parse(const struct nlmsghdr *nlh, dst->address = malloc(len); memcpy(dst->address, ynl_attr_data(attr), len); } else if (type == IFA_LABEL) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -187,8 +184,6 @@ int rt_addr_getaddr_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->label, ynl_attr_get_str(attr), len); dst->label[len] = 0; } else if (type == IFA_LOCAL) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -197,8 +192,6 @@ int rt_addr_getaddr_rsp_parse(const struct nlmsghdr *nlh, dst->local = malloc(len); memcpy(dst->local, ynl_attr_data(attr), len); } else if (type == IFA_CACHEINFO) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -290,6 +283,7 @@ int rt_addr_getmulticast_rsp_parse(const struct nlmsghdr *nlh, { struct rt_addr_getmulticast_rsp *dst; const struct nlattr *attr; + unsigned int len; void *hdr; dst = yarg->data; @@ -301,8 +295,6 @@ int rt_addr_getmulticast_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == IFA_MULTICAST) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -311,8 +303,6 @@ int rt_addr_getmulticast_rsp_parse(const struct nlmsghdr *nlh, dst->multicast = malloc(len); memcpy(dst->multicast, ynl_attr_data(attr), len); } else if (type == IFA_CACHEINFO) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; diff --git a/home/nipa/nipa_out/1002112/ynl/old-code/rt-link-user.c b/home/nipa/nipa_out/1002112/ynl/new-code/rt-link-user.c index 2e3f9c698e9b..a404889433d4 100644 --- a/home/nipa/nipa_out/1002112/ynl/old-code/rt-link-user.c +++ b/home/nipa/nipa_out/1002112/ynl/new-code/rt-link-user.c @@ -1292,13 +1292,12 @@ int rt_link_ifla_attrs_parse(struct ynl_parse_arg *yarg, { struct rt_link_ifla_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == IFLA_INET_CONF) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1364,6 +1363,7 @@ int rt_link_ifla6_attrs_parse(struct ynl_parse_arg *yarg, { struct rt_link_ifla6_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); @@ -1374,8 +1374,6 @@ int rt_link_ifla6_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.flags = 1; dst->flags = ynl_attr_get_u32(attr); } else if (type == IFLA_INET6_CONF) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1385,8 +1383,6 @@ int rt_link_ifla6_attrs_parse(struct ynl_parse_arg *yarg, dst->conf = malloc(len); memcpy(dst->conf, ynl_attr_data(attr), len); } else if (type == IFLA_INET6_STATS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1396,8 +1392,6 @@ int rt_link_ifla6_attrs_parse(struct ynl_parse_arg *yarg, dst->stats = malloc(len); memcpy(dst->stats, ynl_attr_data(attr), len); } else if (type == IFLA_INET6_MCAST) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1406,8 +1400,6 @@ int rt_link_ifla6_attrs_parse(struct ynl_parse_arg *yarg, dst->mcast = malloc(len); memcpy(dst->mcast, ynl_attr_data(attr), len); } else if (type == IFLA_INET6_CACHEINFO) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1419,8 +1411,6 @@ int rt_link_ifla6_attrs_parse(struct ynl_parse_arg *yarg, dst->cacheinfo = malloc(len); memcpy(dst->cacheinfo, ynl_attr_data(attr), len); } else if (type == IFLA_INET6_ICMP6STATS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1430,8 +1420,6 @@ int rt_link_ifla6_attrs_parse(struct ynl_parse_arg *yarg, dst->icmp6stats = malloc(len); memcpy(dst->icmp6stats, ynl_attr_data(attr), len); } else if (type == IFLA_INET6_TOKEN) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1654,6 +1642,7 @@ int rt_link_linkinfo_bridge_attrs_parse(struct ynl_parse_arg *yarg, { struct rt_link_linkinfo_bridge_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); @@ -1704,8 +1693,6 @@ int rt_link_linkinfo_bridge_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.group_fwd_mask = 1; dst->group_fwd_mask = ynl_attr_get_u16(attr); } else if (type == IFLA_BR_ROOT_ID) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1717,8 +1704,6 @@ int rt_link_linkinfo_bridge_attrs_parse(struct ynl_parse_arg *yarg, dst->root_id = malloc(len); memcpy(dst->root_id, ynl_attr_data(attr), len); } else if (type == IFLA_BR_BRIDGE_ID) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1770,8 +1755,6 @@ int rt_link_linkinfo_bridge_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.gc_timer = 1; dst->gc_timer = ynl_attr_get_u64(attr); } else if (type == IFLA_BR_GROUP_ADDR) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1780,8 +1763,6 @@ int rt_link_linkinfo_bridge_attrs_parse(struct ynl_parse_arg *yarg, dst->group_addr = malloc(len); memcpy(dst->group_addr, ynl_attr_data(attr), len); } else if (type == IFLA_BR_FDB_FLUSH) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1905,8 +1886,6 @@ int rt_link_linkinfo_bridge_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.vlan_stats_per_port = 1; dst->vlan_stats_per_port = ynl_attr_get_u8(attr); } else if (type == IFLA_BR_MULTI_BOOLOPT) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1918,8 +1897,6 @@ int rt_link_linkinfo_bridge_attrs_parse(struct ynl_parse_arg *yarg, dst->multi_boolopt = malloc(len); memcpy(dst->multi_boolopt, ynl_attr_data(attr), len); } else if (type == IFLA_BR_MCAST_QUERIER_STATE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2014,6 +1991,7 @@ int rt_link_linkinfo_gre_attrs_parse(struct ynl_parse_arg *yarg, { struct rt_link_linkinfo_gre_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); @@ -2044,8 +2022,6 @@ int rt_link_linkinfo_gre_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.okey = 1; dst->okey = ynl_attr_get_u32(attr); } else if (type == IFLA_GRE_LOCAL) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2054,8 +2030,6 @@ int rt_link_linkinfo_gre_attrs_parse(struct ynl_parse_arg *yarg, dst->local = malloc(len); memcpy(dst->local, ynl_attr_data(attr), len); } else if (type == IFLA_GRE_REMOTE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2218,6 +2192,7 @@ int rt_link_linkinfo_gre6_attrs_parse(struct ynl_parse_arg *yarg, { struct rt_link_linkinfo_gre6_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); @@ -2248,8 +2223,6 @@ int rt_link_linkinfo_gre6_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.okey = 1; dst->okey = ynl_attr_get_u32(attr); } else if (type == IFLA_GRE_LOCAL) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2258,8 +2231,6 @@ int rt_link_linkinfo_gre6_attrs_parse(struct ynl_parse_arg *yarg, dst->local = malloc(len); memcpy(dst->local, ynl_attr_data(attr), len); } else if (type == IFLA_GRE_REMOTE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2397,6 +2368,7 @@ int rt_link_linkinfo_geneve_attrs_parse(struct ynl_parse_arg *yarg, { struct rt_link_linkinfo_geneve_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); @@ -2407,8 +2379,6 @@ int rt_link_linkinfo_geneve_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.id = 1; dst->id = ynl_attr_get_u32(attr); } else if (type == IFLA_GENEVE_REMOTE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2436,8 +2406,6 @@ int rt_link_linkinfo_geneve_attrs_parse(struct ynl_parse_arg *yarg, return YNL_PARSE_CB_ERROR; dst->_present.collect_metadata = 1; } else if (type == IFLA_GENEVE_REMOTE6) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2480,8 +2448,6 @@ int rt_link_linkinfo_geneve_attrs_parse(struct ynl_parse_arg *yarg, return YNL_PARSE_CB_ERROR; dst->_present.inner_proto_inherit = 1; } else if (type == IFLA_GENEVE_PORT_RANGE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2564,6 +2530,7 @@ int rt_link_linkinfo_iptun_attrs_parse(struct ynl_parse_arg *yarg, { struct rt_link_linkinfo_iptun_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); @@ -2574,8 +2541,6 @@ int rt_link_linkinfo_iptun_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.link = 1; dst->link = ynl_attr_get_u32(attr); } else if (type == IFLA_IPTUN_LOCAL) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2584,8 +2549,6 @@ int rt_link_linkinfo_iptun_attrs_parse(struct ynl_parse_arg *yarg, dst->local = malloc(len); memcpy(dst->local, ynl_attr_data(attr), len); } else if (type == IFLA_IPTUN_REMOTE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2629,8 +2592,6 @@ int rt_link_linkinfo_iptun_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.pmtudisc = 1; dst->pmtudisc = ynl_attr_get_u8(attr); } else if (type == IFLA_IPTUN_6RD_PREFIX) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2639,8 +2600,6 @@ int rt_link_linkinfo_iptun_attrs_parse(struct ynl_parse_arg *yarg, dst->_6rd_prefix = malloc(len); memcpy(dst->_6rd_prefix, ynl_attr_data(attr), len); } else if (type == IFLA_IPTUN_6RD_RELAY_PREFIX) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2745,6 +2704,7 @@ int rt_link_linkinfo_ip6tnl_attrs_parse(struct ynl_parse_arg *yarg, { struct rt_link_linkinfo_ip6tnl_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); @@ -2755,8 +2715,6 @@ int rt_link_linkinfo_ip6tnl_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.link = 1; dst->link = ynl_attr_get_u32(attr); } else if (type == IFLA_IPTUN_LOCAL) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2765,8 +2723,6 @@ int rt_link_linkinfo_ip6tnl_attrs_parse(struct ynl_parse_arg *yarg, dst->local = malloc(len); memcpy(dst->local, ynl_attr_data(attr), len); } else if (type == IFLA_IPTUN_REMOTE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3001,6 +2957,7 @@ int rt_link_linkinfo_vti_attrs_parse(struct ynl_parse_arg *yarg, { struct rt_link_linkinfo_vti_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); @@ -3021,8 +2978,6 @@ int rt_link_linkinfo_vti_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.okey = 1; dst->okey = ynl_attr_get_u32(attr); } else if (type == IFLA_VTI_LOCAL) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3031,8 +2986,6 @@ int rt_link_linkinfo_vti_attrs_parse(struct ynl_parse_arg *yarg, dst->local = malloc(len); memcpy(dst->local, ynl_attr_data(attr), len); } else if (type == IFLA_VTI_REMOTE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3086,6 +3039,7 @@ int rt_link_linkinfo_vti6_attrs_parse(struct ynl_parse_arg *yarg, { struct rt_link_linkinfo_vti6_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); @@ -3106,8 +3060,6 @@ int rt_link_linkinfo_vti6_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.okey = 1; dst->okey = ynl_attr_get_u32(attr); } else if (type == IFLA_VTI_LOCAL) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3116,8 +3068,6 @@ int rt_link_linkinfo_vti6_attrs_parse(struct ynl_parse_arg *yarg, dst->local = malloc(len); memcpy(dst->local, ynl_attr_data(attr), len); } else if (type == IFLA_VTI_REMOTE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3177,13 +3127,12 @@ int rt_link_linkinfo_netkit_attrs_parse(struct ynl_parse_arg *yarg, { struct rt_link_linkinfo_netkit_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == IFLA_NETKIT_PEER_INFO) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3385,6 +3334,7 @@ int rt_link_linkinfo_brport_attrs_parse(struct ynl_parse_arg *yarg, { struct rt_link_linkinfo_brport_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); @@ -3441,8 +3391,6 @@ int rt_link_linkinfo_brport_attrs_parse(struct ynl_parse_arg *yarg, return YNL_PARSE_CB_ERROR; dst->_present.proxyarp_wifi = 1; } else if (type == IFLA_BRPORT_ROOT_ID) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3454,8 +3402,6 @@ int rt_link_linkinfo_brport_attrs_parse(struct ynl_parse_arg *yarg, dst->root_id = malloc(len); memcpy(dst->root_id, ynl_attr_data(attr), len); } else if (type == IFLA_BRPORT_BRIDGE_ID) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3644,6 +3590,7 @@ int rt_link_bond_slave_attrs_parse(struct ynl_parse_arg *yarg, { struct rt_link_bond_slave_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); @@ -3664,8 +3611,6 @@ int rt_link_bond_slave_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.link_failure_count = 1; dst->link_failure_count = ynl_attr_get_u32(attr); } else if (type == IFLA_BOND_SLAVE_PERM_HWADDR) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3879,6 +3824,7 @@ int rt_link_bond_ad_info_attrs_parse(struct ynl_parse_arg *yarg, { struct rt_link_bond_ad_info_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); @@ -3904,8 +3850,6 @@ int rt_link_bond_ad_info_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.partner_key = 1; dst->partner_key = ynl_attr_get_u16(attr); } else if (type == IFLA_BOND_AD_INFO_PARTNER_MAC) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4058,8 +4002,10 @@ int rt_link_link_offload_xstats_parse(struct ynl_parse_arg *yarg, struct rt_link_link_offload_xstats *dst = yarg->data; const struct nlattr *attr_hw_s_info; unsigned int n_hw_s_info = 0; + const struct nlattr *attr2; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; int i; parg.ys = yarg->ys; @@ -4071,8 +4017,6 @@ int rt_link_link_offload_xstats_parse(struct ynl_parse_arg *yarg, unsigned int type = ynl_attr_type(attr); if (type == IFLA_OFFLOAD_XSTATS_CPU_HIT) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4081,17 +4025,13 @@ int rt_link_link_offload_xstats_parse(struct ynl_parse_arg *yarg, dst->cpu_hit = malloc(len); memcpy(dst->cpu_hit, ynl_attr_data(attr), len); } else if (type == IFLA_OFFLOAD_XSTATS_HW_S_INFO) { - const struct nlattr *attr2; - attr_hw_s_info = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) + if (__ynl_attr_validate(yarg, attr2, type)) return YNL_PARSE_CB_ERROR; n_hw_s_info++; } } else if (type == IFLA_OFFLOAD_XSTATS_L3_STATS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4223,6 +4163,7 @@ int rt_link_vfinfo_attrs_parse(struct ynl_parse_arg *yarg, struct rt_link_vfinfo_attrs *dst = yarg->data; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; parg.ys = yarg->ys; @@ -4230,8 +4171,6 @@ int rt_link_vfinfo_attrs_parse(struct ynl_parse_arg *yarg, unsigned int type = ynl_attr_type(attr); if (type == IFLA_VF_MAC) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4243,8 +4182,6 @@ int rt_link_vfinfo_attrs_parse(struct ynl_parse_arg *yarg, dst->mac = malloc(len); memcpy(dst->mac, ynl_attr_data(attr), len); } else if (type == IFLA_VF_VLAN) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4256,8 +4193,6 @@ int rt_link_vfinfo_attrs_parse(struct ynl_parse_arg *yarg, dst->vlan = malloc(len); memcpy(dst->vlan, ynl_attr_data(attr), len); } else if (type == IFLA_VF_TX_RATE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4269,8 +4204,6 @@ int rt_link_vfinfo_attrs_parse(struct ynl_parse_arg *yarg, dst->tx_rate = malloc(len); memcpy(dst->tx_rate, ynl_attr_data(attr), len); } else if (type == IFLA_VF_SPOOFCHK) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4282,8 +4215,6 @@ int rt_link_vfinfo_attrs_parse(struct ynl_parse_arg *yarg, dst->spoofchk = malloc(len); memcpy(dst->spoofchk, ynl_attr_data(attr), len); } else if (type == IFLA_VF_LINK_STATE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4295,8 +4226,6 @@ int rt_link_vfinfo_attrs_parse(struct ynl_parse_arg *yarg, dst->link_state = malloc(len); memcpy(dst->link_state, ynl_attr_data(attr), len); } else if (type == IFLA_VF_RATE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4308,8 +4237,6 @@ int rt_link_vfinfo_attrs_parse(struct ynl_parse_arg *yarg, dst->rate = malloc(len); memcpy(dst->rate, ynl_attr_data(attr), len); } else if (type == IFLA_VF_RSS_QUERY_EN) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4330,8 +4257,6 @@ int rt_link_vfinfo_attrs_parse(struct ynl_parse_arg *yarg, if (rt_link_vf_stats_attrs_parse(&parg, attr)) return YNL_PARSE_CB_ERROR; } else if (type == IFLA_VF_TRUST) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4343,8 +4268,6 @@ int rt_link_vfinfo_attrs_parse(struct ynl_parse_arg *yarg, dst->trust = malloc(len); memcpy(dst->trust, ynl_attr_data(attr), len); } else if (type == IFLA_VF_IB_NODE_GUID) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4356,8 +4279,6 @@ int rt_link_vfinfo_attrs_parse(struct ynl_parse_arg *yarg, dst->ib_node_guid = malloc(len); memcpy(dst->ib_node_guid, ynl_attr_data(attr), len); } else if (type == IFLA_VF_IB_PORT_GUID) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4378,8 +4299,6 @@ int rt_link_vfinfo_attrs_parse(struct ynl_parse_arg *yarg, if (rt_link_vf_vlan_attrs_parse(&parg, attr)) return YNL_PARSE_CB_ERROR; } else if (type == IFLA_VF_BROADCAST) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4492,8 +4411,10 @@ int rt_link_linkinfo_bond_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *attr_ns_ip6_target; unsigned int n_arp_ip_target = 0; unsigned int n_ns_ip6_target = 0; + const struct nlattr *attr2; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; int i; parg.ys = yarg->ys; @@ -4542,11 +4463,9 @@ int rt_link_linkinfo_bond_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.arp_interval = 1; dst->arp_interval = ynl_attr_get_u32(attr); } else if (type == IFLA_BOND_ARP_IP_TARGET) { - const struct nlattr *attr2; - attr_arp_ip_target = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) + if (__ynl_attr_validate(yarg, attr2, type)) return YNL_PARSE_CB_ERROR; n_arp_ip_target++; } @@ -4640,8 +4559,6 @@ int rt_link_linkinfo_bond_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.ad_user_port_key = 1; dst->ad_user_port_key = ynl_attr_get_u16(attr); } else if (type == IFLA_BOND_AD_ACTOR_SYSTEM) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4670,11 +4587,9 @@ int rt_link_linkinfo_bond_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.missed_max = 1; dst->missed_max = ynl_attr_get_u8(attr); } else if (type == IFLA_BOND_NS_IP6_TARGET) { - const struct nlattr *attr2; - attr_ns_ip6_target = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) + if (__ynl_attr_validate(yarg, attr2, type)) return YNL_PARSE_CB_ERROR; n_ns_ip6_target++; } @@ -4743,6 +4658,7 @@ int rt_link_linkinfo_vlan_attrs_parse(struct ynl_parse_arg *yarg, struct rt_link_linkinfo_vlan_attrs *dst = yarg->data; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; parg.ys = yarg->ys; @@ -4755,8 +4671,6 @@ int rt_link_linkinfo_vlan_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.id = 1; dst->id = ynl_attr_get_u16(attr); } else if (type == IFLA_VLAN_FLAGS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5073,6 +4987,7 @@ int rt_link_linkinfo_attrs_parse(struct ynl_parse_arg *yarg, struct rt_link_linkinfo_attrs *dst = yarg->data; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; parg.ys = yarg->ys; @@ -5080,8 +4995,6 @@ int rt_link_linkinfo_attrs_parse(struct ynl_parse_arg *yarg, unsigned int type = ynl_attr_type(attr); if (type == IFLA_INFO_KIND) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5102,8 +5015,6 @@ int rt_link_linkinfo_attrs_parse(struct ynl_parse_arg *yarg, if (rt_link_linkinfo_data_msg_parse(&parg, dst->kind, attr)) return YNL_PARSE_CB_ERROR; } else if (type == IFLA_INFO_XSTATS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5112,8 +5023,6 @@ int rt_link_linkinfo_attrs_parse(struct ynl_parse_arg *yarg, dst->xstats = malloc(len); memcpy(dst->xstats, ynl_attr_data(attr), len); } else if (type == IFLA_INFO_SLAVE_KIND) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5298,6 +5207,7 @@ int rt_link_getlink_rsp_parse(const struct nlmsghdr *nlh, struct rt_link_getlink_rsp *dst; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; void *hdr; dst = yarg->data; @@ -5310,8 +5220,6 @@ int rt_link_getlink_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == IFLA_ADDRESS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5320,8 +5228,6 @@ int rt_link_getlink_rsp_parse(const struct nlmsghdr *nlh, dst->address = malloc(len); memcpy(dst->address, ynl_attr_data(attr), len); } else if (type == IFLA_BROADCAST) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5330,8 +5236,6 @@ int rt_link_getlink_rsp_parse(const struct nlmsghdr *nlh, dst->broadcast = malloc(len); memcpy(dst->broadcast, ynl_attr_data(attr), len); } else if (type == IFLA_IFNAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5351,8 +5255,6 @@ int rt_link_getlink_rsp_parse(const struct nlmsghdr *nlh, dst->_present.link = 1; dst->link = ynl_attr_get_u32(attr); } else if (type == IFLA_QDISC) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5362,8 +5264,6 @@ int rt_link_getlink_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->qdisc, ynl_attr_get_str(attr), len); dst->qdisc[len] = 0; } else if (type == IFLA_STATS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5375,8 +5275,6 @@ int rt_link_getlink_rsp_parse(const struct nlmsghdr *nlh, dst->stats = malloc(len); memcpy(dst->stats, ynl_attr_data(attr), len); } else if (type == IFLA_COST) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5386,8 +5284,6 @@ int rt_link_getlink_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->cost, ynl_attr_get_str(attr), len); dst->cost[len] = 0; } else if (type == IFLA_PRIORITY) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5402,8 +5298,6 @@ int rt_link_getlink_rsp_parse(const struct nlmsghdr *nlh, dst->_present.master = 1; dst->master = ynl_attr_get_u32(attr); } else if (type == IFLA_WIRELESS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5413,8 +5307,6 @@ int rt_link_getlink_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->wireless, ynl_attr_get_str(attr), len); dst->wireless[len] = 0; } else if (type == IFLA_PROTINFO) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5429,8 +5321,6 @@ int rt_link_getlink_rsp_parse(const struct nlmsghdr *nlh, dst->_present.txqlen = 1; dst->txqlen = ynl_attr_get_u32(attr); } else if (type == IFLA_MAP) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5471,8 +5361,6 @@ int rt_link_getlink_rsp_parse(const struct nlmsghdr *nlh, dst->_present.net_ns_pid = 1; dst->net_ns_pid = ynl_attr_get_u32(attr); } else if (type == IFLA_IFALIAS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5496,8 +5384,6 @@ int rt_link_getlink_rsp_parse(const struct nlmsghdr *nlh, if (rt_link_vfinfo_list_attrs_parse(&parg, attr)) return YNL_PARSE_CB_ERROR; } else if (type == IFLA_STATS64) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5571,8 +5457,6 @@ int rt_link_getlink_rsp_parse(const struct nlmsghdr *nlh, dst->_present.carrier = 1; dst->carrier = ynl_attr_get_u8(attr); } else if (type == IFLA_PHYS_PORT_ID) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5586,8 +5470,6 @@ int rt_link_getlink_rsp_parse(const struct nlmsghdr *nlh, dst->_present.carrier_changes = 1; dst->carrier_changes = ynl_attr_get_u32(attr); } else if (type == IFLA_PHYS_SWITCH_ID) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5601,8 +5483,6 @@ int rt_link_getlink_rsp_parse(const struct nlmsghdr *nlh, dst->_present.link_netnsid = 1; dst->link_netnsid = ynl_attr_get_s32(attr); } else if (type == IFLA_PHYS_PORT_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5685,8 +5565,6 @@ int rt_link_getlink_rsp_parse(const struct nlmsghdr *nlh, if (rt_link_prop_list_link_attrs_parse(&parg, attr)) return YNL_PARSE_CB_ERROR; } else if (type == IFLA_PERM_ADDRESS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5695,8 +5573,6 @@ int rt_link_getlink_rsp_parse(const struct nlmsghdr *nlh, dst->perm_address = malloc(len); memcpy(dst->perm_address, ynl_attr_data(attr), len); } else if (type == IFLA_PROTO_DOWN_REASON) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5706,8 +5582,6 @@ int rt_link_getlink_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->proto_down_reason, ynl_attr_get_str(attr), len); dst->proto_down_reason[len] = 0; } else if (type == IFLA_PARENT_DEV_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5717,8 +5591,6 @@ int rt_link_getlink_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->parent_dev_name, ynl_attr_get_str(attr), len); dst->parent_dev_name[len] = 0; } else if (type == IFLA_PARENT_DEV_BUS_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5748,8 +5620,6 @@ int rt_link_getlink_rsp_parse(const struct nlmsghdr *nlh, dst->_present.allmulti = 1; dst->allmulti = ynl_attr_get_u32(attr); } else if (type == IFLA_DEVLINK_PORT) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -6145,6 +6015,7 @@ int rt_link_getstats_rsp_parse(const struct nlmsghdr *nlh, struct rt_link_getstats_rsp *dst; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; void *hdr; dst = yarg->data; @@ -6157,8 +6028,6 @@ int rt_link_getstats_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == IFLA_STATS_LINK_64) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -6170,8 +6039,6 @@ int rt_link_getstats_rsp_parse(const struct nlmsghdr *nlh, dst->link_64 = malloc(len); memcpy(dst->link_64, ynl_attr_data(attr), len); } else if (type == IFLA_STATS_LINK_XSTATS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -6180,8 +6047,6 @@ int rt_link_getstats_rsp_parse(const struct nlmsghdr *nlh, dst->link_xstats = malloc(len); memcpy(dst->link_xstats, ynl_attr_data(attr), len); } else if (type == IFLA_STATS_LINK_XSTATS_SLAVE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -6199,8 +6064,6 @@ int rt_link_getstats_rsp_parse(const struct nlmsghdr *nlh, if (rt_link_link_offload_xstats_parse(&parg, attr)) return YNL_PARSE_CB_ERROR; } else if (type == IFLA_STATS_AF_SPEC) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; diff --git a/home/nipa/nipa_out/1002112/ynl/old-code/rt-neigh-user.c b/home/nipa/nipa_out/1002112/ynl/new-code/rt-neigh-user.c index d1ace927962b..a7b3edef39cf 100644 --- a/home/nipa/nipa_out/1002112/ynl/old-code/rt-neigh-user.c +++ b/home/nipa/nipa_out/1002112/ynl/new-code/rt-neigh-user.c @@ -443,6 +443,7 @@ int rt_neigh_getneigh_rsp_parse(const struct nlmsghdr *nlh, { struct rt_neigh_getneigh_rsp *dst; const struct nlattr *attr; + unsigned int len; void *hdr; dst = yarg->data; @@ -454,8 +455,6 @@ int rt_neigh_getneigh_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == NDA_DST) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -464,8 +463,6 @@ int rt_neigh_getneigh_rsp_parse(const struct nlmsghdr *nlh, dst->dst = malloc(len); memcpy(dst->dst, ynl_attr_data(attr), len); } else if (type == NDA_LLADDR) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -519,8 +516,6 @@ int rt_neigh_getneigh_rsp_parse(const struct nlmsghdr *nlh, dst->_present.flags_ext = 1; dst->flags_ext = ynl_attr_get_u32(attr); } else if (type == NDA_FDB_EXT_ATTRS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -651,6 +646,7 @@ int rt_neigh_getneightbl_rsp_parse(const struct nlmsghdr *nlh, struct rt_neigh_getneightbl_rsp *dst; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; void *hdr; dst = yarg->data; @@ -663,8 +659,6 @@ int rt_neigh_getneightbl_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == NDTA_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -689,8 +683,6 @@ int rt_neigh_getneightbl_rsp_parse(const struct nlmsghdr *nlh, dst->_present.thresh3 = 1; dst->thresh3 = ynl_attr_get_u32(attr); } else if (type == NDTA_CONFIG) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -711,8 +703,6 @@ int rt_neigh_getneightbl_rsp_parse(const struct nlmsghdr *nlh, if (rt_neigh_ndtpa_attrs_parse(&parg, attr)) return YNL_PARSE_CB_ERROR; } else if (type == NDTA_STATS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; diff --git a/home/nipa/nipa_out/1002112/ynl/old-code/rt-route-user.c b/home/nipa/nipa_out/1002112/ynl/new-code/rt-route-user.c index 96a59cf00a3e..d01a2eb07c38 100644 --- a/home/nipa/nipa_out/1002112/ynl/old-code/rt-route-user.c +++ b/home/nipa/nipa_out/1002112/ynl/new-code/rt-route-user.c @@ -167,6 +167,7 @@ int rt_route_metrics_parse(struct ynl_parse_arg *yarg, { struct rt_route_metrics *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); @@ -247,8 +248,6 @@ int rt_route_metrics_parse(struct ynl_parse_arg *yarg, dst->_present.quickack = 1; dst->quickack = ynl_attr_get_u32(attr); } else if (type == RTAX_CC_ALGO) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -300,6 +299,7 @@ int rt_route_getroute_rsp_parse(const struct nlmsghdr *nlh, struct rt_route_getroute_rsp *dst; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; void *hdr; dst = yarg->data; @@ -312,8 +312,6 @@ int rt_route_getroute_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == RTA_DST) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -322,8 +320,6 @@ int rt_route_getroute_rsp_parse(const struct nlmsghdr *nlh, dst->dst = malloc(len); memcpy(dst->dst, ynl_attr_data(attr), len); } else if (type == RTA_SRC) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -342,8 +338,6 @@ int rt_route_getroute_rsp_parse(const struct nlmsghdr *nlh, dst->_present.oif = 1; dst->oif = ynl_attr_get_u32(attr); } else if (type == RTA_GATEWAY) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -357,8 +351,6 @@ int rt_route_getroute_rsp_parse(const struct nlmsghdr *nlh, dst->_present.priority = 1; dst->priority = ynl_attr_get_u32(attr); } else if (type == RTA_PREFSRC) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -376,8 +368,6 @@ int rt_route_getroute_rsp_parse(const struct nlmsghdr *nlh, if (rt_route_metrics_parse(&parg, attr)) return YNL_PARSE_CB_ERROR; } else if (type == RTA_MULTIPATH) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -391,8 +381,6 @@ int rt_route_getroute_rsp_parse(const struct nlmsghdr *nlh, dst->_present.flow = 1; dst->flow = ynl_attr_get_u32(attr); } else if (type == RTA_CACHEINFO) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -414,8 +402,6 @@ int rt_route_getroute_rsp_parse(const struct nlmsghdr *nlh, dst->_present.mark = 1; dst->mark = ynl_attr_get_u32(attr); } else if (type == RTA_MFC_STATS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -424,8 +410,6 @@ int rt_route_getroute_rsp_parse(const struct nlmsghdr *nlh, dst->mfc_stats = malloc(len); memcpy(dst->mfc_stats, ynl_attr_data(attr), len); } else if (type == RTA_VIA) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -434,8 +418,6 @@ int rt_route_getroute_rsp_parse(const struct nlmsghdr *nlh, dst->via = malloc(len); memcpy(dst->via, ynl_attr_data(attr), len); } else if (type == RTA_NEWDST) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -454,8 +436,6 @@ int rt_route_getroute_rsp_parse(const struct nlmsghdr *nlh, dst->_present.encap_type = 1; dst->encap_type = ynl_attr_get_u16(attr); } else if (type == RTA_ENCAP) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -469,8 +449,6 @@ int rt_route_getroute_rsp_parse(const struct nlmsghdr *nlh, dst->_present.expires = 1; dst->expires = ynl_attr_get_u32(attr); } else if (type == RTA_PAD) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; diff --git a/home/nipa/nipa_out/1002112/ynl/old-code/rt-rule-user.c b/home/nipa/nipa_out/1002112/ynl/new-code/rt-rule-user.c index c44ac5cb1846..7e6e005d91bf 100644 --- a/home/nipa/nipa_out/1002112/ynl/old-code/rt-rule-user.c +++ b/home/nipa/nipa_out/1002112/ynl/new-code/rt-rule-user.c @@ -255,6 +255,7 @@ int rt_rule_getrule_rsp_parse(const struct nlmsghdr *nlh, { struct rt_rule_getrule_rsp *dst; const struct nlattr *attr; + unsigned int len; void *hdr; dst = yarg->data; @@ -266,8 +267,6 @@ int rt_rule_getrule_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == FRA_IIFNAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -277,8 +276,6 @@ int rt_rule_getrule_rsp_parse(const struct nlmsghdr *nlh, memcpy(dst->iifname, ynl_attr_get_str(attr), len); dst->iifname[len] = 0; } else if (type == FRA_OIFNAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -338,8 +335,6 @@ int rt_rule_getrule_rsp_parse(const struct nlmsghdr *nlh, dst->_present.l3mdev = 1; dst->l3mdev = ynl_attr_get_u8(attr); } else if (type == FRA_UID_RANGE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -361,8 +356,6 @@ int rt_rule_getrule_rsp_parse(const struct nlmsghdr *nlh, dst->_present.ip_proto = 1; dst->ip_proto = ynl_attr_get_u8(attr); } else if (type == FRA_SPORT_RANGE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -374,8 +367,6 @@ int rt_rule_getrule_rsp_parse(const struct nlmsghdr *nlh, dst->sport_range = malloc(len); memcpy(dst->sport_range, ynl_attr_data(attr), len); } else if (type == FRA_DPORT_RANGE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; diff --git a/home/nipa/nipa_out/1002112/ynl/old-code/tc-user.c b/home/nipa/nipa_out/1002112/ynl/new-code/tc-user.c index 2989196c8bb2..49b38c58c572 100644 --- a/home/nipa/nipa_out/1002112/ynl/old-code/tc-user.c +++ b/home/nipa/nipa_out/1002112/ynl/new-code/tc-user.c @@ -1736,13 +1736,12 @@ int tc_tca_stab_attrs_parse(struct ynl_parse_arg *yarg, { struct tc_tca_stab_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == TCA_STAB_BASE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1754,8 +1753,6 @@ int tc_tca_stab_attrs_parse(struct ynl_parse_arg *yarg, dst->base = malloc(len); memcpy(dst->base, ynl_attr_data(attr), len); } else if (type == TCA_STAB_DATA) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1940,13 +1937,12 @@ int tc_cbs_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) { struct tc_cbs_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == TCA_CBS_PARMS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -1991,13 +1987,12 @@ int tc_choke_attrs_parse(struct ynl_parse_arg *yarg, { struct tc_choke_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == TCA_CHOKE_PARMS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2009,8 +2004,6 @@ int tc_choke_attrs_parse(struct ynl_parse_arg *yarg, dst->parms = malloc(len); memcpy(dst->parms, ynl_attr_data(attr), len); } else if (type == TCA_CHOKE_STAB) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2287,13 +2280,12 @@ int tc_etf_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) { struct tc_etf_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == TCA_ETF_PARMS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2368,6 +2360,7 @@ int tc_fq_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) { struct tc_fq_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); @@ -2448,8 +2441,6 @@ int tc_fq_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) dst->_present.horizon_drop = 1; dst->horizon_drop = ynl_attr_get_u8(attr); } else if (type == TCA_FQ_PRIOMAP) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2461,8 +2452,6 @@ int tc_fq_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) dst->priomap = malloc(len); memcpy(dst->priomap, ynl_attr_data(attr), len); } else if (type == TCA_FQ_WEIGHTS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2815,13 +2804,12 @@ int tc_htb_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) { struct tc_htb_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == TCA_HTB_PARMS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2833,8 +2821,6 @@ int tc_htb_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) dst->parms = malloc(len); memcpy(dst->parms, ynl_attr_data(attr), len); } else if (type == TCA_HTB_INIT) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2846,8 +2832,6 @@ int tc_htb_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) dst->init = malloc(len); memcpy(dst->init, ynl_attr_data(attr), len); } else if (type == TCA_HTB_CTAB) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -2856,8 +2840,6 @@ int tc_htb_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) dst->ctab = malloc(len); memcpy(dst->ctab, ynl_attr_data(attr), len); } else if (type == TCA_HTB_RTAB) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3051,13 +3033,12 @@ int tc_red_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) { struct tc_red_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == TCA_RED_PARMS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3069,8 +3050,6 @@ int tc_red_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) dst->parms = malloc(len); memcpy(dst->parms, ynl_attr_data(attr), len); } else if (type == TCA_RED_STAB) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3140,13 +3119,12 @@ int tc_tbf_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) { struct tc_tbf_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == TCA_TBF_PARMS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3158,8 +3136,6 @@ int tc_tbf_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) dst->parms = malloc(len); memcpy(dst->parms, ynl_attr_data(attr), len); } else if (type == TCA_TBF_RTAB) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3168,8 +3144,6 @@ int tc_tbf_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) dst->rtab = malloc(len); memcpy(dst->rtab, ynl_attr_data(attr), len); } else if (type == TCA_TBF_PTAB) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3229,13 +3203,12 @@ int tc_ematch_attrs_parse(struct ynl_parse_arg *yarg, { struct tc_ematch_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == TCA_EMATCH_TREE_HDR) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3247,8 +3220,6 @@ int tc_ematch_attrs_parse(struct ynl_parse_arg *yarg, dst->tree_hdr = malloc(len); memcpy(dst->tree_hdr, ynl_attr_data(attr), len); } else if (type == TCA_EMATCH_TREE_LIST) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3306,13 +3277,12 @@ int tc_police_attrs_parse(struct ynl_parse_arg *yarg, { struct tc_police_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == TCA_POLICE_TBF) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3324,8 +3294,6 @@ int tc_police_attrs_parse(struct ynl_parse_arg *yarg, dst->tbf = malloc(len); memcpy(dst->tbf, ynl_attr_data(attr), len); } else if (type == TCA_POLICE_RATE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3334,8 +3302,6 @@ int tc_police_attrs_parse(struct ynl_parse_arg *yarg, dst->rate = malloc(len); memcpy(dst->rate, ynl_attr_data(attr), len); } else if (type == TCA_POLICE_PEAKRATE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3354,8 +3320,6 @@ int tc_police_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.result = 1; dst->result = ynl_attr_get_u32(attr); } else if (type == TCA_POLICE_TM) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3529,13 +3493,12 @@ int tc_netem_loss_attrs_parse(struct ynl_parse_arg *yarg, { struct tc_netem_loss_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == NETEM_LOSS_GI) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3547,8 +3510,6 @@ int tc_netem_loss_attrs_parse(struct ynl_parse_arg *yarg, dst->gi = malloc(len); memcpy(dst->gi, ynl_attr_data(attr), len); } else if (type == NETEM_LOSS_GE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -3903,6 +3864,7 @@ int tc_flower_key_enc_opt_geneve_attrs_parse(struct ynl_parse_arg *yarg, { struct tc_flower_key_enc_opt_geneve_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); @@ -3918,8 +3880,6 @@ int tc_flower_key_enc_opt_geneve_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.type = 1; dst->type = ynl_attr_get_u8(attr); } else if (type == TCA_FLOWER_KEY_ENC_OPT_GENEVE_DATA) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4228,13 +4188,12 @@ int tc_act_bpf_attrs_parse(struct ynl_parse_arg *yarg, { struct tc_act_bpf_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == TCA_ACT_BPF_TM) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4246,8 +4205,6 @@ int tc_act_bpf_attrs_parse(struct ynl_parse_arg *yarg, dst->tm = malloc(len); memcpy(dst->tm, ynl_attr_data(attr), len); } else if (type == TCA_ACT_BPF_PARMS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4261,8 +4218,6 @@ int tc_act_bpf_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.ops_len = 1; dst->ops_len = ynl_attr_get_u16(attr); } else if (type == TCA_ACT_BPF_OPS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4276,8 +4231,6 @@ int tc_act_bpf_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.fd = 1; dst->fd = ynl_attr_get_u32(attr); } else if (type == TCA_ACT_BPF_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4287,8 +4240,6 @@ int tc_act_bpf_attrs_parse(struct ynl_parse_arg *yarg, memcpy(dst->name, ynl_attr_get_str(attr), len); dst->name[len] = 0; } else if (type == TCA_ACT_BPF_TAG) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4297,8 +4248,6 @@ int tc_act_bpf_attrs_parse(struct ynl_parse_arg *yarg, dst->tag = malloc(len); memcpy(dst->tag, ynl_attr_data(attr), len); } else if (type == TCA_ACT_BPF_ID) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4338,13 +4287,12 @@ int tc_act_connmark_attrs_parse(struct ynl_parse_arg *yarg, { struct tc_act_connmark_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == TCA_CONNMARK_PARMS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4353,8 +4301,6 @@ int tc_act_connmark_attrs_parse(struct ynl_parse_arg *yarg, dst->parms = malloc(len); memcpy(dst->parms, ynl_attr_data(attr), len); } else if (type == TCA_CONNMARK_TM) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4397,13 +4343,12 @@ int tc_act_csum_attrs_parse(struct ynl_parse_arg *yarg, { struct tc_act_csum_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == TCA_CSUM_PARMS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4412,8 +4357,6 @@ int tc_act_csum_attrs_parse(struct ynl_parse_arg *yarg, dst->parms = malloc(len); memcpy(dst->parms, ynl_attr_data(attr), len); } else if (type == TCA_CSUM_TM) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4491,13 +4434,12 @@ int tc_act_ct_attrs_parse(struct ynl_parse_arg *yarg, { struct tc_act_ct_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == TCA_CT_PARMS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4506,8 +4448,6 @@ int tc_act_ct_attrs_parse(struct ynl_parse_arg *yarg, dst->parms = malloc(len); memcpy(dst->parms, ynl_attr_data(attr), len); } else if (type == TCA_CT_TM) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4539,8 +4479,6 @@ int tc_act_ct_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.mark_mask = 1; dst->mark_mask = ynl_attr_get_u32(attr); } else if (type == TCA_CT_LABELS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4549,8 +4487,6 @@ int tc_act_ct_attrs_parse(struct ynl_parse_arg *yarg, dst->labels = malloc(len); memcpy(dst->labels, ynl_attr_data(attr), len); } else if (type == TCA_CT_LABELS_MASK) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4569,8 +4505,6 @@ int tc_act_ct_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.nat_ipv4_max = 1; dst->nat_ipv4_max = ynl_attr_get_u32(attr); } else if (type == TCA_CT_NAT_IPV6_MIN) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4579,8 +4513,6 @@ int tc_act_ct_attrs_parse(struct ynl_parse_arg *yarg, dst->nat_ipv6_min = malloc(len); memcpy(dst->nat_ipv6_min, ynl_attr_data(attr), len); } else if (type == TCA_CT_NAT_IPV6_MAX) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4599,8 +4531,6 @@ int tc_act_ct_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.nat_port_max = 1; dst->nat_port_max = ynl_attr_get_u16(attr); } else if (type == TCA_CT_HELPER_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4665,13 +4595,12 @@ int tc_act_ctinfo_attrs_parse(struct ynl_parse_arg *yarg, { struct tc_act_ctinfo_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == TCA_CTINFO_TM) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4683,8 +4612,6 @@ int tc_act_ctinfo_attrs_parse(struct ynl_parse_arg *yarg, dst->tm = malloc(len); memcpy(dst->tm, ynl_attr_data(attr), len); } else if (type == TCA_CTINFO_ACT) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4762,13 +4689,12 @@ int tc_act_gact_attrs_parse(struct ynl_parse_arg *yarg, { struct tc_act_gact_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == TCA_GACT_TM) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4780,8 +4706,6 @@ int tc_act_gact_attrs_parse(struct ynl_parse_arg *yarg, dst->tm = malloc(len); memcpy(dst->tm, ynl_attr_data(attr), len); } else if (type == TCA_GACT_PARMS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4793,8 +4717,6 @@ int tc_act_gact_attrs_parse(struct ynl_parse_arg *yarg, dst->parms = malloc(len); memcpy(dst->parms, ynl_attr_data(attr), len); } else if (type == TCA_GACT_PROB) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4852,13 +4774,12 @@ int tc_act_gate_attrs_parse(struct ynl_parse_arg *yarg, { struct tc_act_gate_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == TCA_GATE_TM) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4870,8 +4791,6 @@ int tc_act_gate_attrs_parse(struct ynl_parse_arg *yarg, dst->tm = malloc(len); memcpy(dst->tm, ynl_attr_data(attr), len); } else if (type == TCA_GATE_PARMS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4885,8 +4804,6 @@ int tc_act_gate_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.priority = 1; dst->priority = ynl_attr_get_s32(attr); } else if (type == TCA_GATE_ENTRY_LIST) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4962,13 +4879,12 @@ int tc_act_ife_attrs_parse(struct ynl_parse_arg *yarg, { struct tc_act_ife_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == TCA_IFE_PARMS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4977,8 +4893,6 @@ int tc_act_ife_attrs_parse(struct ynl_parse_arg *yarg, dst->parms = malloc(len); memcpy(dst->parms, ynl_attr_data(attr), len); } else if (type == TCA_IFE_TM) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -4990,8 +4904,6 @@ int tc_act_ife_attrs_parse(struct ynl_parse_arg *yarg, dst->tm = malloc(len); memcpy(dst->tm, ynl_attr_data(attr), len); } else if (type == TCA_IFE_DMAC) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5000,8 +4912,6 @@ int tc_act_ife_attrs_parse(struct ynl_parse_arg *yarg, dst->dmac = malloc(len); memcpy(dst->dmac, ynl_attr_data(attr), len); } else if (type == TCA_IFE_SMAC) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5015,8 +4925,6 @@ int tc_act_ife_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.type = 1; dst->type = ynl_attr_get_u16(attr); } else if (type == TCA_IFE_METALST) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5059,13 +4967,12 @@ int tc_act_mirred_attrs_parse(struct ynl_parse_arg *yarg, { struct tc_act_mirred_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == TCA_MIRRED_TM) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5077,8 +4984,6 @@ int tc_act_mirred_attrs_parse(struct ynl_parse_arg *yarg, dst->tm = malloc(len); memcpy(dst->tm, ynl_attr_data(attr), len); } else if (type == TCA_MIRRED_PARMS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5087,8 +4992,6 @@ int tc_act_mirred_attrs_parse(struct ynl_parse_arg *yarg, dst->parms = malloc(len); memcpy(dst->parms, ynl_attr_data(attr), len); } else if (type == TCA_MIRRED_BLOCKID) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5138,13 +5041,12 @@ int tc_act_mpls_attrs_parse(struct ynl_parse_arg *yarg, { struct tc_act_mpls_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == TCA_MPLS_TM) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5156,8 +5058,6 @@ int tc_act_mpls_attrs_parse(struct ynl_parse_arg *yarg, dst->tm = malloc(len); memcpy(dst->tm, ynl_attr_data(attr), len); } else if (type == TCA_MPLS_PARMS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5225,13 +5125,12 @@ int tc_act_nat_attrs_parse(struct ynl_parse_arg *yarg, { struct tc_act_nat_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == TCA_NAT_PARMS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5240,8 +5139,6 @@ int tc_act_nat_attrs_parse(struct ynl_parse_arg *yarg, dst->parms = malloc(len); memcpy(dst->parms, ynl_attr_data(attr), len); } else if (type == TCA_NAT_TM) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5293,13 +5190,12 @@ int tc_act_pedit_attrs_parse(struct ynl_parse_arg *yarg, { struct tc_act_pedit_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == TCA_PEDIT_TM) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5311,8 +5207,6 @@ int tc_act_pedit_attrs_parse(struct ynl_parse_arg *yarg, dst->tm = malloc(len); memcpy(dst->tm, ynl_attr_data(attr), len); } else if (type == TCA_PEDIT_PARMS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5324,8 +5218,6 @@ int tc_act_pedit_attrs_parse(struct ynl_parse_arg *yarg, dst->parms = malloc(len); memcpy(dst->parms, ynl_attr_data(attr), len); } else if (type == TCA_PEDIT_PARMS_EX) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5334,8 +5226,6 @@ int tc_act_pedit_attrs_parse(struct ynl_parse_arg *yarg, dst->parms_ex = malloc(len); memcpy(dst->parms_ex, ynl_attr_data(attr), len); } else if (type == TCA_PEDIT_KEYS_EX) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5344,8 +5234,6 @@ int tc_act_pedit_attrs_parse(struct ynl_parse_arg *yarg, dst->keys_ex = malloc(len); memcpy(dst->keys_ex, ynl_attr_data(attr), len); } else if (type == TCA_PEDIT_KEY_EX) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5391,13 +5279,12 @@ int tc_act_sample_attrs_parse(struct ynl_parse_arg *yarg, { struct tc_act_sample_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == TCA_SAMPLE_TM) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5409,8 +5296,6 @@ int tc_act_sample_attrs_parse(struct ynl_parse_arg *yarg, dst->tm = malloc(len); memcpy(dst->tm, ynl_attr_data(attr), len); } else if (type == TCA_SAMPLE_PARMS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5471,13 +5356,12 @@ int tc_act_simple_attrs_parse(struct ynl_parse_arg *yarg, { struct tc_act_simple_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == TCA_DEF_TM) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5489,8 +5373,6 @@ int tc_act_simple_attrs_parse(struct ynl_parse_arg *yarg, dst->tm = malloc(len); memcpy(dst->tm, ynl_attr_data(attr), len); } else if (type == TCA_DEF_PARMS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5499,8 +5381,6 @@ int tc_act_simple_attrs_parse(struct ynl_parse_arg *yarg, dst->parms = malloc(len); memcpy(dst->parms, ynl_attr_data(attr), len); } else if (type == TCA_DEF_DATA) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5554,13 +5434,12 @@ int tc_act_skbedit_attrs_parse(struct ynl_parse_arg *yarg, { struct tc_act_skbedit_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == TCA_SKBEDIT_TM) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5572,8 +5451,6 @@ int tc_act_skbedit_attrs_parse(struct ynl_parse_arg *yarg, dst->tm = malloc(len); memcpy(dst->tm, ynl_attr_data(attr), len); } else if (type == TCA_SKBEDIT_PARMS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5657,13 +5534,12 @@ int tc_act_skbmod_attrs_parse(struct ynl_parse_arg *yarg, { struct tc_act_skbmod_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == TCA_SKBMOD_TM) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5675,8 +5551,6 @@ int tc_act_skbmod_attrs_parse(struct ynl_parse_arg *yarg, dst->tm = malloc(len); memcpy(dst->tm, ynl_attr_data(attr), len); } else if (type == TCA_SKBMOD_PARMS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5685,8 +5559,6 @@ int tc_act_skbmod_attrs_parse(struct ynl_parse_arg *yarg, dst->parms = malloc(len); memcpy(dst->parms, ynl_attr_data(attr), len); } else if (type == TCA_SKBMOD_DMAC) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5695,8 +5567,6 @@ int tc_act_skbmod_attrs_parse(struct ynl_parse_arg *yarg, dst->dmac = malloc(len); memcpy(dst->dmac, ynl_attr_data(attr), len); } else if (type == TCA_SKBMOD_SMAC) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5705,8 +5575,6 @@ int tc_act_skbmod_attrs_parse(struct ynl_parse_arg *yarg, dst->smac = malloc(len); memcpy(dst->smac, ynl_attr_data(attr), len); } else if (type == TCA_SKBMOD_ETYPE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5771,13 +5639,12 @@ int tc_act_tunnel_key_attrs_parse(struct ynl_parse_arg *yarg, { struct tc_act_tunnel_key_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == TCA_TUNNEL_KEY_TM) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5789,8 +5656,6 @@ int tc_act_tunnel_key_attrs_parse(struct ynl_parse_arg *yarg, dst->tm = malloc(len); memcpy(dst->tm, ynl_attr_data(attr), len); } else if (type == TCA_TUNNEL_KEY_PARMS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5809,8 +5674,6 @@ int tc_act_tunnel_key_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.enc_ipv4_dst = 1; dst->enc_ipv4_dst = ynl_attr_get_u32(attr); } else if (type == TCA_TUNNEL_KEY_ENC_IPV6_SRC) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5819,8 +5682,6 @@ int tc_act_tunnel_key_attrs_parse(struct ynl_parse_arg *yarg, dst->enc_ipv6_src = malloc(len); memcpy(dst->enc_ipv6_src, ynl_attr_data(attr), len); } else if (type == TCA_TUNNEL_KEY_ENC_IPV6_DST) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5844,8 +5705,6 @@ int tc_act_tunnel_key_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.no_csum = 1; dst->no_csum = ynl_attr_get_u8(attr); } else if (type == TCA_TUNNEL_KEY_ENC_OPTS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5911,13 +5770,12 @@ int tc_act_vlan_attrs_parse(struct ynl_parse_arg *yarg, { struct tc_act_vlan_attrs *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == TCA_VLAN_TM) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5929,8 +5787,6 @@ int tc_act_vlan_attrs_parse(struct ynl_parse_arg *yarg, dst->tm = malloc(len); memcpy(dst->tm, ynl_attr_data(attr), len); } else if (type == TCA_VLAN_PARMS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5957,8 +5813,6 @@ int tc_act_vlan_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.push_vlan_priority = 1; dst->push_vlan_priority = ynl_attr_get_u8(attr); } else if (type == TCA_VLAN_PUSH_ETH_DST) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -5967,8 +5821,6 @@ int tc_act_vlan_attrs_parse(struct ynl_parse_arg *yarg, dst->push_eth_dst = malloc(len); memcpy(dst->push_eth_dst, ynl_attr_data(attr), len); } else if (type == TCA_VLAN_PUSH_ETH_SRC) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -6030,6 +5882,7 @@ int tc_flow_attrs_parse(struct ynl_parse_arg *yarg, struct tc_flow_attrs *dst = yarg->data; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; parg.ys = yarg->ys; @@ -6077,8 +5930,6 @@ int tc_flow_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.divisor = 1; dst->divisor = ynl_attr_get_u32(attr); } else if (type == TCA_FLOW_ACT) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -6096,8 +5947,6 @@ int tc_flow_attrs_parse(struct ynl_parse_arg *yarg, if (tc_police_attrs_parse(&parg, attr)) return YNL_PARSE_CB_ERROR; } else if (type == TCA_FLOW_EMATCHES) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -6181,6 +6030,7 @@ int tc_netem_attrs_parse(struct ynl_parse_arg *yarg, struct tc_netem_attrs *dst = yarg->data; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; void *hdr; parg.ys = yarg->ys; @@ -6192,8 +6042,6 @@ int tc_netem_attrs_parse(struct ynl_parse_arg *yarg, unsigned int type = ynl_attr_type(attr); if (type == TCA_NETEM_CORR) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -6205,8 +6053,6 @@ int tc_netem_attrs_parse(struct ynl_parse_arg *yarg, dst->corr = malloc(len); memcpy(dst->corr, ynl_attr_data(attr), len); } else if (type == TCA_NETEM_DELAY_DIST) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -6216,8 +6062,6 @@ int tc_netem_attrs_parse(struct ynl_parse_arg *yarg, dst->delay_dist = malloc(len); memcpy(dst->delay_dist, ynl_attr_data(attr), len); } else if (type == TCA_NETEM_REORDER) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -6229,8 +6073,6 @@ int tc_netem_attrs_parse(struct ynl_parse_arg *yarg, dst->reorder = malloc(len); memcpy(dst->reorder, ynl_attr_data(attr), len); } else if (type == TCA_NETEM_CORRUPT) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -6251,8 +6093,6 @@ int tc_netem_attrs_parse(struct ynl_parse_arg *yarg, if (tc_netem_loss_attrs_parse(&parg, attr)) return YNL_PARSE_CB_ERROR; } else if (type == TCA_NETEM_RATE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -6289,8 +6129,6 @@ int tc_netem_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.jitter64 = 1; dst->jitter64 = ynl_attr_get_s64(attr); } else if (type == TCA_NETEM_SLOT) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -6302,8 +6140,6 @@ int tc_netem_attrs_parse(struct ynl_parse_arg *yarg, dst->slot = malloc(len); memcpy(dst->slot, ynl_attr_data(attr), len); } else if (type == TCA_NETEM_SLOT_DIST) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -6379,6 +6215,7 @@ int tc_cake_stats_attrs_parse(struct ynl_parse_arg *yarg, struct tc_cake_stats_attrs *dst = yarg->data; const struct nlattr *attr_tin_stats; unsigned int n_tin_stats = 0; + const struct nlattr *attr2; const struct nlattr *attr; struct ynl_parse_arg parg; int i; @@ -6432,11 +6269,9 @@ int tc_cake_stats_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.max_adjlen = 1; dst->max_adjlen = ynl_attr_get_u32(attr); } else if (type == TCA_CAKE_STATS_TIN_STATS) { - const struct nlattr *attr2; - attr_tin_stats = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) + if (__ynl_attr_validate(yarg, attr2, type)) return YNL_PARSE_CB_ERROR; n_tin_stats++; } @@ -7091,6 +6926,7 @@ int tc_tca_stats_attrs_parse(struct ynl_parse_arg *yarg, struct tc_tca_stats_attrs *dst = yarg->data; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; parg.ys = yarg->ys; @@ -7098,8 +6934,6 @@ int tc_tca_stats_attrs_parse(struct ynl_parse_arg *yarg, unsigned int type = ynl_attr_type(attr); if (type == TCA_STATS_BASIC) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -7111,8 +6945,6 @@ int tc_tca_stats_attrs_parse(struct ynl_parse_arg *yarg, dst->basic = malloc(len); memcpy(dst->basic, ynl_attr_data(attr), len); } else if (type == TCA_STATS_RATE_EST) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -7124,8 +6956,6 @@ int tc_tca_stats_attrs_parse(struct ynl_parse_arg *yarg, dst->rate_est = malloc(len); memcpy(dst->rate_est, ynl_attr_data(attr), len); } else if (type == TCA_STATS_QUEUE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -7148,8 +6978,6 @@ int tc_tca_stats_attrs_parse(struct ynl_parse_arg *yarg, if (tc_tca_stats_app_msg_parse(&parg, _sel_kind, attr)) return YNL_PARSE_CB_ERROR; } else if (type == TCA_STATS_RATE_EST64) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -7161,8 +6989,6 @@ int tc_tca_stats_attrs_parse(struct ynl_parse_arg *yarg, dst->rate_est64 = malloc(len); memcpy(dst->rate_est64, ynl_attr_data(attr), len); } else if (type == TCA_STATS_BASIC_HW) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -7227,6 +7053,7 @@ int tc_gred_attrs_parse(struct ynl_parse_arg *yarg, struct tc_gred_attrs *dst = yarg->data; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; parg.ys = yarg->ys; @@ -7234,8 +7061,6 @@ int tc_gred_attrs_parse(struct ynl_parse_arg *yarg, unsigned int type = ynl_attr_type(attr); if (type == TCA_GRED_PARMS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -7244,8 +7069,6 @@ int tc_gred_attrs_parse(struct ynl_parse_arg *yarg, dst->parms = malloc(len); memcpy(dst->parms, ynl_attr_data(attr), len); } else if (type == TCA_GRED_STAB) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -7255,8 +7078,6 @@ int tc_gred_attrs_parse(struct ynl_parse_arg *yarg, dst->stab = malloc(len); memcpy(dst->stab, ynl_attr_data(attr), len); } else if (type == TCA_GRED_DPS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -7268,8 +7089,6 @@ int tc_gred_attrs_parse(struct ynl_parse_arg *yarg, dst->dps = malloc(len); memcpy(dst->dps, ynl_attr_data(attr), len); } else if (type == TCA_GRED_MAX_P) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -7346,6 +7165,7 @@ int tc_taprio_attrs_parse(struct ynl_parse_arg *yarg, struct tc_taprio_attrs *dst = yarg->data; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; parg.ys = yarg->ys; @@ -7353,8 +7173,6 @@ int tc_taprio_attrs_parse(struct ynl_parse_arg *yarg, unsigned int type = ynl_attr_type(attr); if (type == TCA_TAPRIO_ATTR_PRIOMAP) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -7394,8 +7212,6 @@ int tc_taprio_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.sched_clockid = 1; dst->sched_clockid = ynl_attr_get_s32(attr); } else if (type == TCA_TAPRIO_ATTR_ADMIN_SCHED) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -7481,6 +7297,7 @@ int tc_act_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested, struct tc_act_attrs *dst = yarg->data; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; parg.ys = yarg->ys; @@ -7490,8 +7307,6 @@ int tc_act_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested, unsigned int type = ynl_attr_type(attr); if (type == TCA_ACT_KIND) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -7526,8 +7341,6 @@ int tc_act_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested, if (tc_tca_stats_attrs_parse(&parg, attr, dst->kind)) return YNL_PARSE_CB_ERROR; } else if (type == TCA_ACT_COOKIE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -7599,9 +7412,11 @@ int tc_basic_attrs_parse(struct ynl_parse_arg *yarg, { struct tc_basic_attrs *dst = yarg->data; const struct nlattr *attr_act; + const struct nlattr *attr2; const struct nlattr *attr; struct ynl_parse_arg parg; unsigned int n_act = 0; + unsigned int len; int i; parg.ys = yarg->ys; @@ -7627,11 +7442,9 @@ int tc_basic_attrs_parse(struct ynl_parse_arg *yarg, if (tc_ematch_attrs_parse(&parg, attr)) return YNL_PARSE_CB_ERROR; } else if (type == TCA_BASIC_ACT) { - const struct nlattr *attr2; - attr_act = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) + if (__ynl_attr_validate(yarg, attr2, type)) return YNL_PARSE_CB_ERROR; n_act++; } @@ -7645,8 +7458,6 @@ int tc_basic_attrs_parse(struct ynl_parse_arg *yarg, if (tc_police_attrs_parse(&parg, attr)) return YNL_PARSE_CB_ERROR; } else if (type == TCA_BASIC_PCNT) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -7726,9 +7537,11 @@ int tc_bpf_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) { struct tc_bpf_attrs *dst = yarg->data; const struct nlattr *attr_act; + const struct nlattr *attr2; const struct nlattr *attr; struct ynl_parse_arg parg; unsigned int n_act = 0; + unsigned int len; int i; parg.ys = yarg->ys; @@ -7740,11 +7553,9 @@ int tc_bpf_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) unsigned int type = ynl_attr_type(attr); if (type == TCA_BPF_ACT) { - const struct nlattr *attr2; - attr_act = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) + if (__ynl_attr_validate(yarg, attr2, type)) return YNL_PARSE_CB_ERROR; n_act++; } @@ -7768,8 +7579,6 @@ int tc_bpf_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) dst->_present.ops_len = 1; dst->ops_len = ynl_attr_get_u16(attr); } else if (type == TCA_BPF_OPS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -7783,8 +7592,6 @@ int tc_bpf_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) dst->_present.fd = 1; dst->fd = ynl_attr_get_u32(attr); } else if (type == TCA_BPF_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -7804,8 +7611,6 @@ int tc_bpf_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) dst->_present.flags_gen = 1; dst->flags_gen = ynl_attr_get_u32(attr); } else if (type == TCA_BPF_TAG) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -7870,9 +7675,11 @@ int tc_cgroup_attrs_parse(struct ynl_parse_arg *yarg, { struct tc_cgroup_attrs *dst = yarg->data; const struct nlattr *attr_act; + const struct nlattr *attr2; const struct nlattr *attr; struct ynl_parse_arg parg; unsigned int n_act = 0; + unsigned int len; int i; parg.ys = yarg->ys; @@ -7884,11 +7691,9 @@ int tc_cgroup_attrs_parse(struct ynl_parse_arg *yarg, unsigned int type = ynl_attr_type(attr); if (type == TCA_CGROUP_ACT) { - const struct nlattr *attr2; - attr_act = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) + if (__ynl_attr_validate(yarg, attr2, type)) return YNL_PARSE_CB_ERROR; n_act++; } @@ -7902,8 +7707,6 @@ int tc_cgroup_attrs_parse(struct ynl_parse_arg *yarg, if (tc_police_attrs_parse(&parg, attr)) return YNL_PARSE_CB_ERROR; } else if (type == TCA_CGROUP_EMATCHES) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -8200,9 +8003,11 @@ int tc_flower_attrs_parse(struct ynl_parse_arg *yarg, { struct tc_flower_attrs *dst = yarg->data; const struct nlattr *attr_act; + const struct nlattr *attr2; const struct nlattr *attr; struct ynl_parse_arg parg; unsigned int n_act = 0; + unsigned int len; int i; parg.ys = yarg->ys; @@ -8219,8 +8024,6 @@ int tc_flower_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.classid = 1; dst->classid = ynl_attr_get_u32(attr); } else if (type == TCA_FLOWER_INDEV) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -8230,17 +8033,13 @@ int tc_flower_attrs_parse(struct ynl_parse_arg *yarg, memcpy(dst->indev, ynl_attr_get_str(attr), len); dst->indev[len] = 0; } else if (type == TCA_FLOWER_ACT) { - const struct nlattr *attr2; - attr_act = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) + if (__ynl_attr_validate(yarg, attr2, type)) return YNL_PARSE_CB_ERROR; n_act++; } } else if (type == TCA_FLOWER_KEY_ETH_DST) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -8249,8 +8048,6 @@ int tc_flower_attrs_parse(struct ynl_parse_arg *yarg, dst->key_eth_dst = malloc(len); memcpy(dst->key_eth_dst, ynl_attr_data(attr), len); } else if (type == TCA_FLOWER_KEY_ETH_DST_MASK) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -8259,8 +8056,6 @@ int tc_flower_attrs_parse(struct ynl_parse_arg *yarg, dst->key_eth_dst_mask = malloc(len); memcpy(dst->key_eth_dst_mask, ynl_attr_data(attr), len); } else if (type == TCA_FLOWER_KEY_ETH_SRC) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -8269,8 +8064,6 @@ int tc_flower_attrs_parse(struct ynl_parse_arg *yarg, dst->key_eth_src = malloc(len); memcpy(dst->key_eth_src, ynl_attr_data(attr), len); } else if (type == TCA_FLOWER_KEY_ETH_SRC_MASK) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -8309,8 +8102,6 @@ int tc_flower_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.key_ipv4_dst_mask = 1; dst->key_ipv4_dst_mask = ynl_attr_get_u32(attr); } else if (type == TCA_FLOWER_KEY_IPV6_SRC) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -8319,8 +8110,6 @@ int tc_flower_attrs_parse(struct ynl_parse_arg *yarg, dst->key_ipv6_src = malloc(len); memcpy(dst->key_ipv6_src, ynl_attr_data(attr), len); } else if (type == TCA_FLOWER_KEY_IPV6_SRC_MASK) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -8329,8 +8118,6 @@ int tc_flower_attrs_parse(struct ynl_parse_arg *yarg, dst->key_ipv6_src_mask = malloc(len); memcpy(dst->key_ipv6_src_mask, ynl_attr_data(attr), len); } else if (type == TCA_FLOWER_KEY_IPV6_DST) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -8339,8 +8126,6 @@ int tc_flower_attrs_parse(struct ynl_parse_arg *yarg, dst->key_ipv6_dst = malloc(len); memcpy(dst->key_ipv6_dst, ynl_attr_data(attr), len); } else if (type == TCA_FLOWER_KEY_IPV6_DST_MASK) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -8414,8 +8199,6 @@ int tc_flower_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.key_enc_ipv4_dst_mask = 1; dst->key_enc_ipv4_dst_mask = ynl_attr_get_u32(attr); } else if (type == TCA_FLOWER_KEY_ENC_IPV6_SRC) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -8424,8 +8207,6 @@ int tc_flower_attrs_parse(struct ynl_parse_arg *yarg, dst->key_enc_ipv6_src = malloc(len); memcpy(dst->key_enc_ipv6_src, ynl_attr_data(attr), len); } else if (type == TCA_FLOWER_KEY_ENC_IPV6_SRC_MASK) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -8434,8 +8215,6 @@ int tc_flower_attrs_parse(struct ynl_parse_arg *yarg, dst->key_enc_ipv6_src_mask = malloc(len); memcpy(dst->key_enc_ipv6_src_mask, ynl_attr_data(attr), len); } else if (type == TCA_FLOWER_KEY_ENC_IPV6_DST) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -8444,8 +8223,6 @@ int tc_flower_attrs_parse(struct ynl_parse_arg *yarg, dst->key_enc_ipv6_dst = malloc(len); memcpy(dst->key_enc_ipv6_dst, ynl_attr_data(attr), len); } else if (type == TCA_FLOWER_KEY_ENC_IPV6_DST_MASK) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -8594,8 +8371,6 @@ int tc_flower_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.key_arp_op_mask = 1; dst->key_arp_op_mask = ynl_attr_get_u8(attr); } else if (type == TCA_FLOWER_KEY_ARP_SHA) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -8604,8 +8379,6 @@ int tc_flower_attrs_parse(struct ynl_parse_arg *yarg, dst->key_arp_sha = malloc(len); memcpy(dst->key_arp_sha, ynl_attr_data(attr), len); } else if (type == TCA_FLOWER_KEY_ARP_SHA_MASK) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -8614,8 +8387,6 @@ int tc_flower_attrs_parse(struct ynl_parse_arg *yarg, dst->key_arp_sha_mask = malloc(len); memcpy(dst->key_arp_sha_mask, ynl_attr_data(attr), len); } else if (type == TCA_FLOWER_KEY_ARP_THA) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -8624,8 +8395,6 @@ int tc_flower_attrs_parse(struct ynl_parse_arg *yarg, dst->key_arp_tha = malloc(len); memcpy(dst->key_arp_tha, ynl_attr_data(attr), len); } else if (type == TCA_FLOWER_KEY_ARP_THA_MASK) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -8792,8 +8561,6 @@ int tc_flower_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.key_ct_mark_mask = 1; dst->key_ct_mark_mask = ynl_attr_get_u32(attr); } else if (type == TCA_FLOWER_KEY_CT_LABELS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -8802,8 +8569,6 @@ int tc_flower_attrs_parse(struct ynl_parse_arg *yarg, dst->key_ct_labels = malloc(len); memcpy(dst->key_ct_labels, ynl_attr_data(attr), len); } else if (type == TCA_FLOWER_KEY_CT_LABELS_MASK) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -8939,9 +8704,11 @@ int tc_fw_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) { struct tc_fw_attrs *dst = yarg->data; const struct nlattr *attr_act; + const struct nlattr *attr2; const struct nlattr *attr; struct ynl_parse_arg parg; unsigned int n_act = 0; + unsigned int len; int i; parg.ys = yarg->ys; @@ -8967,8 +8734,6 @@ int tc_fw_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) if (tc_police_attrs_parse(&parg, attr)) return YNL_PARSE_CB_ERROR; } else if (type == TCA_FW_INDEV) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -8978,11 +8743,9 @@ int tc_fw_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) memcpy(dst->indev, ynl_attr_get_str(attr), len); dst->indev[len] = 0; } else if (type == TCA_FW_ACT) { - const struct nlattr *attr2; - attr_act = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) + if (__ynl_attr_validate(yarg, attr2, type)) return YNL_PARSE_CB_ERROR; n_act++; } @@ -9044,9 +8807,11 @@ int tc_matchall_attrs_parse(struct ynl_parse_arg *yarg, { struct tc_matchall_attrs *dst = yarg->data; const struct nlattr *attr_act; + const struct nlattr *attr2; const struct nlattr *attr; struct ynl_parse_arg parg; unsigned int n_act = 0; + unsigned int len; int i; parg.ys = yarg->ys; @@ -9063,11 +8828,9 @@ int tc_matchall_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.classid = 1; dst->classid = ynl_attr_get_u32(attr); } else if (type == TCA_MATCHALL_ACT) { - const struct nlattr *attr2; - attr_act = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) + if (__ynl_attr_validate(yarg, attr2, type)) return YNL_PARSE_CB_ERROR; n_act++; } @@ -9077,8 +8840,6 @@ int tc_matchall_attrs_parse(struct ynl_parse_arg *yarg, dst->_present.flags = 1; dst->flags = ynl_attr_get_u32(attr); } else if (type == TCA_MATCHALL_PCNT) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -9146,6 +8907,7 @@ int tc_route_attrs_parse(struct ynl_parse_arg *yarg, { struct tc_route_attrs *dst = yarg->data; const struct nlattr *attr_act; + const struct nlattr *attr2; const struct nlattr *attr; struct ynl_parse_arg parg; unsigned int n_act = 0; @@ -9189,11 +8951,9 @@ int tc_route_attrs_parse(struct ynl_parse_arg *yarg, if (tc_police_attrs_parse(&parg, attr)) return YNL_PARSE_CB_ERROR; } else if (type == TCA_ROUTE4_ACT) { - const struct nlattr *attr2; - attr_act = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) + if (__ynl_attr_validate(yarg, attr2, type)) return YNL_PARSE_CB_ERROR; n_act++; } @@ -9267,9 +9027,11 @@ int tc_u32_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) { struct tc_u32_attrs *dst = yarg->data; const struct nlattr *attr_act; + const struct nlattr *attr2; const struct nlattr *attr; struct ynl_parse_arg parg; unsigned int n_act = 0; + unsigned int len; int i; parg.ys = yarg->ys; @@ -9301,8 +9063,6 @@ int tc_u32_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) dst->_present.divisor = 1; dst->divisor = ynl_attr_get_u32(attr); } else if (type == TCA_U32_SEL) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -9323,17 +9083,13 @@ int tc_u32_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) if (tc_police_attrs_parse(&parg, attr)) return YNL_PARSE_CB_ERROR; } else if (type == TCA_U32_ACT) { - const struct nlattr *attr2; - attr_act = attr; ynl_attr_for_each_nested(attr2, attr) { - if (ynl_attr_validate(yarg, attr2)) + if (__ynl_attr_validate(yarg, attr2, type)) return YNL_PARSE_CB_ERROR; n_act++; } } else if (type == TCA_U32_INDEV) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -9343,8 +9099,6 @@ int tc_u32_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) memcpy(dst->indev, ynl_attr_get_str(attr), len); dst->indev[len] = 0; } else if (type == TCA_U32_PCNT) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -9356,8 +9110,6 @@ int tc_u32_attrs_parse(struct ynl_parse_arg *yarg, const struct nlattr *nested) dst->pcnt = malloc(len); memcpy(dst->pcnt, ynl_attr_data(attr), len); } else if (type == TCA_U32_MARK) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -10027,6 +9779,7 @@ int tc_getqdisc_rsp_parse(const struct nlmsghdr *nlh, struct tc_getqdisc_rsp *dst; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; void *hdr; dst = yarg->data; @@ -10039,8 +9792,6 @@ int tc_getqdisc_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == TCA_KIND) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -10061,8 +9812,6 @@ int tc_getqdisc_rsp_parse(const struct nlmsghdr *nlh, if (tc_options_msg_parse(&parg, dst->kind, attr)) return YNL_PARSE_CB_ERROR; } else if (type == TCA_STATS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -10085,8 +9834,6 @@ int tc_getqdisc_rsp_parse(const struct nlmsghdr *nlh, if (tc_tca_stats_app_msg_parse(&parg, dst->kind, attr)) return YNL_PARSE_CB_ERROR; } else if (type == TCA_RATE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -10343,6 +10090,7 @@ int tc_gettclass_rsp_parse(const struct nlmsghdr *nlh, struct tc_gettclass_rsp *dst; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; void *hdr; dst = yarg->data; @@ -10355,8 +10103,6 @@ int tc_gettclass_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == TCA_KIND) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -10377,8 +10123,6 @@ int tc_gettclass_rsp_parse(const struct nlmsghdr *nlh, if (tc_options_msg_parse(&parg, dst->kind, attr)) return YNL_PARSE_CB_ERROR; } else if (type == TCA_STATS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -10401,8 +10145,6 @@ int tc_gettclass_rsp_parse(const struct nlmsghdr *nlh, if (tc_tca_stats_app_msg_parse(&parg, dst->kind, attr)) return YNL_PARSE_CB_ERROR; } else if (type == TCA_RATE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -10600,6 +10342,7 @@ int tc_gettfilter_rsp_parse(const struct nlmsghdr *nlh, struct tc_gettfilter_rsp *dst; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; void *hdr; dst = yarg->data; @@ -10612,8 +10355,6 @@ int tc_gettfilter_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == TCA_KIND) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -10634,8 +10375,6 @@ int tc_gettfilter_rsp_parse(const struct nlmsghdr *nlh, if (tc_options_msg_parse(&parg, dst->kind, attr)) return YNL_PARSE_CB_ERROR; } else if (type == TCA_STATS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -10658,8 +10397,6 @@ int tc_gettfilter_rsp_parse(const struct nlmsghdr *nlh, if (tc_tca_stats_app_msg_parse(&parg, dst->kind, attr)) return YNL_PARSE_CB_ERROR; } else if (type == TCA_RATE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -10923,6 +10660,7 @@ int tc_getchain_rsp_parse(const struct nlmsghdr *nlh, struct tc_getchain_rsp *dst; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; void *hdr; dst = yarg->data; @@ -10935,8 +10673,6 @@ int tc_getchain_rsp_parse(const struct nlmsghdr *nlh, unsigned int type = ynl_attr_type(attr); if (type == TCA_KIND) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -10957,8 +10693,6 @@ int tc_getchain_rsp_parse(const struct nlmsghdr *nlh, if (tc_options_msg_parse(&parg, dst->kind, attr)) return YNL_PARSE_CB_ERROR; } else if (type == TCA_STATS) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -10981,8 +10715,6 @@ int tc_getchain_rsp_parse(const struct nlmsghdr *nlh, if (tc_tca_stats_app_msg_parse(&parg, dst->kind, attr)) return YNL_PARSE_CB_ERROR; } else if (type == TCA_RATE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; diff --git a/home/nipa/nipa_out/1002112/ynl/old-code/tcp_metrics-user.c b/home/nipa/nipa_out/1002112/ynl/new-code/tcp_metrics-user.c index 857f96220f4f..366752074bd1 100644 --- a/home/nipa/nipa_out/1002112/ynl/old-code/tcp_metrics-user.c +++ b/home/nipa/nipa_out/1002112/ynl/new-code/tcp_metrics-user.c @@ -140,6 +140,7 @@ int tcp_metrics_get_rsp_parse(const struct nlmsghdr *nlh, struct tcp_metrics_get_rsp *dst; const struct nlattr *attr; struct ynl_parse_arg parg; + unsigned int len; dst = yarg->data; parg.ys = yarg->ys; @@ -153,8 +154,6 @@ int tcp_metrics_get_rsp_parse(const struct nlmsghdr *nlh, dst->_present.addr_ipv4 = 1; dst->addr_ipv4 = ynl_attr_get_u32(attr); } else if (type == TCP_METRICS_ATTR_ADDR_IPV6) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -168,8 +167,6 @@ int tcp_metrics_get_rsp_parse(const struct nlmsghdr *nlh, dst->_present.saddr_ipv4 = 1; dst->saddr_ipv4 = ynl_attr_get_u32(attr); } else if (type == TCP_METRICS_ATTR_SADDR_IPV6) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -207,8 +204,6 @@ int tcp_metrics_get_rsp_parse(const struct nlmsghdr *nlh, dst->_present.fopen_syn_drop_ts = 1; dst->fopen_syn_drop_ts = ynl_attr_get_u64(attr); } else if (type == TCP_METRICS_ATTR_FOPEN_COOKIE) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; diff --git a/home/nipa/nipa_out/1002112/ynl/old-code/team-user.c b/home/nipa/nipa_out/1002112/ynl/new-code/team-user.c index 9d79584ae3a1..fd59e453b63d 100644 --- a/home/nipa/nipa_out/1002112/ynl/old-code/team-user.c +++ b/home/nipa/nipa_out/1002112/ynl/new-code/team-user.c @@ -126,13 +126,12 @@ int team_attr_option_parse(struct ynl_parse_arg *yarg, { struct team_attr_option *dst = yarg->data; const struct nlattr *attr; + unsigned int len; ynl_attr_for_each_nested(attr, nested) { unsigned int type = ynl_attr_type(attr); if (type == TEAM_ATTR_OPTION_NAME) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR; @@ -151,8 +150,6 @@ int team_attr_option_parse(struct ynl_parse_arg *yarg, dst->_present.type = 1; dst->type = ynl_attr_get_u8(attr); } else if (type == TEAM_ATTR_OPTION_DATA) { - unsigned int len; - if (ynl_attr_validate(yarg, attr)) return YNL_PARSE_CB_ERROR;