]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
journald-kmsg: merge manager_kmsg_mode() into manager_open_dev_kmsg()
authorYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 15 Jul 2025 15:56:10 +0000 (00:56 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 18 Jul 2025 06:27:37 +0000 (15:27 +0900)
As it is now only used by the function.

src/journal/journald-kmsg.c

index 855839113b7a46a93da62ee365a0f0ac782686e4..1e5ad5a4e15457808c01cbd8f05db86afb2d44b8 100644 (file)
@@ -386,10 +386,6 @@ static int dispatch_dev_kmsg(sd_event_source *es, int fd, uint32_t revents, void
         return manager_read_dev_kmsg(m);
 }
 
-static mode_t manager_kmsg_mode(bool read_kmsg) {
-        return O_CLOEXEC|O_NONBLOCK|O_NOCTTY|(read_kmsg ? O_RDWR : O_WRONLY);
-}
-
 int manager_open_dev_kmsg(Manager *m) {
         int r;
 
@@ -397,7 +393,7 @@ int manager_open_dev_kmsg(Manager *m) {
         assert(m->dev_kmsg_fd < 0);
         assert(!m->dev_kmsg_event_source);
 
-        mode_t mode = manager_kmsg_mode(m->config.read_kmsg);
+        mode_t mode = O_CLOEXEC|O_NONBLOCK|O_NOCTTY|(m->config.read_kmsg ? O_RDWR : O_WRONLY);
 
         _cleanup_close_ int fd = open("/dev/kmsg", mode);
         if (fd < 0) {