From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 15 Sep 2021 03:20:04 +0000 (+0900)
Subject: udev: rename udev-builtin-net_id-netlink.[ch]
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e439e92318e38ec238f42a103c2958514ad2d51b;p=thirdparty%2Fsystemd.git

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

diff --git a/src/udev/meson.build b/src/udev/meson.build
index 7de080348f6..3423d6de946 100644
--- 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 ee9fd675f1d..5f09a489d67 100644
--- 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 5a7c94207b6..5705393af4b 100644
--- 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 7fcd2ecd170..4c93934e3e0 100644
--- 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