tools: ynl: regen: regenerate the if ladders

Renegate the code to combine } and else and use tmp variable
to store type.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/tools/net/ynl/generated/devlink-user.c b/tools/net/ynl/generated/devlink-user.c
index 4604b68..939bd45 100644 (file)
--- a/tools/net/ynl/generated/devlink-user.c
+++ b/tools/net/ynl/generated/devlink-user.c
@@ -126,7 +126,9 @@ int devlink_dl_info_version_parse(struct ynl_parse_arg *yarg,
        const struct nlattr *attr;
 
        mnl_attr_for_each_nested(attr, nested) {
-               if (mnl_attr_get_type(attr) == DEVLINK_ATTR_INFO_VERSION_NAME) {
+               unsigned int type = mnl_attr_get_type(attr);
+
+               if (type == DEVLINK_ATTR_INFO_VERSION_NAME) {
                        unsigned int len;
 
                        if (ynl_attr_validate(yarg, attr))
@@ -137,8 +139,7 @@ int devlink_dl_info_version_parse(struct ynl_parse_arg *yarg,
                        dst->info_version_name = malloc(len + 1);
                        memcpy(dst->info_version_name, mnl_attr_get_str(attr), len);
                        dst->info_version_name[len] = 0;
-               }
-               else if (mnl_attr_get_type(attr) == DEVLINK_ATTR_INFO_VERSION_VALUE) {
+               } else if (type == DEVLINK_ATTR_INFO_VERSION_VALUE) {
                        unsigned int len;
 
                        if (ynl_attr_validate(yarg, attr))
@@ -167,13 +168,14 @@ int devlink_dl_reload_stats_entry_parse(struct ynl_parse_arg *yarg,
        const struct nlattr *attr;
 
        mnl_attr_for_each_nested(attr, nested) {
-               if (mnl_attr_get_type(attr) == DEVLINK_ATTR_RELOAD_STATS_LIMIT) {
+               unsigned int type = mnl_attr_get_type(attr);
+
+               if (type == DEVLINK_ATTR_RELOAD_STATS_LIMIT) {
                        if (ynl_attr_validate(yarg, attr))
                                return MNL_CB_ERROR;
                        dst->_present.reload_stats_limit = 1;
                        dst->reload_stats_limit = mnl_attr_get_u8(attr);
-               }
-               else if (mnl_attr_get_type(attr) == DEVLINK_ATTR_RELOAD_STATS_VALUE) {
+               } else if (type == DEVLINK_ATTR_RELOAD_STATS_VALUE) {
                        if (ynl_attr_validate(yarg, attr))
                                return MNL_CB_ERROR;
                        dst->_present.reload_stats_value = 1;
@@ -208,7 +210,9 @@ int devlink_dl_reload_act_stats_parse(struct ynl_parse_arg *yarg,
                return ynl_error_parse(yarg, "attribute already present (dl-reload-act-stats.reload-stats-entry)");
 
        mnl_attr_for_each_nested(attr, nested) {
-               if (mnl_attr_get_type(attr) == DEVLINK_ATTR_RELOAD_STATS_ENTRY) {
+               unsigned int type = mnl_attr_get_type(attr);
+
+               if (type == DEVLINK_ATTR_RELOAD_STATS_ENTRY) {
                        n_reload_stats_entry++;
                }
        }
@@ -255,13 +259,14 @@ int devlink_dl_reload_act_info_parse(struct ynl_parse_arg *yarg,
                return ynl_error_parse(yarg, "attribute already present (dl-reload-act-info.reload-action-stats)");
 
        mnl_attr_for_each_nested(attr, nested) {
-               if (mnl_attr_get_type(attr) == DEVLINK_ATTR_RELOAD_ACTION) {
+               unsigned int type = mnl_attr_get_type(attr);
+
+               if (type == DEVLINK_ATTR_RELOAD_ACTION) {
                        if (ynl_attr_validate(yarg, attr))
                                return MNL_CB_ERROR;
                        dst->_present.reload_action = 1;
                        dst->reload_action = mnl_attr_get_u8(attr);
-               }
-               else if (mnl_attr_get_type(attr) == DEVLINK_ATTR_RELOAD_ACTION_STATS) {
+               } else if (type == DEVLINK_ATTR_RELOAD_ACTION_STATS) {
                        n_reload_action_stats++;
                }
        }
@@ -308,7 +313,9 @@ int devlink_dl_reload_stats_parse(struct ynl_parse_arg *yarg,
                return ynl_error_parse(yarg, "attribute already present (dl-reload-stats.reload-action-info)");
 
        mnl_attr_for_each_nested(attr, nested) {
-               if (mnl_attr_get_type(attr) == DEVLINK_ATTR_RELOAD_ACTION_INFO) {
+               unsigned int type = mnl_attr_get_type(attr);
+
+               if (type == DEVLINK_ATTR_RELOAD_ACTION_INFO) {
                        n_reload_action_info++;
                }
        }
@@ -347,7 +354,9 @@ int devlink_dl_dev_stats_parse(struct ynl_parse_arg *yarg,
        parg.ys = yarg->ys;
 
        mnl_attr_for_each_nested(attr, nested) {
-               if (mnl_attr_get_type(attr) == DEVLINK_ATTR_RELOAD_STATS) {
+               unsigned int type = mnl_attr_get_type(attr);
+
+               if (type == DEVLINK_ATTR_RELOAD_STATS) {
                        if (ynl_attr_validate(yarg, attr))
                                return MNL_CB_ERROR;
                        dst->_present.reload_stats = 1;
@@ -356,8 +365,7 @@ int devlink_dl_dev_stats_parse(struct ynl_parse_arg *yarg,
                        parg.data = &dst->reload_stats;
                        if (devlink_dl_reload_stats_parse(&parg, attr))
                                return MNL_CB_ERROR;
-               }
-               else if (mnl_attr_get_type(attr) == DEVLINK_ATTR_REMOTE_RELOAD_STATS) {
+               } else if (type == DEVLINK_ATTR_REMOTE_RELOAD_STATS) {
                        if (ynl_attr_validate(yarg, attr))
                                return MNL_CB_ERROR;
                        dst->_present.remote_reload_stats = 1;
@@ -400,7 +408,9 @@ int devlink_get_rsp_parse(const struct nlmsghdr *nlh, void *data)
        parg.ys = yarg->ys;
 
        mnl_attr_for_each(attr, nlh, sizeof(struct genlmsghdr)) {
-               if (mnl_attr_get_type(attr) == DEVLINK_ATTR_BUS_NAME) {
+               unsigned int type = mnl_attr_get_type(attr);
+
+               if (type == DEVLINK_ATTR_BUS_NAME) {
                        unsigned int len;
 
                        if (ynl_attr_validate(yarg, attr))
@@ -411,8 +421,7 @@ int devlink_get_rsp_parse(const struct nlmsghdr *nlh, void *data)
                        dst->bus_name = malloc(len + 1);
                        memcpy(dst->bus_name, mnl_attr_get_str(attr), len);
                        dst->bus_name[len] = 0;
-               }
-               else if (mnl_attr_get_type(attr) == DEVLINK_ATTR_DEV_NAME) {
+               } else if (type == DEVLINK_ATTR_DEV_NAME) {
                        unsigned int len;
 
                        if (ynl_attr_validate(yarg, attr))
@@ -423,20 +432,17 @@ int devlink_get_rsp_parse(const struct nlmsghdr *nlh, void *data)
                        dst->dev_name = malloc(len + 1);
                        memcpy(dst->dev_name, mnl_attr_get_str(attr), len);
                        dst->dev_name[len] = 0;
-               }
-               else if (mnl_attr_get_type(attr) == DEVLINK_ATTR_RELOAD_FAILED) {
+               } else if (type == DEVLINK_ATTR_RELOAD_FAILED) {
                        if (ynl_attr_validate(yarg, attr))
                                return MNL_CB_ERROR;
                        dst->_present.reload_failed = 1;
                        dst->reload_failed = mnl_attr_get_u8(attr);
-               }
-               else if (mnl_attr_get_type(attr) == DEVLINK_ATTR_RELOAD_ACTION) {
+               } else if (type == DEVLINK_ATTR_RELOAD_ACTION) {
                        if (ynl_attr_validate(yarg, attr))
                                return MNL_CB_ERROR;
                        dst->_present.reload_action = 1;
                        dst->reload_action = mnl_attr_get_u8(attr);
-               }
-               else if (mnl_attr_get_type(attr) == DEVLINK_ATTR_DEV_STATS) {
+               } else if (type == DEVLINK_ATTR_DEV_STATS) {
                        if (ynl_attr_validate(yarg, attr))
                                return MNL_CB_ERROR;
                        dst->_present.dev_stats = 1;
@@ -576,7 +582,9 @@ int devlink_info_get_rsp_parse(const struct nlmsghdr *nlh, void *data)
                return ynl_error_parse(yarg, "attribute already present (devlink.info-version-stored)");
 
        mnl_attr_for_each(attr, nlh, sizeof(struct genlmsghdr)) {
-               if (mnl_attr_get_type(attr) == DEVLINK_ATTR_BUS_NAME) {
+               unsigned int type = mnl_attr_get_type(attr);
+
+               if (type == DEVLINK_ATTR_BUS_NAME) {
                        unsigned int len;
 
                        if (ynl_attr_validate(yarg, attr))
@@ -587,8 +595,7 @@ int devlink_info_get_rsp_parse(const struct nlmsghdr *nlh, void *data)
                        dst->bus_name = malloc(len + 1);
                        memcpy(dst->bus_name, mnl_attr_get_str(attr), len);
                        dst->bus_name[len] = 0;
-               }
-               else if (mnl_attr_get_type(attr) == DEVLINK_ATTR_DEV_NAME) {
+               } else if (type == DEVLINK_ATTR_DEV_NAME) {
                        unsigned int len;
 
                        if (ynl_attr_validate(yarg, attr))
@@ -599,8 +606,7 @@ int devlink_info_get_rsp_parse(const struct nlmsghdr *nlh, void *data)
                        dst->dev_name = malloc(len + 1);
                        memcpy(dst->dev_name, mnl_attr_get_str(attr), len);
                        dst->dev_name[len] = 0;
-               }
-               else if (mnl_attr_get_type(attr) == DEVLINK_ATTR_INFO_DRIVER_NAME) {
+               } else if (type == DEVLINK_ATTR_INFO_DRIVER_NAME) {
                        unsigned int len;
 
                        if (ynl_attr_validate(yarg, attr))
@@ -611,8 +617,7 @@ int devlink_info_get_rsp_parse(const struct nlmsghdr *nlh, void *data)
                        dst->info_driver_name = malloc(len + 1);
                        memcpy(dst->info_driver_name, mnl_attr_get_str(attr), len);
                        dst->info_driver_name[len] = 0;
-               }
-               else if (mnl_attr_get_type(attr) == DEVLINK_ATTR_INFO_SERIAL_NUMBER) {
+               } else if (type == DEVLINK_ATTR_INFO_SERIAL_NUMBER) {
                        unsigned int len;
 
                        if (ynl_attr_validate(yarg, attr))
@@ -623,14 +628,11 @@ int devlink_info_get_rsp_parse(const struct nlmsghdr *nlh, void *data)
                        dst->info_serial_number = malloc(len + 1);
                        memcpy(dst->info_serial_number, mnl_attr_get_str(attr), len);
                        dst->info_serial_number[len] = 0;
-               }
-               else if (mnl_attr_get_type(attr) == DEVLINK_ATTR_INFO_VERSION_FIXED) {
+               } else if (type == DEVLINK_ATTR_INFO_VERSION_FIXED) {
                        n_info_version_fixed++;
-               }
-               else if (mnl_attr_get_type(attr) == DEVLINK_ATTR_INFO_VERSION_RUNNING) {
+               } else if (type == DEVLINK_ATTR_INFO_VERSION_RUNNING) {
                        n_info_version_running++;
-               }
-               else if (mnl_attr_get_type(attr) == DEVLINK_ATTR_INFO_VERSION_STORED) {
+               } else if (type == DEVLINK_ATTR_INFO_VERSION_STORED) {
                        n_info_version_stored++;
                }
        }

diff --git a/tools/net/ynl/generated/fou-user.c b/tools/net/ynl/generated/fou-user.c
index 23c8f34..4271b5d 100644 (file)
--- a/tools/net/ynl/generated/fou-user.c
+++ b/tools/net/ynl/generated/fou-user.c
@@ -172,42 +172,38 @@ int fou_get_rsp_parse(const struct nlmsghdr *nlh, void *data)
        dst = yarg->data;
 
        mnl_attr_for_each(attr, nlh, sizeof(struct genlmsghdr)) {
-               if (mnl_attr_get_type(attr) == FOU_ATTR_PORT) {
+               unsigned int type = mnl_attr_get_type(attr);
+
+               if (type == FOU_ATTR_PORT) {
                        if (ynl_attr_validate(yarg, attr))
                                return MNL_CB_ERROR;
                        dst->_present.port = 1;
                        dst->port = mnl_attr_get_u16(attr);
-               }
-               else if (mnl_attr_get_type(attr) == FOU_ATTR_IPPROTO) {
+               } else if (type == FOU_ATTR_IPPROTO) {
                        if (ynl_attr_validate(yarg, attr))
                                return MNL_CB_ERROR;
                        dst->_present.ipproto = 1;
                        dst->ipproto = mnl_attr_get_u8(attr);
-               }
-               else if (mnl_attr_get_type(attr) == FOU_ATTR_TYPE) {
+               } else if (type == FOU_ATTR_TYPE) {
                        if (ynl_attr_validate(yarg, attr))
                                return MNL_CB_ERROR;
                        dst->_present.type = 1;
                        dst->type = mnl_attr_get_u8(attr);
-               }
-               else if (mnl_attr_get_type(attr) == FOU_ATTR_REMCSUM_NOPARTIAL) {
+               } else if (type == FOU_ATTR_REMCSUM_NOPARTIAL) {
                        if (ynl_attr_validate(yarg, attr))
                                return MNL_CB_ERROR;
                        dst->_present.remcsum_nopartial = 1;
-               }
-               else if (mnl_attr_get_type(attr) == FOU_ATTR_LOCAL_V4) {
+               } else if (type == FOU_ATTR_LOCAL_V4) {
                        if (ynl_attr_validate(yarg, attr))
                                return MNL_CB_ERROR;
                        dst->_present.local_v4 = 1;
                        dst->local_v4 = mnl_attr_get_u32(attr);
-               }
-               else if (mnl_attr_get_type(attr) == FOU_ATTR_PEER_V4) {
+               } else if (type == FOU_ATTR_PEER_V4) {
                        if (ynl_attr_validate(yarg, attr))
                                return MNL_CB_ERROR;
                        dst->_present.peer_v4 = 1;
                        dst->peer_v4 = mnl_attr_get_u32(attr);
-               }
-               else if (mnl_attr_get_type(attr) == FOU_ATTR_LOCAL_V6) {
+               } else if (type == FOU_ATTR_LOCAL_V6) {
                        unsigned int len;
 
                        if (ynl_attr_validate(yarg, attr))
@@ -217,8 +213,7 @@ int fou_get_rsp_parse(const struct nlmsghdr *nlh, void *data)
                        dst->_present.local_v6_len = len;
                        dst->local_v6 = malloc(len);
                        memcpy(dst->local_v6, mnl_attr_get_payload(attr), len);
-               }
-               else if (mnl_attr_get_type(attr) == FOU_ATTR_PEER_V6) {
+               } else if (type == FOU_ATTR_PEER_V6) {
                        unsigned int len;
 
                        if (ynl_attr_validate(yarg, attr))
@@ -228,14 +223,12 @@ int fou_get_rsp_parse(const struct nlmsghdr *nlh, void *data)
                        dst->_present.peer_v6_len = len;
                        dst->peer_v6 = malloc(len);
                        memcpy(dst->peer_v6, mnl_attr_get_payload(attr), len);
-               }
-               else if (mnl_attr_get_type(attr) == FOU_ATTR_PEER_PORT) {
+               } else if (type == FOU_ATTR_PEER_PORT) {
                        if (ynl_attr_validate(yarg, attr))
                                return MNL_CB_ERROR;
                        dst->_present.peer_port = 1;
                        dst->peer_port = mnl_attr_get_u16(attr);
-               }
-               else if (mnl_attr_get_type(attr) == FOU_ATTR_IFINDEX) {
+               } else if (type == FOU_ATTR_IFINDEX) {
                        if (ynl_attr_validate(yarg, attr))
                                return MNL_CB_ERROR;
                        dst->_present.ifindex = 1;

diff --git a/tools/net/ynl/generated/handshake-user.c b/tools/net/ynl/generated/handshake-user.c
index 7c204bf..3a0392b 100644 (file)
--- a/tools/net/ynl/generated/handshake-user.c
+++ b/tools/net/ynl/generated/handshake-user.c
@@ -116,13 +116,14 @@ int handshake_x509_parse(struct ynl_parse_arg *yarg,
        const struct nlattr *attr;
 
        mnl_attr_for_each_nested(attr, nested) {
-               if (mnl_attr_get_type(attr) == HANDSHAKE_A_X509_CERT) {
+               unsigned int type = mnl_attr_get_type(attr);
+
+               if (type == HANDSHAKE_A_X509_CERT) {
                        if (ynl_attr_validate(yarg, attr))
                                return MNL_CB_ERROR;
                        dst->_present.cert = 1;
                        dst->cert = mnl_attr_get_u32(attr);
-               }
-               else if (mnl_attr_get_type(attr) == HANDSHAKE_A_X509_PRIVKEY) {
+               } else if (type == HANDSHAKE_A_X509_PRIVKEY) {
                        if (ynl_attr_validate(yarg, attr))
                                return MNL_CB_ERROR;
                        dst->_present.privkey = 1;
@@ -171,37 +172,33 @@ int handshake_accept_rsp_parse(const struct nlmsghdr *nlh, void *data)
                return ynl_error_parse(yarg, "attribute already present (accept.peer-identity)");
 
        mnl_attr_for_each(attr, nlh, sizeof(struct genlmsghdr)) {
-               if (mnl_attr_get_type(attr) == HANDSHAKE_A_ACCEPT_SOCKFD) {
+               unsigned int type = mnl_attr_get_type(attr);
+
+               if (type == HANDSHAKE_A_ACCEPT_SOCKFD) {
                        if (ynl_attr_validate(yarg, attr))
                                return MNL_CB_ERROR;
                        dst->_present.sockfd = 1;
                        dst->sockfd = mnl_attr_get_u32(attr);
-               }
-               else if (mnl_attr_get_type(attr) == HANDSHAKE_A_ACCEPT_MESSAGE_TYPE) {
+               } else if (type == HANDSHAKE_A_ACCEPT_MESSAGE_TYPE) {
                        if (ynl_attr_validate(yarg, attr))
                                return MNL_CB_ERROR;
                        dst->_present.message_type = 1;
                        dst->message_type = mnl_attr_get_u32(attr);
-               }
-               else if (mnl_attr_get_type(attr) == HANDSHAKE_A_ACCEPT_TIMEOUT) {
+               } else if (type == HANDSHAKE_A_ACCEPT_TIMEOUT) {
                        if (ynl_attr_validate(yarg, attr))
                                return MNL_CB_ERROR;
                        dst->_present.timeout = 1;
                        dst->timeout = mnl_attr_get_u32(attr);
-               }
-               else if (mnl_attr_get_type(attr) == HANDSHAKE_A_ACCEPT_AUTH_MODE) {
+               } else if (type == HANDSHAKE_A_ACCEPT_AUTH_MODE) {
                        if (ynl_attr_validate(yarg, attr))
                                return MNL_CB_ERROR;
                        dst->_present.auth_mode = 1;
                        dst->auth_mode = mnl_attr_get_u32(attr);
-               }
-               else if (mnl_attr_get_type(attr) == HANDSHAKE_A_ACCEPT_PEER_IDENTITY) {
+               } else if (type == HANDSHAKE_A_ACCEPT_PEER_IDENTITY) {
                        n_peer_identity++;
-               }
-               else if (mnl_attr_get_type(attr) == HANDSHAKE_A_ACCEPT_CERTIFICATE) {
+               } else if (type == HANDSHAKE_A_ACCEPT_CERTIFICATE) {
                        n_certificate++;
-               }
-               else if (mnl_attr_get_type(attr) == HANDSHAKE_A_ACCEPT_PEERNAME) {
+               } else if (type == HANDSHAKE_A_ACCEPT_PEERNAME) {
                        unsigned int len;
 
                        if (ynl_attr_validate(yarg, attr))

diff --git a/tools/net/ynl/generated/netdev-user.c b/tools/net/ynl/generated/netdev-user.c
index fe0da71..1206978 100644 (file)
--- a/tools/net/ynl/generated/netdev-user.c
+++ b/tools/net/ynl/generated/netdev-user.c
@@ -79,13 +79,14 @@ int netdev_dev_get_rsp_parse(const struct nlmsghdr *nlh, void *data)
        dst = yarg->data;
 
        mnl_attr_for_each(attr, nlh, sizeof(struct genlmsghdr)) {
-               if (mnl_attr_get_type(attr) == NETDEV_A_DEV_IFINDEX) {
+               unsigned int type = mnl_attr_get_type(attr);
+
+               if (type == NETDEV_A_DEV_IFINDEX) {
                        if (ynl_attr_validate(yarg, attr))
                                return MNL_CB_ERROR;
                        dst->_present.ifindex = 1;
                        dst->ifindex = mnl_attr_get_u32(attr);
-               }
-               else if (mnl_attr_get_type(attr) == NETDEV_A_DEV_XDP_FEATURES) {
+               } else if (type == NETDEV_A_DEV_XDP_FEATURES) {
                        if (ynl_attr_validate(yarg, attr))
                                return MNL_CB_ERROR;
                        dst->_present.xdp_features = 1;