rc_exec: reduce verbosity

Author: N-R-K

src/kill_all/kill_all.c

@@ -55,8 +55,8 @@ static int mount_proc(void)
 	pid_t rc;
 	int status;
 	const char *argv[] = { "mount", "-t", "proc", "proc", "/proc", NULL };
-	struct rc_exec_result res;
-	struct rc_exec_args args = rc_exec_args_init(argv);
+	rc_exec_result_t res;
+	rc_exec_args_t args = rc_exec_init(argv);
 
 	if (exists("/proc/version"))
 		return 0;

src/openrc-init/openrc-init.c

@@ -52,8 +52,8 @@ static int sigpipe[2] = { -1, -1 };
 static void do_openrc(const char *runlevel)
 {
 	const char *argv[] = { "openrc", runlevel, NULL };
-	struct rc_exec_result res;
-	struct rc_exec_args args = rc_exec_args_init(argv);
+	rc_exec_result_t res;
+	rc_exec_args_t args = rc_exec_init(argv);
 	args.setsid = 1;
 
 	printf("Starting %s runlevel\n", runlevel);
@@ -111,8 +111,8 @@ static void handle_shutdown(const char *runlevel, int cmd)
 static void run_program(const char *prog)
 {
 	const char *argv[] = { prog, NULL };
-	struct rc_exec_args args = rc_exec_args_init(argv);
-	struct rc_exec_result res = rc_exec(&args);
+	rc_exec_args_t args = rc_exec_init(argv);
+	rc_exec_result_t res = rc_exec(&args);
 	if (res.pid < 0 || rc_waitpid(res.pid) == -1)
 		perror("init");
 }

src/shared/rc_exec.c

@@ -20,15 +20,13 @@
 #include "rc_exec.h"
 #include "helpers.h"
 
-static void
-checked_close(int fd)
+static void checked_close(int fd)
 {
 	if (fd >= 0)
 		close(fd);
 }
 
-static int
-devnull(void)
+static int devnull(void)
 {
 	static int devnullfd = -1;
 	if (devnullfd < 0)
@@ -40,21 +38,19 @@ devnull(void)
 	return devnullfd;
 }
 
-struct rc_exec_args
-rc_exec_args_init(const char **argv)
+rc_exec_args_t rc_exec_init(const char **argv)
 {
-	struct rc_exec_args args = {0};
+	rc_exec_args_t args = {0};
 	args.argv = argv;
 	args.redirect_stdin  = RC_EXEC_REDIRECT_NONE;
 	args.redirect_stdout = RC_EXEC_REDIRECT_NONE;
 	args.redirect_stderr = RC_EXEC_REDIRECT_NONE;
 	return args;
 }
 
-struct rc_exec_result
-rc_exec(struct rc_exec_args *args)
+rc_exec_result_t rc_exec(rc_exec_args_t *args)
 {
-	struct rc_exec_result res = { .pid = -1 };
+	rc_exec_result_t res = { .pid = -1 };
 	sigset_t full, old;
 	int saved_errno, err, n;
 	int execpipe[2] = {-1, -1};
@@ -157,8 +153,8 @@ int
 rc_pipe_command(const char *cmd, int devnullfd)
 {
 	const char *argv[] = { "/bin/sh", "-c", cmd, NULL };
-	struct rc_exec_result res;
-	struct rc_exec_args args = rc_exec_args_init(argv);
+	rc_exec_result_t res;
+	rc_exec_args_t args = rc_exec_init(argv);
 	args.redirect_stdin = RC_EXEC_MKPIPE;
 	args.redirect_stdout = args.redirect_stderr = devnullfd;
 	res = rc_exec(&args);

src/shared/rc_exec.h

@@ -31,24 +31,24 @@ enum {
 	RC_EXEC_DEVNULL = -3,
 };
 
-struct rc_exec_args {
+typedef struct {
 	const char **argv;
 	int redirect_stdin;
 	int redirect_stdout;
 	int redirect_stderr;
 	bool setsid : 1;
-};
+} rc_exec_args_t;
 
-struct rc_exec_result {
+typedef struct {
 	pid_t pid;
 	/* returned in case of RC_EXEC_MKPIPE */
 	int proc_stdin;
 	int proc_stdout;
 	int proc_stderr;
-};
+} rc_exec_result_t;
 
-struct rc_exec_args rc_exec_args_init(const char **argv);
-struct rc_exec_result rc_exec(struct rc_exec_args *args);
+rc_exec_args_t rc_exec_init(const char **argv);
+rc_exec_result_t rc_exec(rc_exec_args_t *args);
 
 int rc_pipe_command(const char *cmd, int devnullfd);