Move LONG_LINE_MAX definition to fileio.h

All users of the macro (except for one, in serialize.c), use the macro in
connection with read_line(), so they must include fileio.h.  Let's not play
libc games and require multiple header file to be included for the most common
use of a function.

The removal of def.h includes is not exact. I mostly went over the commits that
switch over to use read_line() and add def.h at the same time and reverted the
addition of def.h in those files.

diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
index c517c52995b7244b2b43ee164afbfefee4774fbd..7ca8f06234234aa9bd13db3eb61d6eac024fa98c 100644 (file)
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -3,7 +3,6 @@
 #include "sd-device.h"
 
 #include "alloc-util.h"
-#include "def.h"
 #include "device-util.h"
 #include "escape.h"
 #include "fileio.h"

diff --git a/src/basic/clock-util.c b/src/basic/clock-util.c
index b77e780bed893169b053050c740758569d8855a7..1877a81434578d1723d5c761b518e1056b329319 100644 (file)
--- a/src/basic/clock-util.c
+++ b/src/basic/clock-util.c
@@ -12,7 +12,6 @@
 
 #include "alloc-util.h"
 #include "clock-util.h"
-#include "def.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "macro.h"

diff --git a/src/basic/def.h b/src/basic/def.h
index 005cd8d090e6d71ca4ed84cff4c724b8d2e6b639..5be018d82e4e4a9fd50488fcacc7b54dd3098c86 100644 (file)
--- a/src/basic/def.h
+++ b/src/basic/def.h
@@ -74,6 +74,4 @@
                 "/usr/lib/" n                   \
                 _CONF_PATHS_SPLIT_USR(n))
 
-#define LONG_LINE_MAX (1U*1024U*1024U)
-
 #define HIGH_RLIMIT_MEMLOCK (1024ULL*1024ULL*64ULL)

diff --git a/src/basic/exec-util.c b/src/basic/exec-util.c
index 2a96ecf9bb303b5d672f7b4bc1aeeaecf3038a5c..031a99afc118db8cec84a29f612514f8abb47f99 100644 (file)
--- a/src/basic/exec-util.c
+++ b/src/basic/exec-util.c
@@ -9,7 +9,6 @@
 
 #include "alloc-util.h"
 #include "conf-files.h"
-#include "def.h"
 #include "env-util.h"
 #include "exec-util.h"
 #include "fd-util.h"

diff --git a/src/basic/fileio.c b/src/basic/fileio.c
index fa6084e602a86484ad7815ad543157003297afa9..dc12d0e07f304d57617e159f8c125fea09aab893 100644 (file)
--- a/src/basic/fileio.c
+++ b/src/basic/fileio.c
@@ -15,7 +15,6 @@
 
 #include "alloc-util.h"
 #include "ctype.h"
-#include "def.h"
 #include "env-util.h"
 #include "escape.h"
 #include "fd-util.h"

diff --git a/src/basic/fileio.h b/src/basic/fileio.h
index f8098484080780b48c822c30eebe10d5d5553329..a9e0c2526f4ee2e5fda4bbde0a9ad058c1a23f29 100644 (file)
--- a/src/basic/fileio.h
+++ b/src/basic/fileio.h
@@ -10,6 +10,8 @@
 #include "macro.h"
 #include "time-util.h"
 
+#define LONG_LINE_MAX (1U*1024U*1024U)
+
 typedef enum {
         WRITE_STRING_FILE_CREATE            = 1 << 0,
         WRITE_STRING_FILE_ATOMIC            = 1 << 1,

diff --git a/src/basic/hostname-util.c b/src/basic/hostname-util.c
index 09fabe077b5dc156541d9593351a114f5f6bb6b8..3a3479910d77a8bc047bdf7c0a34b6cc1bf85f20 100644 (file)
--- a/src/basic/hostname-util.c
+++ b/src/basic/hostname-util.c
@@ -8,7 +8,6 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
-#include "def.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "hostname-util.h"

diff --git a/src/basic/mount-util.c b/src/basic/mount-util.c
index 358c8a91433e07ce2996a76fa7242543025f3ae3..ec607c7360a03e698d04f8334b0b5b4864f73ad1 100644 (file)
--- a/src/basic/mount-util.c
+++ b/src/basic/mount-util.c
@@ -13,7 +13,6 @@
 #include <libmount.h>
 
 #include "alloc-util.h"
-#include "def.h"
 #include "escape.h"
 #include "extract-word.h"
 #include "fd-util.h"

diff --git a/src/basic/process-util.c b/src/basic/process-util.c
index b2aab853e255a3786f5624c50cddaa20b553b22a..f1d46eec2fe41469502407db3d6119be8183b9e2 100644 (file)
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@@ -25,7 +25,6 @@
 
 #include "alloc-util.h"
 #include "architecture.h"
-#include "def.h"
 #include "escape.h"
 #include "fd-util.h"
 #include "fileio.h"

diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index 151ac954adf6411d0ed660f07ee6fb72778e0984..30ad83d0a76b6e293ddf84e21fe9f525404463b9 100644 (file)
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -14,7 +14,6 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
-#include "def.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"

diff --git a/src/basic/virt.c b/src/basic/virt.c
index e05b3e6d990c5d7b0210b698b5dd7fba64244e29..f63f15f6c14f81799ecf848588c2a0b4a3dc1c10 100644 (file)
--- a/src/basic/virt.c
+++ b/src/basic/virt.c
@@ -11,7 +11,6 @@
 
 #include "alloc-util.h"
 #include "dirent-util.h"
-#include "def.h"
 #include "env-util.h"
 #include "fd-util.h"
 #include "fileio.h"

diff --git a/src/core/ima-setup.c b/src/core/ima-setup.c
index d9e5cf4f053dd31a1f084133cc521e50450fdc43..fd7c5f64af1061112ca0415cc1b39103e9c759ee 100644 (file)
--- a/src/core/ima-setup.c
+++ b/src/core/ima-setup.c
@@ -8,7 +8,6 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
-#include "def.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "ima-setup.h"

diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c
index 4e9506f09cfdf5306f509e83c041c8f0d0abac30..4bb2051aa3deb93590b064868e887247b9f1bf9f 100644 (file)
--- a/src/core/smack-setup.c
+++ b/src/core/smack-setup.c
@@ -14,7 +14,6 @@
 #include <string.h>
 
 #include "alloc-util.h"
-#include "def.h"
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "fileio.h"

diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index 45231bf5271922423a08cfebf57e19ffde357c64..85ace5379cd9f9289ea8934ea6e2fec3df852446 100644 (file)
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -4,7 +4,6 @@
 #include <stdio_ext.h>
 
 #include "alloc-util.h"
-#include "def.h"
 #include "dropin.h"
 #include "escape.h"
 #include "fd-util.h"

diff --git a/src/journal/catalog.c b/src/journal/catalog.c
index 82c35d1d09ac69940599ebe3eacbad2911e4d866..3c8f2f92be7e0b72fb0464cc4bea241e0eddbdf7 100644 (file)
--- a/src/journal/catalog.c
+++ b/src/journal/catalog.c
@@ -13,7 +13,6 @@
 #include "alloc-util.h"
 #include "catalog.h"
 #include "conf-files.h"
-#include "def.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "hashmap.h"

diff --git a/src/libsystemd/sd-hwdb/hwdb-util.c b/src/libsystemd/sd-hwdb/hwdb-util.c
index 140ea6b591f7964757820cf9174d8904c048d9f1..87259daadc78b9a6a98929ee9b1e01d51ce3c33b 100644 (file)
--- a/src/libsystemd/sd-hwdb/hwdb-util.c
+++ b/src/libsystemd/sd-hwdb/hwdb-util.c
@@ -5,7 +5,6 @@
 
 #include "alloc-util.h"
 #include "conf-files.h"
-#include "def.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"

diff --git a/src/libsystemd/sd-path/sd-path.c b/src/libsystemd/sd-path/sd-path.c
index d590c90f2e62ee9d777de80d2a65be11ac26d833..9949c23802f56d2457afc6a88b19653c30f47a1a 100644 (file)
--- a/src/libsystemd/sd-path/sd-path.c
+++ b/src/libsystemd/sd-path/sd-path.c
@@ -4,7 +4,6 @@
 
 #include "alloc-util.h"
 #include "architecture.h"
-#include "def.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"

diff --git a/src/reply-password/reply-password.c b/src/reply-password/reply-password.c
index 122047ffff0b0e6e1f4bd0dcc61d5086f5645776..bec754f7be50911cd30824aa82d0f408fed2ea94 100644 (file)
--- a/src/reply-password/reply-password.c
+++ b/src/reply-password/reply-password.c
@@ -7,7 +7,6 @@
 #include <sys/un.h>
 
 #include "alloc-util.h"
-#include "def.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "log.h"

diff --git a/src/resolve/resolved-etc-hosts.c b/src/resolve/resolved-etc-hosts.c
index 8074612fb47b30d36ad2fef678177dffbe72bc1c..00ff20d2dca331064eff1d409d756991a6f95310 100644 (file)
--- a/src/resolve/resolved-etc-hosts.c
+++ b/src/resolve/resolved-etc-hosts.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include "def.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "hostname-util.h"

diff --git a/src/resolve/resolved-resolv-conf.c b/src/resolve/resolved-resolv-conf.c
index 6b74daf776b0f7f0966049f888ebe885dd750906..f8b5301c1ed8424469672cb29f9658df3fb15bf6 100644 (file)
--- a/src/resolve/resolved-resolv-conf.c
+++ b/src/resolve/resolved-resolv-conf.c
@@ -4,7 +4,6 @@
 #include <stdio_ext.h>
 
 #include "alloc-util.h"
-#include "def.h"
 #include "dns-domain.h"
 #include "fd-util.h"
 #include "fileio-label.h"

diff --git a/src/shared/clean-ipc.c b/src/shared/clean-ipc.c
index f9b05ff9249a7c1c1e77eac8633e134dec877244..46fa68027ed9477e6abdad61fcf89a4f07360f76 100644 (file)
--- a/src/shared/clean-ipc.c
+++ b/src/shared/clean-ipc.c
@@ -16,7 +16,6 @@
 #include <unistd.h>
 
 #include "clean-ipc.h"
-#include "def.h"
 #include "dirent-util.h"
 #include "fd-util.h"
 #include "fileio.h"

diff --git a/src/shared/install.c b/src/shared/install.c
index d08d0af7b5a0e08007fdc69b5427d2f6e2e561c1..1fd24cb4ebe672223c1f1c7d5745bc05f5a7043c 100644 (file)
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -15,7 +15,6 @@
 #include "alloc-util.h"
 #include "conf-files.h"
 #include "conf-parser.h"
-#include "def.h"
 #include "dirent-util.h"
 #include "extract-word.h"
 #include "fd-util.h"

diff --git a/src/shared/serialize.c b/src/shared/serialize.c
index 3a6f8f60ebd0c868dd8273377f40b404833566c7..d0f86a83f475102d7d21b652a92a239d11cc98b8 100644 (file)
--- a/src/shared/serialize.c
+++ b/src/shared/serialize.c
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include "alloc-util.h"
-#include "def.h"
 #include "env-util.h"
 #include "escape.h"
+#include "fileio.h"
 #include "parse-util.h"
 #include "serialize.h"
 #include "strv.h"

diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
index 1566895ba36f3e33a67bc282da877faebc0a3022..cffaae1286088ca93fe974fff8a895a762a3bf25 100644 (file)
--- a/src/sysv-generator/sysv-generator.c
+++ b/src/sysv-generator/sysv-generator.c
@@ -5,7 +5,6 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
-#include "def.h"
 #include "dirent-util.h"
 #include "exit-status.h"
 #include "fd-util.h"

diff --git a/src/test/test-env-util.c b/src/test/test-env-util.c
index 4c33c7c13c06f2be5a71070412eec0835a22031c..f57a26021c3042b52489d1a528547d5c7ec994a9 100644 (file)
--- a/src/test/test-env-util.c
+++ b/src/test/test-env-util.c
@@ -2,7 +2,6 @@
 
 #include <string.h>
 
-#include "def.h"
 #include "env-util.h"
 #include "fd-util.h"
 #include "fileio.h"

diff --git a/src/test/test-serialize.c b/src/test/test-serialize.c
index 9a16688a67ce62b86b6bc25bff06a0429f50118d..e306b1f1d63782a6a830d98ac5de8b8d4f960cd1 100644 (file)
--- a/src/test/test-serialize.c
+++ b/src/test/test-serialize.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
-#include "def.h"
 #include "escape.h"
 #include "fd-util.h"
 #include "fileio.h"

diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index ad4b32abea063540885211b28cbaa12b10334dd5..67e31a6f539b6e50d0a4450d4cdfb33e490fe45f 100644 (file)
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -15,7 +15,6 @@
 
 #include "alloc-util.h"
 #include "conf-files.h"
-#include "def.h"
 #include "device-private.h"
 #include "device-util.h"
 #include "dirent-util.h"