From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 6 Nov 2021 02:28:55 +0000 (+0900)
Subject: netif-util: rename link_get_type_string() -> net_get_type_string()
X-Git-Tag: v250-rc1~328^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4eef6fad3150b8b3e63f3284f9f715fb56792709;p=thirdparty%2Fsystemd.git

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

diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index ec86391cd36..3056710d780 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -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();
 
diff --git a/src/network/networkd-json.c b/src/network/networkd-json.c
index 6a40e4f8e67..7148c2ee143 100644
--- a/src/network/networkd-json.c
+++ b/src/network/networkd-json.c
@@ -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;
 
diff --git a/src/shared/net-condition.c b/src/shared/net-condition.c
index 7cfac18d651..52cac19df3c 100644
--- a/src/shared/net-condition.c
+++ b/src/shared/net-condition.c
@@ -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;
 
diff --git a/src/shared/netif-util.c b/src/shared/netif-util.c
index fb81460c916..069f621103c 100644
--- a/src/shared/netif-util.c
+++ b/src/shared/netif-util.c
@@ -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;
 
diff --git a/src/shared/netif-util.h b/src/shared/netif-util.h
index 7a2cf1be9e2..1d4ac5be56c 100644
--- a/src/shared/netif-util.h
+++ b/src/shared/netif-util.h
@@ -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);