From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 26 Mar 2025 19:15:43 +0000 (+0900)
Subject: core: drop unused wrappers of manager_get_unit_by_pidref() and friends
X-Git-Tag: v258-rc1~1001^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F36872%2Fhead;p=thirdparty%2Fsystemd.git

core: drop unused wrappers of manager_get_unit_by_pidref() and friends
---

diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 0bc7a174336..cb90a182f47 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -4471,7 +4471,7 @@ Unit *manager_get_unit_by_pidref_cgroup(Manager *m, const PidRef *pid) {
         return manager_get_unit_by_cgroup(m, cgroup);
 }
 
-Unit *manager_get_unit_by_pidref_watching(Manager *m, const PidRef *pid) {
+Unit* manager_get_unit_by_pidref_watching(Manager *m, const PidRef *pid) {
         Unit *u, **array;
 
         assert(m);
@@ -4519,15 +4519,6 @@ Unit* manager_get_unit_by_pidref(Manager *m, PidRef *pid) {
         return NULL;
 }
 
-Unit *manager_get_unit_by_pid(Manager *m, pid_t pid) {
-        assert(m);
-
-        if (!pid_is_valid(pid))
-                return NULL;
-
-        return manager_get_unit_by_pidref(m, &PIDREF_MAKE_FROM_PID(pid));
-}
-
 int manager_notify_cgroup_empty(Manager *m, const char *cgroup) {
         Unit *u;
 
diff --git a/src/core/cgroup.h b/src/core/cgroup.h
index 08289163196..b25cdad7d86 100644
--- a/src/core/cgroup.h
+++ b/src/core/cgroup.h
@@ -463,11 +463,10 @@ void manager_shutdown_cgroup(Manager *m, bool delete);
 
 unsigned manager_dispatch_cgroup_realize_queue(Manager *m);
 
-Unit *manager_get_unit_by_cgroup(Manager *m, const char *cgroup);
-Unit *manager_get_unit_by_pidref_cgroup(Manager *m, const PidRef *pid);
-Unit *manager_get_unit_by_pidref_watching(Manager *m, const PidRef *pid);
+Unit* manager_get_unit_by_cgroup(Manager *m, const char *cgroup);
+Unit* manager_get_unit_by_pidref_cgroup(Manager *m, const PidRef *pid);
+Unit* manager_get_unit_by_pidref_watching(Manager *m, const PidRef *pid);
 Unit* manager_get_unit_by_pidref(Manager *m, PidRef *pid);
-Unit* manager_get_unit_by_pid(Manager *m, pid_t pid);
 
 uint64_t unit_get_ancestor_memory_min(Unit *u);
 uint64_t unit_get_ancestor_memory_low(Unit *u);
diff --git a/src/core/manager.c b/src/core/manager.c
index d335938b4be..110f20455d8 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -2881,7 +2881,7 @@ static void manager_invoke_sigchld_event(
         u->sigchldgen = m->sigchldgen;
 
         log_unit_debug(u, "Child "PID_FMT" belongs to %s.", si->si_pid, u->id);
-        unit_unwatch_pid(u, si->si_pid);
+        unit_unwatch_pidref(u, &PIDREF_MAKE_FROM_PID(si->si_pid));
 
         if (UNIT_VTABLE(u)->sigchld_event)
                 UNIT_VTABLE(u)->sigchld_event(u, si->si_pid, si->si_code, si->si_status);
diff --git a/src/core/unit.c b/src/core/unit.c
index c1a3b373a16..1254091d74e 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -2820,20 +2820,6 @@ int unit_watch_pidref(Unit *u, const PidRef *pid, bool exclusive) {
         return 0;
 }
 
-int unit_watch_pid(Unit *u, pid_t pid, bool exclusive) {
-        _cleanup_(pidref_done) PidRef pidref = PIDREF_NULL;
-        int r;
-
-        assert(u);
-        assert(pid_is_valid(pid));
-
-        r = pidref_set_pid(&pidref, pid);
-        if (r < 0)
-                return r;
-
-        return unit_watch_pidref(u, &pidref, exclusive);
-}
-
 void unit_unwatch_pidref(Unit *u, const PidRef *pid) {
         assert(u);
         assert(pidref_is_set(pid));
@@ -2883,10 +2869,6 @@ void unit_unwatch_pidref(Unit *u, const PidRef *pid) {
         }
 }
 
-void unit_unwatch_pid(Unit *u, pid_t pid) {
-        return unit_unwatch_pidref(u, &PIDREF_MAKE_FROM_PID(pid));
-}
-
 void unit_unwatch_all_pids(Unit *u) {
         assert(u);
 
diff --git a/src/core/unit.h b/src/core/unit.h
index dbaeebda8e6..822c39e5d11 100644
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -876,9 +876,7 @@ void unit_notify_cgroup_oom(Unit *u, bool managed_oom);
 void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_success);
 
 int unit_watch_pidref(Unit *u, const PidRef *pid, bool exclusive);
-int unit_watch_pid(Unit *u, pid_t pid, bool exclusive);
 void unit_unwatch_pidref(Unit *u, const PidRef *pid);
-void unit_unwatch_pid(Unit *u, pid_t pid);
 void unit_unwatch_all_pids(Unit *u);
 void unit_unwatch_pidref_done(Unit *u, PidRef *pidref);