commit cbcbfd9a59755122e83f86dc0a4da234a9af761ee3e9fef88d07b9767dfacc75 from: Stefan Sperling date: Wed Apr 16 16:25:45 2025 UTC revert part of previous commit which wasn't actually needed for memleak checks commit - d07fd354e4388c7158706ed85589ff7cfa3e53616d21fd6459fb97ec7eba1248 commit + cbcbfd9a59755122e83f86dc0a4da234a9af761ee3e9fef88d07b9767dfacc75 blob - 4da3d3448be7594ac82d61255bcbff248c15a2b9e57e87221e8c6edb53975055 blob + 94883bd0cab664a6bc578751524545a3f8432a301e5e0b522f9d2bd8ee9c50d3 --- gotwebd/gotwebd.c +++ gotwebd/gotwebd.c @@ -51,7 +51,7 @@ int main(int, char **); int gotwebd_configure(struct gotwebd *, uid_t, gid_t); void gotwebd_configure_done(struct gotwebd *); void gotwebd_sighdlr(int sig, short event, void *arg); -void gotwebd_shutdown(int); +void gotwebd_shutdown(void); void gotwebd_dispatch_server(int, short, void *); void gotwebd_dispatch_gotweb(int, short, void *); @@ -271,7 +271,7 @@ gotwebd_sighdlr(int sig, short event, void *arg) break; case SIGTERM: case SIGINT: - gotwebd_shutdown(0); + gotwebd_shutdown(); break; default: log_warn("unexpected signal %d", sig); @@ -419,11 +419,11 @@ main(int argc, char **argv) if (proc_type == GOTWEBD_PROC_PARENT) { if (parse_config(env->gotwebd_conffile, env) == -1) - gotwebd_shutdown(1); + exit(1); if (no_action) { fprintf(stderr, "configuration OK\n"); - gotwebd_shutdown(0); + exit(0); } if (env->user) @@ -549,7 +549,6 @@ main(int argc, char **argv) log_debug("%s gotwebd exiting", getprogname()); - gotwebd_shutdown(0); return (0); } @@ -638,7 +637,7 @@ gotwebd_configure_done(struct gotwebd *env) } void -gotwebd_shutdown(int exit_code) +gotwebd_shutdown(void) { struct gotwebd *env = gotwebd_env; pid_t pid; @@ -691,5 +690,5 @@ gotwebd_shutdown(int exit_code) free(gotwebd_env); log_warnx("gotwebd terminating"); - exit(exit_code); + exit(0); }