Commit Diff

Commit:
b8d1864865aa67f39a11bb4f863540a31e69e03a
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
revert part of previous commit which wasn't actually needed for memleak checks
Actions:
Patch | Tree
commit - 19d20c12ec99892dbf57f969d478e4108851679e
commit + b8d1864865aa67f39a11bb4f863540a31e69e03a
blob - 4695b254224421da1c01284653f9c8469a11dce4
blob + ff1fed836b983907bed2d75f26d0d48b47d78a6b
--- 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:
 		fatalx("unexpected signal");
@@ -418,11 +418,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)
@@ -548,7 +548,6 @@ main(int argc, char **argv)
 
 	log_debug("%s gotwebd exiting", getprogname());
 
-	gotwebd_shutdown(0);
 	return (0);
 }
 
@@ -637,7 +636,7 @@ gotwebd_configure_done(struct gotwebd *env)
 }
 
 void
-gotwebd_shutdown(int exit_code)
+gotwebd_shutdown(void)
 {
 	struct gotwebd	*env = gotwebd_env;
 	pid_t		 pid;
@@ -690,5 +689,5 @@ gotwebd_shutdown(int exit_code)
 	free(gotwebd_env);
 
 	log_warnx("gotwebd terminating");
-	exit(exit_code);
+	exit(0);
 }