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

netif-util: rename link_get_type_string() -> net_get_type_string()

Browse Source
This commit is contained in:
Yu Watanabe 2021-11-06 11:28:55 +09:00
parent b5cc5591fa
commit 4eef6fad31
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/networkctl.c
View File

@ -846,7 +846,7 @@ static int list_links(int argc, char *argv[], void *userdata) {
setup_state = strdup("unmanaged");
setup_state_to_color(setup_state, &on_color_setup, NULL);
r = link_get_type_string(links[i].sd_device, links[i].iftype, &t);
r = net_get_type_string(links[i].sd_device, links[i].iftype, &t);
if (r == -ENOMEM)
return log_oom();
@ -1569,7 +1569,7 @@ static int link_status_one(
(void) sd_device_get_property_value(info->sd_device, "ID_MODEL", &model);
}
r = link_get_type_string(info->sd_device, info->iftype, &t);
r = net_get_type_string(info->sd_device, info->iftype, &t);
if (r == -ENOMEM)
return log_oom();

2
src/network/networkd-json.c
View File

@ -45,7 +45,7 @@ int link_build_json(Link *link, JsonVariant **ret) {
assert(link);
assert(ret);
r = link_get_type_string(link->sd_device, link->iftype, &type);
r = net_get_type_string(link->sd_device, link->iftype, &type);
if (r == -ENOMEM)
return r;

2
src/shared/net-condition.c
View File

@ -138,7 +138,7 @@ int net_match_config(
assert(match);
r = link_get_type_string(device, iftype, &iftype_str);
r = net_get_type_string(device, iftype, &iftype_str);
if (r == -ENOMEM)
return r;

2
src/shared/netif-util.c
View File

@ -9,7 +9,7 @@
#include "sparse-endian.h"
#include "strv.h"
int link_get_type_string(sd_device *device, unsigned short iftype, char **ret) {
int net_get_type_string(sd_device *device, uint16_t iftype, char **ret) {
const char *t;
char *p;

2
src/shared/netif-util.h
View File

@ -6,6 +6,6 @@
#include "sd-device.h"
int link_get_type_string(sd_device *device, unsigned short iftype, char **ret);
int net_get_type_string(sd_device *device, uint16_t iftype, char **ret);
const char *net_get_name_persistent(sd_device *device);
int net_get_unique_predictable_data(sd_device *device, bool use_sysname, uint64_t *ret);