git: update to v2.46.0

[ps-cgit] / filter.c

diff --git a/filter.c b/filter.c
index 949c931af1f67cb48df4554d6b1d7ca87d897ce2..22b4970f6643d632b4290970a203c65c0c8db58f 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -42,6 +42,7 @@ void cgit_cleanup_filters(void)
 static int open_exec_filter(struct cgit_filter *base, va_list ap)
 {
        struct cgit_exec_filter *filter = (struct cgit_exec_filter *)base;
+       int pipe_fh[2];
        int i;
 
        for (i = 0; i < filter->base.argument_count; i++)
@@ -49,19 +50,19 @@ static int open_exec_filter(struct cgit_filter *base, va_list ap)
 
        filter->old_stdout = chk_positive(dup(STDOUT_FILENO),
                "Unable to duplicate STDOUT");
-       chk_zero(pipe(filter->pipe_fh), "Unable to create pipe to subprocess");
+       chk_zero(pipe(pipe_fh), "Unable to create pipe to subprocess");
        filter->pid = chk_non_negative(fork(), "Unable to create subprocess");
        if (filter->pid == 0) {
-               close(filter->pipe_fh[1]);
-               chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO),
+               close(pipe_fh[1]);
+               chk_non_negative(dup2(pipe_fh[0], STDIN_FILENO),
                        "Unable to use pipe as STDIN");
                execvp(filter->cmd, filter->argv);
                die_errno("Unable to exec subprocess %s", filter->cmd);
        }
-       close(filter->pipe_fh[0]);
-       chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO),
+       close(pipe_fh[0]);
+       chk_non_negative(dup2(pipe_fh[1], STDOUT_FILENO),
                "Unable to use pipe as STDOUT");
-       close(filter->pipe_fh[1]);
+       close(pipe_fh[1]);
        return 0;
 }
 
@@ -127,7 +128,7 @@ void cgit_exec_filter_init(struct cgit_exec_filter *filter, char *cmd, char **ar
        memset(filter, 0, sizeof(*filter));
        filter->base.open = open_exec_filter;
        filter->base.close = close_exec_filter;
-       filter->base.fprintf = fprintf_exec_filter;
+       filter->base.fprintfp = fprintf_exec_filter;
        filter->base.cleanup = cleanup_exec_filter;
        filter->cmd = cmd;
        filter->argv = argv;
@@ -352,7 +353,7 @@ static struct cgit_filter *new_lua_filter(const char *cmd, int argument_count)
        memset(filter, 0, sizeof(*filter));
        filter->base.open = open_lua_filter;
        filter->base.close = close_lua_filter;
-       filter->base.fprintf = fprintf_lua_filter;
+       filter->base.fprintfp = fprintf_lua_filter;
        filter->base.cleanup = cleanup_lua_filter;
        filter->base.argument_count = argument_count;
        filter->script_file = xstrdup(cmd);
@@ -384,7 +385,7 @@ int cgit_close_filter(struct cgit_filter *filter)
 
 void cgit_fprintf_filter(struct cgit_filter *filter, FILE *f, const char *prefix)
 {
-       filter->fprintf(filter, f, prefix);
+       filter->fprintfp(filter, f, prefix);
 }