From: Mike Yuan <me@yhndnzj.com>
Date: Thu, 1 May 2025 20:48:01 +0000 (+0200)
Subject: core: rename core-varlink -> varlink
X-Git-Tag: v258-rc1~700
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bad578b145166d19a4e14ab1da1ab5b950e32202;p=thirdparty%2Fsystemd.git

core: rename core-varlink -> varlink

To make things consistent with dbus.[ch]
---

diff --git a/src/core/dbus-cgroup.c b/src/core/dbus-cgroup.c
index 793f5538155..e73a3731f3f 100644
--- a/src/core/dbus-cgroup.c
+++ b/src/core/dbus-cgroup.c
@@ -11,7 +11,6 @@
 #include "bus-util.h"
 #include "cgroup.h"
 #include "cgroup-util.h"
-#include "core-varlink.h"
 #include "dbus-cgroup.h"
 #include "dbus-util.h"
 #include "errno-util.h"
@@ -28,6 +27,7 @@
 #include "path-util.h"
 #include "percent-util.h"
 #include "socket-util.h"
+#include "varlink.h"
 
 BUS_DEFINE_PROPERTY_GET(bus_property_get_tasks_max, "t", CGroupTasksMax, cgroup_tasks_max_resolve);
 BUS_DEFINE_PROPERTY_GET_ENUM(bus_property_get_cgroup_pressure_watch, cgroup_pressure_watch, CGroupPressureWatch);
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 2ab1dcef873..e718dbc76b9 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -25,7 +25,6 @@
 #include "capability-util.h"
 #include "cgroup-setup.h"
 #include "conf-parser.h"
-#include "core-varlink.h"
 #include "cpu-set-util.h"
 #include "creds-util.h"
 #include "env-util.h"
@@ -73,6 +72,7 @@
 #include "unit-printf.h"
 #include "user-util.h"
 #include "utf8.h"
+#include "varlink.h"
 #include "web-util.h"
 
 static int parse_socket_protocol(const char *s) {
diff --git a/src/core/manager-serialize.c b/src/core/manager-serialize.c
index 429918e3e78..28bf7f5f7bc 100644
--- a/src/core/manager-serialize.c
+++ b/src/core/manager-serialize.c
@@ -3,7 +3,6 @@
 #include "sd-varlink.h"
 
 #include "clean-ipc.h"
-#include "core-varlink.h"
 #include "dbus.h"
 #include "dynamic-user.h"
 #include "fd-util.h"
@@ -18,6 +17,7 @@
 #include "syslog-util.h"
 #include "unit-serialize.h"
 #include "user-util.h"
+#include "varlink.h"
 #include "varlink-serialize.h"
 
 int manager_open_serialization(Manager *m, FILE **ret_f) {
diff --git a/src/core/manager.c b/src/core/manager.c
index c283645921e..1000818c7a8 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -34,7 +34,6 @@
 #include "common-signal.h"
 #include "confidential-virt.h"
 #include "constants.h"
-#include "core-varlink.h"
 #include "creds-util.h"
 #include "daemon-util.h"
 #include "dbus.h"
@@ -101,6 +100,7 @@
 #include "umask-util.h"
 #include "unit-name.h"
 #include "user-util.h"
+#include "varlink.h"
 #include "virt.h"
 #include "watchdog.h"
 
diff --git a/src/core/meson.build b/src/core/meson.build
index 3db71e19d49..2fd6e0fbc3e 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -10,7 +10,6 @@ libcore_sources = files(
         'bpf-restrict-ifaces.c',
         'bpf-socket-bind.c',
         'cgroup.c',
-        'core-varlink.c',
         'dbus-automount.c',
         'dbus-cgroup.c',
         'dbus-device.c',
@@ -63,6 +62,7 @@ libcore_sources = files(
         'unit-printf.c',
         'unit-serialize.c',
         'unit.c',
+        'varlink.c',
 )
 
 if conf.get('BPF_FRAMEWORK') == 1
diff --git a/src/core/unit.c b/src/core/unit.c
index c723a540600..b42b40250f5 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -20,7 +20,6 @@
 #include "cgroup-setup.h"
 #include "cgroup-util.h"
 #include "chase.h"
-#include "core-varlink.h"
 #include "dbus.h"
 #include "dbus-unit.h"
 #include "dropin.h"
@@ -63,6 +62,7 @@
 #include "unit.h"
 #include "unit-name.h"
 #include "user-util.h"
+#include "varlink.h"
 #include "virt.h"
 #if BPF_FRAMEWORK
 #include "bpf-link.h"
diff --git a/src/core/core-varlink.c b/src/core/varlink.c
similarity index 99%
rename from src/core/core-varlink.c
rename to src/core/varlink.c
index 5c5b9c667af..c555b2721af 100644
--- a/src/core/core-varlink.c
+++ b/src/core/varlink.c
@@ -2,7 +2,6 @@
 
 #include "sd-varlink.h"
 
-#include "core-varlink.h"
 #include "dynamic-user.h"
 #include "json-util.h"
 #include "manager.h"
@@ -10,6 +9,7 @@
 #include "strv.h"
 #include "unit.h"
 #include "user-util.h"
+#include "varlink.h"
 #include "varlink-internal.h"
 #include "varlink-io.systemd.ManagedOOM.h"
 #include "varlink-io.systemd.UserDatabase.h"
diff --git a/src/core/core-varlink.h b/src/core/varlink.h
similarity index 100%
rename from src/core/core-varlink.h
rename to src/core/varlink.h