crtxcr/cgitsb
1
0
포크 0
코드 이슈 풀 리퀘스트 릴리즈 위키 활동

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>
This commit is contained in:
John Keeping 2013-05-18 16:21:36 +01:00 committed by Jason A. Donenfeld
부모 1fec7cd6f8
커밋 1e9f1ee64e
1개의 변경된 파일과 4개의 추가작업 그리고 5개의 파일을 삭제
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
shared.c
파일 보기

@ -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),