udev: rename udev-builtin-net_id-netlink.[ch]

diff --git a/src/udev/meson.build b/src/udev/meson.build
index 7de080348f661f622b0722e855f1736748c0fd0e..3423d6de9469a8a1ef2be3b4b2b9bf16ba1ed244 100644 (file)
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
@@ -33,12 +33,12 @@ libudevd_core_sources = '''
         udev-builtin-hwdb.c
         udev-builtin-input_id.c
         udev-builtin-keyboard.c
-        udev-builtin-net_id-netlink.c
-        udev-builtin-net_id-netlink.h
         udev-builtin-net_id.c
         udev-builtin-net_setup_link.c
         udev-builtin-path_id.c
         udev-builtin-usb_id.c
+        udev-netlink.c
+        udev-netlink.h
         net/link-config.c
         net/link-config.h
 '''.split()
@@ -212,9 +212,9 @@ tests += [
          [threads,
           libacl]],
 
-        [['src/udev/test-udev-builtin-net_id-netlink.c',
-          'src/udev/udev-builtin-net_id-netlink.c',
-          'src/udev/udev-builtin-net_id-netlink.h']],
+        [['src/udev/test-udev-netlink.c',
+          'src/udev/udev-netlink.c',
+          'src/udev/udev-netlink.h']],
 
         [['src/udev/fido_id/test-fido-id-desc.c',
           'src/udev/fido_id/fido_id_desc.c']],

diff --git a/src/udev/test-udev-builtin-net_id-netlink.c b/src/udev/test-udev-netlink.c
similarity index 98%
rename from src/udev/test-udev-builtin-net_id-netlink.c
rename to src/udev/test-udev-netlink.c
index ee9fd675f1d769da624f62b1825d6c34af38481c..5f09a489d67f1a6a312b9c5b5c1db6752142bae9 100644 (file)
--- a/src/udev/test-udev-builtin-net_id-netlink.c
+++ b/src/udev/test-udev-netlink.c
@@ -6,7 +6,7 @@
 #include "ether-addr-util.h"
 #include "parse-util.h"
 #include "tests.h"
-#include "udev-builtin-net_id-netlink.h"
+#include "udev-netlink.h"
 
 static void test_link_info_one(sd_netlink *rtnl, int ifindex) {
         _cleanup_(link_info_clear) LinkInfo info = LINK_INFO_NULL;

diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
index db155421b2c6f33b147dcecd000a4413f6096424..ec30df51b9acf736eae4e6a0a4d4b219d709eb1a 100644 (file)
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -35,8 +35,8 @@
 #include "string-util.h"
 #include "strv.h"
 #include "strxcpyx.h"
-#include "udev-builtin-net_id-netlink.h"
 #include "udev-builtin.h"
+#include "udev-netlink.h"
 
 #define ONBOARD_14BIT_INDEX_MAX ((1U << 14) - 1)
 #define ONBOARD_16BIT_INDEX_MAX ((1U << 16) - 1)

diff --git a/src/udev/udev-builtin-net_id-netlink.c b/src/udev/udev-netlink.c
similarity index 98%
rename from src/udev/udev-builtin-net_id-netlink.c
rename to src/udev/udev-netlink.c
index 7fcd2ecd1703eb5eb24d6d9e47f1e014dda012eb..4c93934e3e0bf60de5601981842cd6a0d81aeb3c 100644 (file)
--- a/src/udev/udev-builtin-net_id-netlink.c
+++ b/src/udev/udev-netlink.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "netlink-util.h"
-#include "udev-builtin-net_id-netlink.h"
+#include "udev-netlink.h"
 
 void link_info_clear(LinkInfo *info) {
         if (!info)

diff --git a/src/udev/udev-builtin-net_id-netlink.h b/src/udev/udev-netlink.h
similarity index 100%
rename from src/udev/udev-builtin-net_id-netlink.h
rename to src/udev/udev-netlink.h