summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2013-05-18 16:21:36 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2013-05-22 12:53:06 +0200
commit1e9f1ee64e5f8f75a361260a2165996bc137b961 (patch)
treee8ce7148ac4ad40dc703b0c48ba7e3aa67843357
parent1fec7cd6f817e52a6e55458d584a7a5092ba6aed (diff)
shared.c: use die_errno() where appropriate
This replaces some code that is re-implementing die_errno by just calling the function. Signed-off-by: John Keeping <john@keeping.me.uk>
-rw-r--r--shared.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/shared.c b/shared.c
index 4369378..919a99e 100644
--- a/shared.c
+++ b/shared.c
@@ -15,21 +15,21 @@ struct cgit_context ctx;
int chk_zero(int result, char *msg)
{
if (result != 0)
- die("%s: %s", msg, strerror(errno));
+ die_errno("%s", msg);
return result;
}
int chk_positive(int result, char *msg)
{
if (result <= 0)
- die("%s: %s", msg, strerror(errno));
+ die_errno("%s", msg);
return result;
}
int chk_non_negative(int result, char *msg)
{
if (result < 0)
- die("%s: %s", msg, strerror(errno));
+ die_errno("%s", msg);
return result;
}
@@ -468,8 +468,7 @@ int cgit_open_filter(struct cgit_filter *filter)
chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO),
"Unable to use pipe as STDIN");
execvp(filter->cmd, filter->argv);
- die("Unable to exec subprocess %s: %s (%d)", filter->cmd,
- strerror(errno), errno);
+ die_errno("Unable to exec subprocess %s", filter->cmd);
}
close(filter->pipe_fh[0]);
chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO),