diff options
author | Jason A. Donenfeld | 2014-01-10 03:51:02 +0100 |
---|---|---|
committer | Jason A. Donenfeld | 2014-01-10 17:45:43 +0100 |
commit | b67ea0c0222d5b7eb4f65413047138e72055d8c5 (patch) | |
tree | ffe64bf5f2c07806b59df61031cbe5c28a3866e0 | |
parent | parsing: fix header typo (diff) | |
download | cgit-b67ea0c0222d5b7eb4f65413047138e72055d8c5.tar.gz cgit-b67ea0c0222d5b7eb4f65413047138e72055d8c5.zip |
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>
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | shared.c | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cgit.h b/cgit.h index a474d77..f7b606c 100644 --- a/cgit.h +++ b/cgit.h | |||
@@ -62,7 +62,6 @@ struct cgit_filter { | |||
62 | int old_stdout; | 62 | int old_stdout; |
63 | int pipe_fh[2]; | 63 | int pipe_fh[2]; |
64 | int pid; | 64 | int pid; |
65 | int exitstatus; | ||
66 | }; | 65 | }; |
67 | 66 | ||
68 | struct cgit_repo { | 67 | struct cgit_repo { |
diff --git a/shared.c b/shared.c index 01197f1..6259d75 100644 --- a/shared.c +++ b/shared.c | |||
@@ -459,7 +459,6 @@ void cgit_prepare_repo_env(struct cgit_repo * repo) | |||
459 | 459 | ||
460 | int cgit_open_filter(struct cgit_filter *filter) | 460 | int cgit_open_filter(struct cgit_filter *filter) |
461 | { | 461 | { |
462 | |||
463 | filter->old_stdout = chk_positive(dup(STDOUT_FILENO), | 462 | filter->old_stdout = chk_positive(dup(STDOUT_FILENO), |
464 | "Unable to duplicate STDOUT"); | 463 | "Unable to duplicate STDOUT"); |
465 | chk_zero(pipe(filter->pipe_fh), "Unable to create pipe to subprocess"); | 464 | chk_zero(pipe(filter->pipe_fh), "Unable to create pipe to subprocess"); |
@@ -480,13 +479,15 @@ int cgit_open_filter(struct cgit_filter *filter) | |||
480 | 479 | ||
481 | int cgit_close_filter(struct cgit_filter *filter) | 480 | int cgit_close_filter(struct cgit_filter *filter) |
482 | { | 481 | { |
482 | int exit_status; | ||
483 | |||
483 | chk_non_negative(dup2(filter->old_stdout, STDOUT_FILENO), | 484 | chk_non_negative(dup2(filter->old_stdout, STDOUT_FILENO), |
484 | "Unable to restore STDOUT"); | 485 | "Unable to restore STDOUT"); |
485 | close(filter->old_stdout); | 486 | close(filter->old_stdout); |
486 | if (filter->pid < 0) | 487 | if (filter->pid < 0) |
487 | return 0; | 488 | return 0; |
488 | waitpid(filter->pid, &filter->exitstatus, 0); | 489 | waitpid(filter->pid, &exit_status, 0); |
489 | if (WIFEXITED(filter->exitstatus) && !WEXITSTATUS(filter->exitstatus)) | 490 | if (WIFEXITED(exit_status) && !WEXITSTATUS(exit_status)) |
490 | return 0; | 491 | return 0; |
491 | die("Subprocess %s exited abnormally", filter->cmd); | 492 | die("Subprocess %s exited abnormally", filter->cmd); |
492 | } | 493 | } |