From fde32028a4587fa13567c0f88e91be191ae9bdad Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 11 Nov 2018 18:39:39 +0100 Subject: [PATCH] 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. --- src/backlight/backlight.c | 1 - src/basic/clock-util.c | 1 - src/basic/def.h | 2 -- src/basic/exec-util.c | 1 - src/basic/fileio.c | 1 - src/basic/fileio.h | 2 ++ src/basic/hostname-util.c | 1 - src/basic/mount-util.c | 1 - src/basic/process-util.c | 1 - src/basic/time-util.c | 1 - src/basic/virt.c | 1 - src/core/ima-setup.c | 1 - src/core/smack-setup.c | 1 - src/cryptsetup/cryptsetup-generator.c | 1 - src/journal/catalog.c | 1 - src/libsystemd/sd-hwdb/hwdb-util.c | 1 - src/libsystemd/sd-path/sd-path.c | 1 - src/reply-password/reply-password.c | 1 - src/resolve/resolved-etc-hosts.c | 1 - src/resolve/resolved-resolv-conf.c | 1 - src/shared/clean-ipc.c | 1 - src/shared/install.c | 1 - src/shared/serialize.c | 2 +- src/sysv-generator/sysv-generator.c | 1 - src/test/test-env-util.c | 1 - src/test/test-serialize.c | 1 - src/udev/udev-rules.c | 1 - 27 files changed, 3 insertions(+), 27 deletions(-) diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c index c517c52..7ca8f06 100644 --- 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 b77e780..1877a81 100644 --- 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 005cd8d..5be018d 100644 --- 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 2a96ecf..031a99a 100644 --- 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 fa6084e..dc12d0e 100644 --- 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 f809848..a9e0c25 100644 --- 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 09fabe0..3a34799 100644 --- a/src/basic/hostname-util.c +++ b/src/basic/hostname-util.c @@ -8,7 +8,6 @@ #include #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 358c8a9..ec607c7 100644 --- a/src/basic/mount-util.c +++ b/src/basic/mount-util.c @@ -13,7 +13,6 @@ #include #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 b2aab85..f1d46ee 100644 --- 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 151ac95..30ad83d 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c @@ -14,7 +14,6 @@ #include #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 e05b3e6..f63f15f 100644 --- 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 d9e5cf4..fd7c5f6 100644 --- a/src/core/ima-setup.c +++ b/src/core/ima-setup.c @@ -8,7 +8,6 @@ #include #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 4e9506f..4bb2051 100644 --- a/src/core/smack-setup.c +++ b/src/core/smack-setup.c @@ -14,7 +14,6 @@ #include #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 45231bf..85ace53 100644 --- a/src/cryptsetup/cryptsetup-generator.c +++ b/src/cryptsetup/cryptsetup-generator.c @@ -4,7 +4,6 @@ #include #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 82c35d1..3c8f2f9 100644 --- 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 140ea6b..87259da 100644 --- 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 d590c90..9949c23 100644 --- 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 122047f..bec754f 100644 --- a/src/reply-password/reply-password.c +++ b/src/reply-password/reply-password.c @@ -7,7 +7,6 @@ #include #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 8074612..00ff20d 100644 --- 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 6b74daf..f8b5301 100644 --- a/src/resolve/resolved-resolv-conf.c +++ b/src/resolve/resolved-resolv-conf.c @@ -4,7 +4,6 @@ #include #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 f9b05ff..46fa680 100644 --- a/src/shared/clean-ipc.c +++ b/src/shared/clean-ipc.c @@ -16,7 +16,6 @@ #include #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 d08d0af..1fd24cb 100644 --- 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 3a6f8f6..d0f86a8 100644 --- 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 1566895..cffaae1 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c @@ -5,7 +5,6 @@ #include #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 4c33c7c..f57a260 100644 --- a/src/test/test-env-util.c +++ b/src/test/test-env-util.c @@ -2,7 +2,6 @@ #include -#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 9a16688..e306b1f 100644 --- 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 ad4b32a..67e31a6 100644 --- 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" -- 2.7.4