From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 7 Nov 2021 06:16:25 +0000 (+0900)
Subject: arphrd-util: rename arphrd-list.[ch] -> arphrd-util.[ch]
X-Git-Tag: v250-rc1~328^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f09d20256a32a87fa65743dd92aaa8118587d1e2;p=thirdparty%2Fsystemd.git

arphrd-util: rename arphrd-list.[ch] -> arphrd-util.[ch]
---

diff --git a/src/basic/arphrd-list.c b/src/basic/arphrd-util.c
similarity index 95%
rename from src/basic/arphrd-list.c
rename to src/basic/arphrd-util.c
index 99048d20c80..b5293475303 100644
--- a/src/basic/arphrd-list.c
+++ b/src/basic/arphrd-util.c
@@ -4,7 +4,7 @@
 #include <linux/if_arp.h>
 #include <string.h>
 
-#include "arphrd-list.h"
+#include "arphrd-util.h"
 #include "macro.h"
 
 static const struct arphrd_name* lookup_arphrd(register const char *str, register GPERF_LEN_TYPE len);
diff --git a/src/basic/arphrd-list.h b/src/basic/arphrd-util.h
similarity index 100%
rename from src/basic/arphrd-list.h
rename to src/basic/arphrd-util.h
diff --git a/src/basic/meson.build b/src/basic/meson.build
index cf97f6de1d3..042ab86d5eb 100644
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -9,8 +9,8 @@ basic_sources = files('''
         alloc-util.h
         architecture.c
         architecture.h
-        arphrd-list.c
-        arphrd-list.h
+        arphrd-util.c
+        arphrd-util.h
         async.c
         async.h
         audit-util.c
diff --git a/src/libsystemd/sd-network/network-util.c b/src/libsystemd/sd-network/network-util.c
index 4a648caa5da..5632debdebe 100644
--- a/src/libsystemd/sd-network/network-util.c
+++ b/src/libsystemd/sd-network/network-util.c
@@ -3,7 +3,7 @@
 #include "sd-id128.h"
 
 #include "alloc-util.h"
-#include "arphrd-list.h"
+#include "arphrd-util.h"
 #include "device-util.h"
 #include "fd-util.h"
 #include "network-util.h"
diff --git a/src/test/meson.build b/src/test/meson.build
index b22413029d2..84811c038f5 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -570,7 +570,7 @@ tests += [
         [['src/test/test-af-list.c',
           generated_gperf_headers]],
 
-        [['src/test/test-arphrd-list.c',
+        [['src/test/test-arphrd-util.c',
           generated_gperf_headers]],
 
         [['src/test/test-ip-protocol-list.c',
diff --git a/src/test/test-arphrd-list.c b/src/test/test-arphrd-util.c
similarity index 96%
rename from src/test/test-arphrd-list.c
rename to src/test/test-arphrd-util.c
index 9e21f321894..f12388dcce1 100644
--- a/src/test/test-arphrd-list.c
+++ b/src/test/test-arphrd-util.c
@@ -2,11 +2,10 @@
 
 #include <linux/if_arp.h>
 
+#include "arphrd-util.h"
 #include "string-util.h"
 #include "tests.h"
 
-#include "arphrd-list.h"
-
 int main(int argc, const char *argv[]) {
         test_setup_logging(LOG_INFO);
 
diff --git a/src/udev/test-udev-netlink.c b/src/udev/test-udev-netlink.c
index d177b095677..c1213b7ca8c 100644
--- a/src/udev/test-udev-netlink.c
+++ b/src/udev/test-udev-netlink.c
@@ -2,7 +2,7 @@
 
 #include "sd-device.h"
 
-#include "arphrd-list.h"
+#include "arphrd-util.h"
 #include "ether-addr-util.h"
 #include "parse-util.h"
 #include "tests.h"