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 99048d20c80c36c888954c6287568f9a9e2f1cba..b52934753033488ecd4448b93ee8ed42ca2869a3 100644 (file)
--- 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 cf97f6de1d3b6458c47f2013e23bfec85a9acb4d..042ab86d5eb4f5fa4396b7f1e3b57f7d9a30d950 100644 (file)
--- 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 4a648caa5daac129978cd994a0631e085f123e7d..5632debdebea6b8e0f89207877b4f9dd4e9e0476 100644 (file)
--- 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 b22413029d2227179c1f7a09078a44516b4cf3a3..84811c038f5740039e211af2ba61965c38dc740b 100644 (file)
--- 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 9e21f3218946a898e9ca5e7266d33826b3f27428..f12388dcce1b180b74c49808dab7155f2e53f715 100644 (file)
--- 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 d177b095677737ea474b6d2aab93189829a43d0f..c1213b7ca8c1c9ee7cda46280a82663aac1250ad 100644 (file)
--- 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"