mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-22 00:18:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

shared.c: use die_errno() where appropriate

Browse Source 
This replaces some code that is re-implementing die_errno by just
calling the function.

Signed-off-by: John Keeping <john@keeping.me.uk>
This commit is contained in:
John Keeping 2013-05-18 16:21:36 +01:00 committed by Jason A. Donenfeld
parent 1fec7cd6f8
commit 1e9f1ee64e
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
shared.c
View File

@ -15,21 +15,21 @@ struct cgit_context ctx;
int chk_zero(int result, char *msg) int chk_zero(int result, char *msg)
{ {
if (result != 0) if (result != 0)
die("%s: %s", msg, strerror(errno)); die_errno("%s", msg);
return result; return result;
} }
int chk_positive(int result, char *msg) int chk_positive(int result, char *msg)
{ {
if (result <= 0) if (result <= 0)
die("%s: %s", msg, strerror(errno)); die_errno("%s", msg);
return result; return result;
} }
int chk_non_negative(int result, char *msg) int chk_non_negative(int result, char *msg)
{ {
if (result < 0) if (result < 0)
die("%s: %s", msg, strerror(errno)); die_errno("%s", msg);
return result; return result;
} }
@ -468,8 +468,7 @@ int cgit_open_filter(struct cgit_filter *filter)
chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO), chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO),
"Unable to use pipe as STDIN"); "Unable to use pipe as STDIN");
execvp(filter->cmd, filter->argv); execvp(filter->cmd, filter->argv);
die("Unable to exec subprocess %s: %s (%d)", filter->cmd, die_errno("Unable to exec subprocess %s", filter->cmd);
strerror(errno), errno);
} }
close(filter->pipe_fh[0]); close(filter->pipe_fh[0]);
chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO), chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO),