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

yuwata · yuwata · commit f09d20256a32 · 2021-11-09T08:24:10.000+09:00
diff --git a/src/basic/arphrd-util.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-util.h b/src/basic/arphrd-util.h
diff --git 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
@@ -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
@@ -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-util.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
@@ -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"
