From 87a524d9313428d55e5a04c2538042629bdc467a Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Tue, 31 Mar 2020 18:19:27 +0200 Subject: 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 --- initd/Makemodule.am | 2 +- initd/init.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'initd') 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 #include #include +#include #include #include "initsock.h" #include "service.h" -#include "util.h" +#include "config.h" #define RUNSVCBIN SCRIPTDIR "/runsvc" -- cgit v1.2.3