From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 21 May 2025 07:45:18 +0000 (+0200)
Subject: fuzz: Clean up includes
X-Git-Tag: v258-rc1~557^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dadd36894c0b84cc07c37ebc3182a19350ea424d;p=thirdparty%2Fsystemd.git

fuzz: Clean up includes

Split out of #37344.
---

diff --git a/src/fuzz/fuzz-bus-label.c b/src/fuzz/fuzz-bus-label.c
index c7be82a7677..795afeb7ea5 100644
--- a/src/fuzz/fuzz-bus-label.c
+++ b/src/fuzz/fuzz-bus-label.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
-
 #include "alloc-util.h"
 #include "bus-label.h"
 #include "fuzz.h"
diff --git a/src/fuzz/fuzz-calendarspec.c b/src/fuzz/fuzz-calendarspec.c
index b31a3f2b172..8095d40d993 100644
--- a/src/fuzz/fuzz-calendarspec.c
+++ b/src/fuzz/fuzz-calendarspec.c
@@ -2,7 +2,6 @@
 
 #include "alloc-util.h"
 #include "calendarspec.h"
-#include "fd-util.h"
 #include "fuzz.h"
 #include "string-util.h"
 #include "time-util.h"
diff --git a/src/fuzz/fuzz-catalog.c b/src/fuzz/fuzz-catalog.c
index cbe8463a89b..965828827a4 100644
--- a/src/fuzz/fuzz-catalog.c
+++ b/src/fuzz/fuzz-catalog.c
@@ -1,9 +1,11 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <unistd.h>
+
 #include "catalog.h"
 #include "fd-util.h"
-#include "fs-util.h"
 #include "fuzz.h"
+#include "hashmap.h"
 #include "tmpfile-util.h"
 
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
diff --git a/src/fuzz/fuzz-compress.c b/src/fuzz/fuzz-compress.c
index adb0a969a85..bf53de92795 100644
--- a/src/fuzz/fuzz-compress.c
+++ b/src/fuzz/fuzz-compress.c
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <errno.h>
-
 #include "alloc-util.h"
 #include "compress.h"
 #include "fuzz.h"
diff --git a/src/fuzz/fuzz-env-file.c b/src/fuzz/fuzz-env-file.c
index ff7e529ac35..6a0fda69b48 100644
--- a/src/fuzz/fuzz-env-file.c
+++ b/src/fuzz/fuzz-env-file.c
@@ -2,7 +2,6 @@
 
 #include <stdio.h>
 
-#include "alloc-util.h"
 #include "env-file.h"
 #include "fd-util.h"
 #include "fuzz.h"
diff --git a/src/fuzz/fuzz-json.c b/src/fuzz/fuzz-json.c
index ea11940e4b8..c0c0f2b1b75 100644
--- a/src/fuzz/fuzz-json.c
+++ b/src/fuzz/fuzz-json.c
@@ -2,7 +2,6 @@
 
 #include "sd-json.h"
 
-#include "alloc-util.h"
 #include "env-util.h"
 #include "fd-util.h"
 #include "fuzz.h"
diff --git a/src/fuzz/fuzz-main.c b/src/fuzz/fuzz-main.c
index cf70424c162..928fc74525e 100644
--- a/src/fuzz/fuzz-main.c
+++ b/src/fuzz/fuzz-main.c
@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <stdlib.h>
+
 #include "alloc-util.h"
 #include "fileio.h"
 #include "fuzz.h"
diff --git a/src/fuzz/fuzz-time-util.c b/src/fuzz/fuzz-time-util.c
index 5be2e4f1dde..6f5124986a6 100644
--- a/src/fuzz/fuzz-time-util.c
+++ b/src/fuzz/fuzz-time-util.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "alloc-util.h"
-#include "fd-util.h"
 #include "fuzz.h"
 #include "time-util.h"
 
diff --git a/src/fuzz/fuzz-udev-database.c b/src/fuzz/fuzz-udev-database.c
index 6b4fc8270d9..f1a4ef76e36 100644
--- a/src/fuzz/fuzz-udev-database.c
+++ b/src/fuzz/fuzz-udev-database.c
@@ -3,7 +3,6 @@
 #include "device-internal.h"
 #include "device-private.h"
 #include "fd-util.h"
-#include "fs-util.h"
 #include "fuzz.h"
 #include "tmpfile-util.h"
 
diff --git a/src/fuzz/fuzz-varlink-idl.c b/src/fuzz/fuzz-varlink-idl.c
index 9eb021a7d12..f2b73f622a8 100644
--- a/src/fuzz/fuzz-varlink-idl.c
+++ b/src/fuzz/fuzz-varlink-idl.c
@@ -1,16 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <unistd.h>
-
 #include "sd-varlink-idl.h"
 
 #include "alloc-util.h"
-#include "errno-util.h"
-#include "fd-util.h"
 #include "fuzz.h"
-#include "io-util.h"
 #include "log.h"
-#include "string-util.h"
 #include "varlink-idl-util.h"
 
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
diff --git a/src/fuzz/fuzz-varlink.c b/src/fuzz/fuzz-varlink.c
index 2497fe3b9e7..84ff9b904ad 100644
--- a/src/fuzz/fuzz-varlink.c
+++ b/src/fuzz/fuzz-varlink.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <unistd.h>
+#include <sys/socket.h>
 
 #include "sd-varlink.h"
 
diff --git a/src/fuzz/fuzz.h b/src/fuzz/fuzz.h
index 6da06f237b7..6e4935d555d 100644
--- a/src/fuzz/fuzz.h
+++ b/src/fuzz/fuzz.h
@@ -1,11 +1,10 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include <stddef.h>
-#include <stdint.h>
+#include <stdio.h>
+
+#include "forward.h"
 
-#include "assert-util.h"
-#include "env-util.h"
 #include "fileio.h"
 #include "log.h"