aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Pronin <dannftk@yandex.ru>2024-06-09 08:41:36 +0200
committerChristian Hesse <mail@eworm.de>2024-07-16 13:26:10 +0200
commitfb87de795b9f1b1e21825243716ff1156097adf2 (patch)
tree671f842691bfe82d1238d3701c28ae02ab22d681
parent34c30d12fc917d9853135f6e9d4c8e531efddaeb (diff)
downloadcgit-fb87de795b9f1b1e21825243716ff1156097adf2.tar.gz
cgit-fb87de795b9f1b1e21825243716ff1156097adf2.tar.xz
fix building with clang
fix error that is given because of macro overlapping cgit_filter member: ../filter.c:388:10: error: no member named '__fprintf_chk' in 'struct cgit_filter' 388 | filter->fprintf(filter, f, prefix); | ~~~~~~ ^ /usr/include/bits/stdio2.h:92:3: note: expanded from macro 'fprintf' 92 | __fprintf_chk (stream, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__) | ^ 1 error generated. Signed-off-by: Denis Pronin <dannftk@yandex.ru> Signed-off-by: Christian Hesse <mail@eworm.de>
-rw-r--r--cgit.h2
-rw-r--r--filter.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/cgit.h b/cgit.h
index dbc461f..e0d286d 100644
--- a/cgit.h
+++ b/cgit.h
@@ -69,7 +69,7 @@ typedef enum {
struct cgit_filter {
int (*open)(struct cgit_filter *, va_list ap);
int (*close)(struct cgit_filter *);
- void (*fprintf)(struct cgit_filter *, FILE *, const char *prefix);
+ void (*fprintfp)(struct cgit_filter *, FILE *, const char *prefix);
void (*cleanup)(struct cgit_filter *);
int argument_count;
};
diff --git a/filter.c b/filter.c
index 70f5b74..22b4970 100644
--- a/filter.c
+++ b/filter.c
@@ -128,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;
@@ -353,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);
@@ -385,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);
}