From 1e9f1ee64e5f8f75a361260a2165996bc137b961 Mon Sep 17 00:00:00 2001 From: John Keeping Date: Sat, 18 May 2013 16:21:36 +0100 Subject: 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 --- shared.c | 9 ++++----- 1 file 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), -- cgit v1.2.3-70-g09d2