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 --- lib/init/svcmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/init/svcmap.c') diff --git a/lib/init/svcmap.c b/lib/init/svcmap.c index 6358a4f..de45914 100644 --- a/lib/init/svcmap.c +++ b/lib/init/svcmap.c @@ -23,7 +23,7 @@ int svc_type_from_string(const char *type) { size_t i; - for (i = 0; i < ARRAY_SIZE(type_map); ++i) { + for (i = 0; i < sizeof(type_map) / sizeof(type_map[0]); ++i) { if (strcmp(type_map[i], type) == 0) return i; } @@ -40,7 +40,7 @@ int svc_target_from_string(const char *target) { size_t i; - for (i = 0; i < ARRAY_SIZE(target_map); ++i) { + for (i = 0; i < sizeof(target_map) / sizeof(target_map[0]); ++i) { if (strcmp(target_map[i], target) == 0) return i; } -- cgit v1.2.3