From 4014172a8bc0838e483dbf62faf49e0862cadfeb Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 20 Jun 2023 14:18:52 +0200 Subject: [PATCH] =?utf8?q?sleep:=20rename=20sleep-config.[ch]=20=E2=86=92?= =?utf8?q?=20sleep-util.[ch]?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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. --- src/login/logind-action.h | 2 +- src/login/logind-dbus.c | 2 +- src/shared/meson.build | 2 +- src/shared/{sleep-config.c => sleep-util.c} | 2 +- src/shared/{sleep-config.h => sleep-util.h} | 0 src/sleep/sleep.c | 2 +- src/test/test-sleep.c | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename src/shared/{sleep-config.c => sleep-util.c} (99%) rename src/shared/{sleep-config.h => sleep-util.h} (100%) diff --git a/src/login/logind-action.h b/src/login/logind-action.h index dfef6400e93..7cb94d9beae 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 79531d2cc49..0d4ab28b4d4 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 d34e2c1dd92..5a982f31844 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 similarity index 99% rename from src/shared/sleep-config.c rename to src/shared/sleep-util.c index 04e76ad317e..eb9a43f5078 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 similarity index 100% rename from src/shared/sleep-config.h rename to src/shared/sleep-util.h diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c index 4a6a777ed63..46f46914b56 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 a873e6eb1bc..6bb8ca0874f 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" -- 2.47.3