diff options
author | Nicholas Vinson <nvinson234@gmail.com> | 2022-06-15 07:35:28 -0400 |
---|---|---|
committer | Florian Westphal <fw@strlen.de> | 2022-06-15 13:54:44 +0200 |
commit | 84d12cfacf8ddd857a09435f3d982ab6250d250c (patch) | |
tree | 1bf88d72d633faf94e80e04e0f93598ce6f4110a /include | |
parent | f6575131e60ab10f131ea3ff36f69af2b6c3f614 (diff) |
build: fix clang+glibc snprintf substitution error
When building with clang and glibc and -D_FORTIFY_SOURCE=2 is passed to
clang, the snprintf member of the expr_ops and obj_ops structures will
be incorrectly replaced with __builtin_snprintf_chk() which results in
"error: no member named '__builtin___snprintf_chk'" errors at build
time.
This patch changes the member name from 'snprintf' to 'output' to
prevent the replacement.
This bug can be emulated using GCC by undefining the __va_arg_pack macro
before stdio.h is included.
This patch is based on the notes provided in
https://bugs.gentoo.org/807766.
Signed-off-by: Nicholas Vinson <nvinson234@gmail.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'include')
-rw-r--r-- | include/expr_ops.h | 2 | ||||
-rw-r--r-- | include/obj.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/expr_ops.h b/include/expr_ops.h index 7a6aa23..a7d747a 100644 --- a/include/expr_ops.h +++ b/include/expr_ops.h @@ -18,7 +18,7 @@ struct expr_ops { const void *(*get)(const struct nftnl_expr *e, uint16_t type, uint32_t *data_len); int (*parse)(struct nftnl_expr *e, struct nlattr *attr); void (*build)(struct nlmsghdr *nlh, const struct nftnl_expr *e); - int (*snprintf)(char *buf, size_t len, uint32_t flags, const struct nftnl_expr *e); + int (*output)(char *buf, size_t len, uint32_t flags, const struct nftnl_expr *e); }; struct expr_ops *nftnl_expr_ops_lookup(const char *name); diff --git a/include/obj.h b/include/obj.h index 60dc853..d848ac9 100644 --- a/include/obj.h +++ b/include/obj.h @@ -109,7 +109,7 @@ struct obj_ops { const void *(*get)(const struct nftnl_obj *e, uint16_t type, uint32_t *data_len); int (*parse)(struct nftnl_obj *e, struct nlattr *attr); void (*build)(struct nlmsghdr *nlh, const struct nftnl_obj *e); - int (*snprintf)(char *buf, size_t len, uint32_t flags, const struct nftnl_obj *e); + int (*output)(char *buf, size_t len, uint32_t flags, const struct nftnl_obj *e); }; extern struct obj_ops obj_ops_counter; |