]> granicus.if.org Git - cgit/commitdiff
shared.c: use die_errno() where appropriate
authorJohn Keeping <john@keeping.me.uk>
Sat, 18 May 2013 15:21:36 +0000 (16:21 +0100)
committerJason A. Donenfeld <Jason@zx2c4.com>
Wed, 22 May 2013 10:53:06 +0000 (12:53 +0200)
This replaces some code that is re-implementing die_errno by just
calling the function.

Signed-off-by: John Keeping <john@keeping.me.uk>
shared.c

index 4369378ce2f2aaf45f7b219ff15cdabc47036d6d..919a99ef6629549fd597aa8154f78737306f1d03 100644 (file)
--- 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),