From 701540827e27a4f07ac725db3ce361d3be0c106f Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Mon, 19 Jan 2015 16:11:24 +0000 Subject: - added the s6_fdholder library to libs6. (Nothing useful yet.) - fixed execline invocation in s6-log with slashpackage - integrated s6_svc_main.c's functionality into s6-svscanctl and deleted it - integrated Olivier Brunel's suggestions for wstat report in supervise/status - minor fixes to s6-supervise's status reports - separated sigaction calls in ftrigw_notifyb, this spares a few syscalls in s6-supervise - updated doc to reflect the changes - version bumped to 2.1.0.0 because API breakage (./finish, s6-svstat) --- src/supervision/s6-svscan.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/supervision/s6-svscan.c') diff --git a/src/supervision/s6-svscan.c b/src/supervision/s6-svscan.c index 8b0f82e..e07ff35 100644 --- a/src/supervision/s6-svscan.c +++ b/src/supervision/s6-svscan.c @@ -29,7 +29,7 @@ #define DIR_RETRY_TIMEOUT 3 #define CHECK_RETRY_TIMEOUT 4 -struct svinfo +struct svinfo_s { dev_t dev ; ino_t ino ; @@ -39,9 +39,8 @@ struct svinfo unsigned int flagactive : 1 ; unsigned int flaglog : 1 ; } ; -#define SVINFO_ZERO { -1, -1, { TAIN_ZERO, TAIN_ZERO }, { 0, 0 }, { -1, -1 }, 0, 0, 0 } ; -static struct svinfo *services ; +static struct svinfo_s *services ; static unsigned int max = 500 ; static unsigned int n = 0 ; static tain_t deadline, defaulttimeout ; @@ -452,7 +451,7 @@ int main (int argc, char const *const *argv) { - struct svinfo blob[max] ; /* careful with that stack, Eugene */ + struct svinfo_s blob[max] ; /* careful with that stack, Eugene */ services = blob ; tain_now_g() ; -- cgit v1.3.1