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.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-11-11 18:39:39 +01:00
parent 0221d68a13
commit fde32028a4
27 changed files with 3 additions and 27 deletions

View File

@ -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"

View File

@ -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"

View File

@ -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)

View File

@ -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"

View File

@ -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"

View File

@ -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,

View File

@ -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"

View File

@ -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"

View File

@ -25,7 +25,6 @@
#include "alloc-util.h"
#include "architecture.h"
#include "def.h"
#include "escape.h"
#include "fd-util.h"
#include "fileio.h"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -1,6 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
#include "def.h"
#include "fd-util.h"
#include "fileio.h"
#include "hostname-util.h"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -2,7 +2,6 @@
#include <string.h>
#include "def.h"
#include "env-util.h"
#include "fd-util.h"
#include "fileio.h"

View File

@ -1,6 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
#include "def.h"
#include "escape.h"
#include "fd-util.h"
#include "fileio.h"

View File

@ -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"