From 181d9556a1364ad2977b9cbd75a4b59a4ba79d89 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Thu, 5 May 2022 14:48:30 +0200 Subject: [PATCH] Drop config.h include from helpers.h, exported header file Drop the config.h include from helpers.h after a report from a colleague trying to build an external plugin from the latest GIT sources. Instead, make sure config.h is included, and properly commented, in all .c files that have configure #ifdefs and other deps. Also, move more ot the includes from helpers.h to their respective .c file instead to reduce the amount of headers an external plugin pulls in. Signed-off-by: Joachim Wiberg --- plugins/bootmisc.c | 4 ++++ src/api.c | 3 ++- src/getty.c | 2 +- src/helpers.c | 2 ++ src/helpers.h | 4 ---- src/log.c | 3 ++- src/mdadm.c | 2 ++ src/mount.c | 2 ++ src/pid.c | 2 ++ src/plugin.c | 3 ++- src/service.c | 1 + src/sig.c | 2 ++ src/stty.c | 6 ++++-- src/svc.c | 2 ++ src/tty.c | 2 ++ src/util.c | 5 ++++- src/utmp-api.c | 2 +- 17 files changed, 35 insertions(+), 12 deletions(-) diff --git a/plugins/bootmisc.c b/plugins/bootmisc.c index 729fe2ce..9d79dfd0 100644 --- a/plugins/bootmisc.c +++ b/plugins/bootmisc.c @@ -21,8 +21,12 @@ * THE SOFTWARE. */ +#include "config.h" /* Generated by configure script */ + #include +#ifdef HAVE_MNTENT_H #include +#endif #include #ifdef _LIBITE_LITE # include diff --git a/src/api.c b/src/api.c index b9658824..985a9dce 100644 --- a/src/api.c +++ b/src/api.c @@ -21,6 +21,8 @@ * THE SOFTWARE. */ +#include "config.h" /* Generated by configure script */ + #include #include #include @@ -36,7 +38,6 @@ #endif #include -#include "config.h" #include "finit.h" #include "cond.h" #include "conf.h" diff --git a/src/getty.c b/src/getty.c index e1a07ad0..a59f3097 100644 --- a/src/getty.c +++ b/src/getty.c @@ -21,7 +21,7 @@ * THE SOFTWARE. */ -#include "config.h" +#include "config.h" /* Generated by configure script */ #include #include diff --git a/src/helpers.c b/src/helpers.c index 71f3719b..7d23ab21 100644 --- a/src/helpers.c +++ b/src/helpers.c @@ -22,6 +22,8 @@ * THE SOFTWARE. */ +#include "config.h" /* Generated by configure script */ + #include /* isblank() */ #include #include diff --git a/src/helpers.h b/src/helpers.h index b87d981b..ecc239cf 100644 --- a/src/helpers.h +++ b/src/helpers.h @@ -25,10 +25,6 @@ #ifndef FINIT_HELPERS_H_ #define FINIT_HELPERS_H_ -#include "config.h" - -#include -#include /* sched_yield() */ #include #include #include diff --git a/src/log.c b/src/log.c index bc0bd3de..c2d16482 100644 --- a/src/log.c +++ b/src/log.c @@ -21,7 +21,8 @@ * THE SOFTWARE. */ -#include "config.h" +#include "config.h" /* Generated by configure script */ + #include #include #ifdef _LIBITE_LITE diff --git a/src/mdadm.c b/src/mdadm.c index c303ba22..1800e88a 100644 --- a/src/mdadm.c +++ b/src/mdadm.c @@ -21,6 +21,8 @@ * THE SOFTWARE. */ +#include "config.h" /* Generated by configure script */ + #include #include #include diff --git a/src/mount.c b/src/mount.c index 32222c2b..9c887d93 100644 --- a/src/mount.c +++ b/src/mount.c @@ -21,6 +21,8 @@ * THE SOFTWARE. */ +#include "config.h" /* Generated by configure script */ + #include #include #ifdef HAVE_MNTENT_H diff --git a/src/pid.c b/src/pid.c index c30f99d2..48d77988 100644 --- a/src/pid.c +++ b/src/pid.c @@ -22,6 +22,8 @@ * THE SOFTWARE. */ +#include "config.h" /* Generated by configure script */ + #include #include #include diff --git a/src/plugin.c b/src/plugin.c index ac6a8bc7..25bf2d34 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -21,6 +21,8 @@ * THE SOFTWARE. */ +#include "config.h" /* Generated by configure script */ + #include #include /* dlopen() et al */ #include /* readdir() et al */ @@ -34,7 +36,6 @@ # include /* BSD sys/queue.h API */ #endif -#include "config.h" #include "cond.h" #include "finit.h" #include "helpers.h" diff --git a/src/service.c b/src/service.c index 64d84740..fbb86a45 100644 --- a/src/service.c +++ b/src/service.c @@ -25,6 +25,7 @@ #include "config.h" /* Generated by configure script */ #include /* isblank() */ +#include /* sched_yield() */ #include #include #include diff --git a/src/sig.c b/src/sig.c index 20890fc0..cd22b053 100644 --- a/src/sig.c +++ b/src/sig.c @@ -69,6 +69,8 @@ * Finit defaults to nothing but sets sys/pwr/fail condition. */ +#include "config.h" /* Generated by configure script */ + #include #ifdef HAVE_MNTENT_H #include diff --git a/src/stty.c b/src/stty.c index add31b62..f5a48bd0 100644 --- a/src/stty.c +++ b/src/stty.c @@ -21,10 +21,12 @@ * THE SOFTWARE. */ +#include "config.h" /* Generated by configure script */ + #include #include -#include /* _POSIX_VDISABLE */ -#include /* Not included by default in musl libc */ +#include /* _POSIX_VDISABLE */ +#include /* Not included by default in musl libc */ #include #include "helpers.h" diff --git a/src/svc.c b/src/svc.c index 9a8461a9..c946affa 100644 --- a/src/svc.c +++ b/src/svc.c @@ -22,6 +22,8 @@ * THE SOFTWARE. */ +#include "config.h" /* Generated by configure script */ + #include #include /* isdigit() */ #include diff --git a/src/tty.c b/src/tty.c index ee0a5198..e97a4647 100644 --- a/src/tty.c +++ b/src/tty.c @@ -22,6 +22,8 @@ * THE SOFTWARE. */ +#include "config.h" /* Generated by configure script */ + #include /* isdigit() */ #include #include diff --git a/src/util.c b/src/util.c index 37a085a3..22bd6493 100644 --- a/src/util.c +++ b/src/util.c @@ -21,10 +21,13 @@ * THE SOFTWARE. */ -#include "config.h" +#include "config.h" /* Generated by configure script */ + #include /* isprint() */ #include +#ifdef HAVE_MNTENT_H #include +#endif #include #include #include diff --git a/src/utmp-api.c b/src/utmp-api.c index 2a0917d3..77e2aa76 100644 --- a/src/utmp-api.c +++ b/src/utmp-api.c @@ -21,7 +21,7 @@ * THE SOFTWARE. */ -#include "config.h" +#include "config.h" /* Generated by configure script */ #include #include