all repos — cgit @ b67ea0c0222d5b7eb4f65413047138e72055d8c5

a hyperfast web frontend for git written in c 

filter: make exit status local

It's only used in one place, and not useful to have around since
close_filter will die() if exit_status isn't what it expects, anyway. So
this is best as just a local variable instead of as part of the struct.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Jason A. Donenfeld Jason@zx2c4.com
Fri, 10 Jan 2014 03:51:02 +0100
commit

b67ea0c0222d5b7eb4f65413047138e72055d8c5

parent

d01a6eec4355af5266b114760c7264a2e6bf73fc

2 files changed, 4 insertions(+), 4 deletions(-)

jump to
M cgit.h → cgit.h 
@@ -62,7 +62,6 @@ char **argv;
 	int old_stdout;
 	int pipe_fh[2];
 	int pid;
-	int exitstatus;
 };
 
 struct cgit_repo {
M shared.c → shared.c 
@@ -459,7 +459,6 @@ }
 
 int cgit_open_filter(struct cgit_filter *filter)
 {
-
 	filter->old_stdout = chk_positive(dup(STDOUT_FILENO),
 		"Unable to duplicate STDOUT");
 	chk_zero(pipe(filter->pipe_fh), "Unable to create pipe to subprocess");

@@ -480,13 +479,15 @@ }
 
 int cgit_close_filter(struct cgit_filter *filter)
 {
+	int exit_status;
+
 	chk_non_negative(dup2(filter->old_stdout, STDOUT_FILENO),
 		"Unable to restore STDOUT");
 	close(filter->old_stdout);
 	if (filter->pid < 0)
 		return 0;
-	waitpid(filter->pid, &filter->exitstatus, 0);
-	if (WIFEXITED(filter->exitstatus) && !WEXITSTATUS(filter->exitstatus))
+	waitpid(filter->pid, &exit_status, 0);
+	if (WIFEXITED(exit_status) && !WEXITSTATUS(exit_status))
 		return 0;
 	die("Subprocess %s exited abnormally", filter->cmd);
 }