reboot-util: merge with raw-reboot.h

The header raw-reboot.h is only used with reboot-util. Let's merge them.

diff --git a/src/basic/raw-reboot.h b/src/basic/raw-reboot.h
deleted file mode 100644 (file)
index d72ae1e..0000000
--- a/src/basic/raw-reboot.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
-#pragma once
-
-#include <linux/reboot.h>
-#include <sys/reboot.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-
-/* glibc defines the reboot() API call, which is a wrapper around the system call of the same name, but without the
- * extra "arg" parameter. Since we need that parameter for some calls, let's add a "raw" wrapper that is defined the
- * same way, except it takes the additional argument. */
-
-static inline int raw_reboot(int cmd, const void *arg) {
-        return (int) syscall(SYS_reboot, LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, cmd, arg);
-}

diff --git a/src/core/emergency-action.c b/src/core/emergency-action.c
index 989bb1753e5bbf98d259ab70553806c6f2c6c09e..439228c8995ff7fd572549be3dc403ed1d183181 100644 (file)
--- a/src/core/emergency-action.c
+++ b/src/core/emergency-action.c
@@ -1,12 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <sys/reboot.h>
 #include <unistd.h>
 
 #include "ansi-color.h"
 #include "emergency-action.h"
 #include "manager.h"
-#include "raw-reboot.h"
 #include "reboot-util.h"
 #include "special.h"
 #include "string-table.h"

diff --git a/src/shared/reboot-util.c b/src/shared/reboot-util.c
index f82c0654dc5f82a4e662e7c6af56010f6a68fc32..948e15631d8ab08e05125e6320968ec26c3ce41e 100644 (file)
--- a/src/shared/reboot-util.c
+++ b/src/shared/reboot-util.c
@@ -1,10 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <linux/reboot.h>
 #include <stdint.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
-#include <sys/reboot.h>
+#include <sys/syscall.h>
 #include <unistd.h>
 
 #if HAVE_XENCTRL
@@ -20,13 +19,16 @@
 #include "fileio.h"
 #include "log.h"
 #include "proc-cmdline.h"
-#include "raw-reboot.h"
 #include "reboot-util.h"
 #include "string-util.h"
 #include "umask-util.h"
 #include "utf8.h"
 #include "virt.h"
 
+int raw_reboot(int cmd, const void *arg) {
+        return syscall(SYS_reboot, LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, cmd, arg);
+}
+
 bool reboot_parameter_is_valid(const char *parameter) {
         assert(parameter);
 

diff --git a/src/shared/reboot-util.h b/src/shared/reboot-util.h
index 55419dfb14914ae6b362b81fc4ce526144d89ed9..276361aea8eaf8f5e1574480401a54a76ecf8f4e 100644 (file)
--- a/src/shared/reboot-util.h
+++ b/src/shared/reboot-util.h
@@ -1,8 +1,16 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
+#include <linux/reboot.h>       /* IWYU pragma: export */
+#include <sys/reboot.h>         /* IWYU pragma: export */
+
 #include "forward.h"
 
+/* glibc defines the reboot() API call, which is a wrapper around the system call of the same name, but
+ * without the extra "arg" parameter. Since we need that parameter for some calls, let's add a "raw" wrapper
+ * that is defined the same way, except it takes the additional argument. */
+int raw_reboot(int cmd, const void *arg);
+
 bool reboot_parameter_is_valid(const char *parameter);
 int update_reboot_parameter_and_warn(const char *parameter, bool keep);
 

diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c
index bb767161bdeaa8bc029054d49742fbab166e7a54..3317068e478ec7d397bc2e4bdb1e3b7394627e09 100644 (file)
--- a/src/shutdown/shutdown.c
+++ b/src/shutdown/shutdown.c
@@ -4,11 +4,9 @@
 ***/
 
 #include <getopt.h>
-#include <linux/reboot.h>
 #include <stdlib.h>
 #include <sys/mman.h>
 #include <sys/mount.h>
-#include <sys/reboot.h>
 #include <sys/stat.h>
 #include <unistd.h>
 

diff --git a/src/systemctl/systemctl-util.c b/src/systemctl/systemctl-util.c
index 019b763a869a1ce37823f5bf2ce251c9afb1f540..faefc556195250b600f5036bcc539e2bd5dfc660 100644 (file)
--- a/src/systemctl/systemctl-util.c
+++ b/src/systemctl/systemctl-util.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include <fnmatch.h>
-#include <sys/reboot.h>
 #include <unistd.h>
 
 #include "sd-bus.h"