diff options
| author | David Oberhollenzer <goliath@infraroot.at> | 2020-03-31 18:19:27 +0200 |
|---|---|---|
| committer | David Oberhollenzer <goliath@infraroot.at> | 2020-03-31 18:19:27 +0200 |
| commit | 87a524d9313428d55e5a04c2538042629bdc467a (patch) | |
| tree | 37d513ffcb56666d6993bc27096144896cedfc32 /initd | |
| parent | 9f9807d4d3e0ecabc9bb67658d58644d714a9fd7 (diff) | |
cleanup: delete remains of libutil
- exec_t belongs to service.h, the main place where it is used/needed
- code for executing exec_t is moved to runsvc for the same reason
- what is left are NORETURN and ARRAY_SIZE
- the former can be replaced with direct attribute usage since
the only relevant compilers all support the attribute.
- the later is only used in 3 places and can be trivially replaced
with direct usage of sizeof().
Signed-off-by: David Oberhollenzer <goliath@infraroot.at>
Diffstat (limited to 'initd')
| -rw-r--r-- | initd/Makemodule.am | 2 | ||||
| -rw-r--r-- | initd/init.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/initd/Makemodule.am b/initd/Makemodule.am index 9b2b7a6..c68e098 100644 --- a/initd/Makemodule.am +++ b/initd/Makemodule.am @@ -3,6 +3,6 @@ init_SOURCES += initd/status.c initd/supervisor.c initd/initsock.c init_CPPFLAGS = $(AM_CPPFLAGS) init_CFLAGS = $(AM_CFLAGS) init_LDFLAGS = $(AM_LDFLAGS) -init_LDADD = libinit.a libcfg.a libutil.a +init_LDADD = libinit.a libcfg.a sbin_PROGRAMS += init diff --git a/initd/init.h b/initd/init.h index 6b68ef6..9e8a1fd 100644 --- a/initd/init.h +++ b/initd/init.h @@ -17,11 +17,12 @@ #include <linux/reboot.h> #include <sys/signalfd.h> #include <sys/reboot.h> +#include <stdbool.h> #include <signal.h> #include "initsock.h" #include "service.h" -#include "util.h" +#include "config.h" #define RUNSVCBIN SCRIPTDIR "/runsvc" |