shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

sd-netlink: rename functions

Browse Source
This commit is contained in:
Yu Watanabe 2021-07-04 14:58:20 +09:00
parent 49eb0a6889
commit ea073c8fce
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/libsystemd/sd-netlink/netlink-message.c
View File

@ -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;

4
src/libsystemd/sd-netlink/netlink-types.c
View File

@ -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);

4
src/libsystemd/sd-netlink/netlink-types.h
View File

@ -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,