From: Mike Yuan <me@yhndnzj.com>
Date: Thu, 19 Sep 2024 11:53:25 +0000 (+0200)
Subject: unit-file: make unit_type_may_{alias_template} static inline
X-Git-Tag: v257-rc1~317^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a7627f4e1058f7518e970e289ed020f3d329b22;p=thirdparty%2Fsystemd.git

unit-file: make unit_type_may_{alias_template} static inline
---

diff --git a/src/shared/unit-file.c b/src/shared/unit-file.c
index ca2686b2099..5bb580285cc 100644
--- a/src/shared/unit-file.c
+++ b/src/shared/unit-file.c
@@ -16,25 +16,6 @@
 #include "strv.h"
 #include "unit-file.h"
 
-bool unit_type_may_alias(UnitType type) {
-        return IN_SET(type,
-                      UNIT_SERVICE,
-                      UNIT_SOCKET,
-                      UNIT_TARGET,
-                      UNIT_DEVICE,
-                      UNIT_TIMER,
-                      UNIT_PATH);
-}
-
-bool unit_type_may_template(UnitType type) {
-        return IN_SET(type,
-                      UNIT_SERVICE,
-                      UNIT_SOCKET,
-                      UNIT_TARGET,
-                      UNIT_TIMER,
-                      UNIT_PATH);
-}
-
 int unit_symlink_name_compatible(const char *symlink, const char *target, bool instance_propagation) {
         _cleanup_free_ char *template = NULL;
         int r, un_type1, un_type2;
diff --git a/src/shared/unit-file.h b/src/shared/unit-file.h
index 1c43861f005..1c89a92c7d9 100644
--- a/src/shared/unit-file.h
+++ b/src/shared/unit-file.h
@@ -28,8 +28,24 @@ enum UnitFileState {
         _UNIT_FILE_STATE_INVALID = -EINVAL,
 };
 
-bool unit_type_may_alias(UnitType type) _const_;
-bool unit_type_may_template(UnitType type) _const_;
+static inline bool unit_type_may_alias(UnitType type) {
+        return IN_SET(type,
+                      UNIT_SERVICE,
+                      UNIT_SOCKET,
+                      UNIT_TARGET,
+                      UNIT_DEVICE,
+                      UNIT_TIMER,
+                      UNIT_PATH);
+}
+
+static inline bool unit_type_may_template(UnitType type) {
+        return IN_SET(type,
+                      UNIT_SERVICE,
+                      UNIT_SOCKET,
+                      UNIT_TARGET,
+                      UNIT_TIMER,
+                      UNIT_PATH);
+}
 
 int unit_symlink_name_compatible(const char *symlink, const char *target, bool instance_propagation);
 int unit_validate_alias_symlink_or_warn(int log_level, const char *filename, const char *target);