diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-07-04 14:58:20 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-08-29 17:18:04 +0900 |
| commit | ea073c8fcee731ff1d5be23ad2d1b84b7f28afbb (patch) | |
| tree | d822be9a49d2627608f821ad2ffc54e9fa85c7fe | |
| parent | 49eb0a6889881fcaaf3863b60c6eb8d4f8309078 (diff) | |
| download | systemd-ea073c8fcee731ff1d5be23ad2d1b84b7f28afbb.tar.gz | |
sd-netlink: rename functions
| -rw-r--r-- | src/libsystemd/sd-netlink/netlink-message.c | 28 | ||||
| -rw-r--r-- | src/libsystemd/sd-netlink/netlink-types.c | 4 | ||||
| -rw-r--r-- | src/libsystemd/sd-netlink/netlink-types.h | 4 |
3 files changed, 20 insertions, 16 deletions
diff --git a/src/libsystemd/sd-netlink/netlink-message.c b/src/libsystemd/sd-netlink/netlink-message.c index f3ed96b9f6..a0de7a0036 100644 --- a/src/libsystemd/sd-netlink/netlink-message.c +++ b/src/libsystemd/sd-netlink/netlink-message.c @@ -574,9 +574,10 @@ int sd_netlink_message_open_container(sd_netlink_message *m, unsigned short type if (r < 0) return r; - r = type_system_union_protocol_get_type_system(type_system_union, - &m->containers[m->n_containers + 1].type_system, - family); + r = type_system_union_get_type_system_by_protocol( + type_system_union, + &m->containers[m->n_containers + 1].type_system, + family); if (r < 0) return r; } else { @@ -608,9 +609,10 @@ int sd_netlink_message_open_container_union(sd_netlink_message *m, unsigned shor if (r < 0) return r; - r = type_system_union_get_type_system(type_system_union, - &m->containers[m->n_containers + 1].type_system, - key); + r = type_system_union_get_type_system_by_string( + type_system_union, + &m->containers[m->n_containers + 1].type_system, + key); if (r < 0) return r; @@ -1155,9 +1157,10 @@ int sd_netlink_message_enter_container(sd_netlink_message *m, unsigned short typ if (r < 0) return r; - r = type_system_union_get_type_system(type_system_union, - &type_system, - key); + r = type_system_union_get_type_system_by_string( + type_system_union, + &type_system, + key); if (r < 0) return r; @@ -1171,9 +1174,10 @@ int sd_netlink_message_enter_container(sd_netlink_message *m, unsigned short typ if (r < 0) return r; - r = type_system_union_protocol_get_type_system(type_system_union, - &type_system, - family); + r = type_system_union_get_type_system_by_protocol( + type_system_union, + &type_system, + family); if (r < 0) return r; diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c index ccece76bf8..d0719b3cc5 100644 --- a/src/libsystemd/sd-netlink/netlink-types.c +++ b/src/libsystemd/sd-netlink/netlink-types.c @@ -1805,7 +1805,7 @@ int type_system_get_type_system_union(const NLTypeSystem *type_system, const NLT return 0; } -int type_system_union_get_type_system(const NLTypeSystemUnion *type_system_union, const NLTypeSystem **ret, const char *key) { +int type_system_union_get_type_system_by_string(const NLTypeSystemUnion *type_system_union, const NLTypeSystem **ret, const char *key) { int type; assert(type_system_union); @@ -1825,7 +1825,7 @@ int type_system_union_get_type_system(const NLTypeSystemUnion *type_system_union return 0; } -int type_system_union_protocol_get_type_system(const NLTypeSystemUnion *type_system_union, const NLTypeSystem **ret, uint16_t protocol) { +int type_system_union_get_type_system_by_protocol(const NLTypeSystemUnion *type_system_union, const NLTypeSystem **ret, uint16_t protocol) { const NLTypeSystem *type_system; assert(type_system_union); diff --git a/src/libsystemd/sd-netlink/netlink-types.h b/src/libsystemd/sd-netlink/netlink-types.h index 607af01391..59c7dfabcd 100644 --- a/src/libsystemd/sd-netlink/netlink-types.h +++ b/src/libsystemd/sd-netlink/netlink-types.h @@ -56,8 +56,8 @@ int type_system_root_get_type(sd_netlink *nl, const NLType **ret, uint16_t type) int type_system_get_type(const NLTypeSystem *type_system, const NLType **ret, uint16_t type); int type_system_get_type_system(const NLTypeSystem *type_system, const NLTypeSystem **ret, uint16_t type); int type_system_get_type_system_union(const NLTypeSystem *type_system, const NLTypeSystemUnion **ret, uint16_t type); -int type_system_union_get_type_system(const NLTypeSystemUnion *type_system_union, const NLTypeSystem **ret, const char *key); -int type_system_union_protocol_get_type_system(const NLTypeSystemUnion *type_system_union, const NLTypeSystem **ret, uint16_t protocol); +int type_system_union_get_type_system_by_string(const NLTypeSystemUnion *type_system_union, const NLTypeSystem **ret, const char *key); +int type_system_union_get_type_system_by_protocol(const NLTypeSystemUnion *type_system_union, const NLTypeSystem **ret, uint16_t protocol); typedef enum NLUnionLinkInfoData { NL_UNION_LINK_INFO_DATA_BOND, |