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 <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2022-05-05 14:48:30 +02:00
parent bf72e6b9c8
commit 181d9556a1
17 changed files with 35 additions and 12 deletions
+4
View File
@@ -21,8 +21,12 @@
* THE SOFTWARE.
*/
#include "config.h" /* Generated by configure script */
#include <ftw.h>
#ifdef HAVE_MNTENT_H
#include <mntent.h>
#endif
#include <string.h>
#ifdef _LIBITE_LITE
# include <libite/lite.h>
+2 -1
View File
@@ -21,6 +21,8 @@
* THE SOFTWARE.
*/
#include "config.h" /* Generated by configure script */
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
@@ -36,7 +38,6 @@
#endif
#include <uev/uev.h>
#include "config.h"
#include "finit.h"
#include "cond.h"
#include "conf.h"
+1 -1
View File
@@ -21,7 +21,7 @@
* THE SOFTWARE.
*/
#include "config.h"
#include "config.h" /* Generated by configure script */
#include <err.h>
#include <errno.h>
+2
View File
@@ -22,6 +22,8 @@
* THE SOFTWARE.
*/
#include "config.h" /* Generated by configure script */
#include <ctype.h> /* isblank() */
#include <errno.h>
#include <grp.h>
-4
View File
@@ -25,10 +25,6 @@
#ifndef FINIT_HELPERS_H_
#define FINIT_HELPERS_H_
#include "config.h"
#include <mntent.h>
#include <sched.h> /* sched_yield() */
#include <stdarg.h>
#include <sys/resource.h>
#include <sys/types.h>
+2 -1
View File
@@ -21,7 +21,8 @@
* THE SOFTWARE.
*/
#include "config.h"
#include "config.h" /* Generated by configure script */
#include <stdio.h>
#include <stdarg.h>
#ifdef _LIBITE_LITE
+2
View File
@@ -21,6 +21,8 @@
* THE SOFTWARE.
*/
#include "config.h" /* Generated by configure script */
#include <glob.h>
#include <stdio.h>
#include <string.h>
+2
View File
@@ -21,6 +21,8 @@
* THE SOFTWARE.
*/
#include "config.h" /* Generated by configure script */
#include <errno.h>
#include <string.h>
#ifdef HAVE_MNTENT_H
+2
View File
@@ -22,6 +22,8 @@
* THE SOFTWARE.
*/
#include "config.h" /* Generated by configure script */
#include <errno.h>
#include <paths.h>
#include <stdio.h>
+2 -1
View File
@@ -21,6 +21,8 @@
* THE SOFTWARE.
*/
#include "config.h" /* Generated by configure script */
#include <errno.h>
#include <dlfcn.h> /* dlopen() et al */
#include <dirent.h> /* readdir() et al */
@@ -34,7 +36,6 @@
# include <lite/queue.h> /* BSD sys/queue.h API */
#endif
#include "config.h"
#include "cond.h"
#include "finit.h"
#include "helpers.h"
+1
View File
@@ -25,6 +25,7 @@
#include "config.h" /* Generated by configure script */
#include <ctype.h> /* isblank() */
#include <sched.h> /* sched_yield() */
#include <string.h>
#include <sys/reboot.h>
#include <sys/prctl.h>
+2
View File
@@ -69,6 +69,8 @@
* Finit defaults to nothing but sets sys/pwr/fail condition.
*/
#include "config.h" /* Generated by configure script */
#include <dirent.h>
#ifdef HAVE_MNTENT_H
#include <mntent.h>
+4 -2
View File
@@ -21,10 +21,12 @@
* THE SOFTWARE.
*/
#include "config.h" /* Generated by configure script */
#include <errno.h>
#include <stdlib.h>
#include <unistd.h> /* _POSIX_VDISABLE */
#include <sys/ttydefaults.h> /* Not included by default in musl libc */
#include <unistd.h> /* _POSIX_VDISABLE */
#include <sys/ttydefaults.h> /* Not included by default in musl libc */
#include <termios.h>
#include "helpers.h"
+2
View File
@@ -22,6 +22,8 @@
* THE SOFTWARE.
*/
#include "config.h" /* Generated by configure script */
#include <err.h>
#include <ctype.h> /* isdigit() */
#include <time.h>
+2
View File
@@ -22,6 +22,8 @@
* THE SOFTWARE.
*/
#include "config.h" /* Generated by configure script */
#include <ctype.h> /* isdigit() */
#include <signal.h>
#include <termios.h>
+4 -1
View File
@@ -21,10 +21,13 @@
* THE SOFTWARE.
*/
#include "config.h"
#include "config.h" /* Generated by configure script */
#include <ctype.h> /* isprint() */
#include <errno.h>
#ifdef HAVE_MNTENT_H
#include <mntent.h>
#endif
#include <regex.h>
#include <string.h>
#include <stdlib.h>
+1 -1
View File
@@ -21,7 +21,7 @@
* THE SOFTWARE.
*/
#include "config.h"
#include "config.h" /* Generated by configure script */
#include <time.h>
#include <arpa/inet.h>