summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2023-06-20 14:18:52 +0200
committerLennart Poettering <lennart@poettering.net>2023-06-20 14:18:52 +0200
commit4014172a8bc0838e483dbf62faf49e0862cadfeb (patch)
treef7405196529e0c995e626958b768047ca4fbb0dd
parentsleep-config: reduce scope of DMI object path a bit (diff)
downloadsystemd-4014172a8bc0838e483dbf62faf49e0862cadfeb.tar.xz
systemd-4014172a8bc0838e483dbf62faf49e0862cadfeb.zip
sleep: rename sleep-config.[ch] → sleep-util.[ch]
The file long ceased to be exclusively about configuration of the sleep operation. It contains many many calls for other purposes, hence give it a more generic name.
-rw-r--r--src/login/logind-action.h2
-rw-r--r--src/login/logind-dbus.c2
-rw-r--r--src/shared/meson.build2
-rw-r--r--src/shared/sleep-util.c (renamed from src/shared/sleep-config.c)2
-rw-r--r--src/shared/sleep-util.h (renamed from src/shared/sleep-config.h)0
-rw-r--r--src/sleep/sleep.c2
-rw-r--r--src/test/test-sleep.c2
7 files changed, 6 insertions, 6 deletions
diff --git a/src/login/logind-action.h b/src/login/logind-action.h
index dfef6400e9..7cb94d9bea 100644
--- a/src/login/logind-action.h
+++ b/src/login/logind-action.h
@@ -24,7 +24,7 @@ typedef struct HandleActionData HandleActionData;
#include "logind-inhibit.h"
#include "logind.h"
-#include "sleep-config.h"
+#include "sleep-util.h"
static inline bool handle_action_valid(HandleAction a) {
return a >= 0 && a < _HANDLE_ACTION_MAX;
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 79531d2cc4..0d4ab28b4d 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -46,7 +46,7 @@
#include "process-util.h"
#include "reboot-util.h"
#include "selinux-util.h"
-#include "sleep-config.h"
+#include "sleep-util.h"
#include "special.h"
#include "serialize.h"
#include "stdio-util.h"
diff --git a/src/shared/meson.build b/src/shared/meson.build
index d34e2c1dd9..5a982f3184 100644
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -142,7 +142,7 @@ shared_sources = files(
'selinux-util.c',
'serialize.c',
'service-util.c',
- 'sleep-config.c',
+ 'sleep-util.c',
'smack-util.c',
'socket-label.c',
'socket-netlink.c',
diff --git a/src/shared/sleep-config.c b/src/shared/sleep-util.c
index 04e76ad317..eb9a43f507 100644
--- a/src/shared/sleep-config.c
+++ b/src/shared/sleep-util.c
@@ -36,7 +36,7 @@
#include "macro.h"
#include "path-util.h"
#include "siphash24.h"
-#include "sleep-config.h"
+#include "sleep-util.h"
#include "stat-util.h"
#include "stdio-util.h"
#include "string-table.h"
diff --git a/src/shared/sleep-config.h b/src/shared/sleep-util.h
index 0f32e7f8ae..0f32e7f8ae 100644
--- a/src/shared/sleep-config.h
+++ b/src/shared/sleep-util.h
diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
index 4a6a777ed6..46f46914b5 100644
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@ -34,7 +34,7 @@
#include "main-func.h"
#include "parse-util.h"
#include "pretty-print.h"
-#include "sleep-config.h"
+#include "sleep-util.h"
#include "special.h"
#include "stdio-util.h"
#include "string-util.h"
diff --git a/src/test/test-sleep.c b/src/test/test-sleep.c
index a873e6eb1b..6bb8ca0874 100644
--- a/src/test/test-sleep.c
+++ b/src/test/test-sleep.c
@@ -12,7 +12,7 @@
#include "fd-util.h"
#include "log.h"
#include "memory-util.h"
-#include "sleep-config.h"
+#include "sleep-util.h"
#include "strv.h"
#include "tests.h"