Merge pull request #13836 from systemd/assert-cleanups-and-constification

Assert cleanups and constification

4 files changed, 5 insertions, 22 deletions

diff --git a/src/basic/def.h b/src/basic/def.h
index 2af0b763f0..970654a1ad 100644
--- a/src/basic/def.h
+++ b/src/basic/def.h
@@ -58,3 +58,8 @@
         STRV_MAKE(CONF_PATHS(n))
 
 #define HIGH_RLIMIT_MEMLOCK (1024ULL*1024ULL*64ULL)
+
+#define PLYMOUTH_SOCKET {                                       \
+                .un.sun_family = AF_UNIX,                       \
+                .un.sun_path = "\0/org/freedesktop/plymouthd",  \
+        }
diff --git a/src/basic/meson.build b/src/basic/meson.build
index 43ab1849f9..85795d4c4e 100644
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -162,8 +162,6 @@ basic_sources = files('''
         parse-util.h
         path-util.c
         path-util.h
-        plymouth-util.c
-        plymouth-util.h
         prioq.c
         prioq.h
         proc-cmdline.c
diff --git a/src/basic/plymouth-util.c b/src/basic/plymouth-util.c
deleted file mode 100644
index 2023ec3671..0000000000
--- a/src/basic/plymouth-util.c
+++ /dev/null
@@ -1,9 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
-
-#include <unistd.h>
-
-#include "plymouth-util.h"
-
-bool plymouth_running(void) {
-        return access("/run/plymouth/pid", F_OK) >= 0;
-}
diff --git a/src/basic/plymouth-util.h b/src/basic/plymouth-util.h
deleted file mode 100644
index e0539910c4..0000000000
--- a/src/basic/plymouth-util.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
-#pragma once
-
-#include <stdbool.h>
-
-#define PLYMOUTH_SOCKET {                                       \
-                .un.sun_family = AF_UNIX,                       \
-                .un.sun_path = "\0/org/freedesktop/plymouthd",  \
-        }
-
-bool plymouth_running(void);