meta-openembedded: subtree update:2449e5f07a..8fbcfb9f02
Adrian Zaharia (1):
ntp: fix ntpdate to wait for subprocesses
Akifumi Chikazawa (1):
openvpn: add CVE-2020-7224 and CVE-2020-27569 to allowlist
Andrea Adami (3):
initramfs-kexecboot-image: support cases where machines override IMAGE_FSTYPES
initramfs-debug-image: support cases where machines override IMAGE_FSTYPES
rapidjson: remove stale LIB_INSTALL_DIR
Andreas Müller (50):
poppler: upgrade 21.05.0 -> 21.06.0
dbus-broker: upgrade 28 -> 29
libmbim: upgrade 1.24.6 -> 1.24.8
icewm: upgrade 2.3.3 -> 2.3.4
poppler: upgrade 21.06.0 -> 21.06.1
gnome-disk-utility: upgrade 3.36.3 -> 40.1
gnome-font-viewer: upgrade 3.34.0 -> 40.0
pipewire: upgrade 0.3.24 -> 0.3.29
libqmi: upgrade 1.28.4 -> 1.28.6
ttf-noto-emoji: upgrade 20190815 -> 20200916
remmina: upgrade 1.4.17 -> 1.4.18
metacity: upgrade 3.36.1 -> 3.40.0
gnome-flashback: upgrade 3.36.3 -> 3.40.0
gthumb: initial add 3.10.3
atkmm: upgrade 2.28.0 -> 2.28.2
atkmm: build with meson
dconf: upgrade 0.38.0 -> 0.40.0
evolution-data-server: upgrade 3.40.1 -> 3.40.2
file-roller: upgrade 3.38.1 -> 3.40.0
glibmm: upgrade 2.62.0 -> 2.66.1 / build with meson / cleanup recipe
gmime: upgrade 3.2.6 -> 3.2.7
gnome-autoar; upgrade 0.3.2 -> 0.3.3
gnome-keyring: upgrade 3.36.0 -> 40.0
gnome-online-accounts: upgrade 3.36.0 -> 3.40.0
gnome-terminal: upgrade 3.36.2 -> 3.40.2
gspell: upgrade 1.8.4 -> 1.9.1
gtkmm3: upgrade 3.24.3 -> 3.24.5
gtksourceview4: upgrade 4.6.1 -> 4.8.1
gupnp: upgrade 1.2.6 -> 1.2.7
gvfs: upgrade 1.44.1 -> 1.48.1
libgdata: upgrade 0.17.13 -> 0.18.1
libmediaart 0.7.0: remove
libmediaart-2.0: upgrade 1.9.4 -> 1.9.5 / merge inc file / build with meson
libsigc++-2.0: upgrade 2.10.6 -> 2.10.7
nautilus: upgrade 40.1 -> 40.2
pangomm: upgrade 2.42.1 -> 2.46.1 / build with meson
yelp-xsl: upgrade 3.36.0 -> 4.02
yelp-tools: upgrade 3.32.2 -> 40.0
yelp: upgrade 3.36.0 -> 40.2
modemmanager: upgrade 1.16.4 -> 1.16.6
xfce4-settings: 4.16.1 upgrade 4.16.2
blueman: upgrade 2.1.4 -> 2.2.1
pipewire: upgrade 0.3.30 -> 0-3-31
cmark: upgrade 0.29.0 -> 0.30.0
networkmanager: upgrade 1.30.4 -> 1.32.2
ristretto: upgrade 0.10.0 -> 0.11.0
libgusb: upgrade 0.3.6 -> 0.3.7
poppler: upgrade 21.06.1 -> 21.07.0
gegl: Disable pango on native build to fix gimp build segfaults
gimp: remove --disable-vector-icons
Bartosz Golaszewski (13):
libgpiod: coding style fixes
libgpiod: list all packages in a single assignment
libgpiod: fix RRECOMMENDS for python bindings
libgpiod: correctly split output files into packages
libgpiod: add RDEPENDS for tests
libgpiod: redirect stdout from the ptest executable to a file
libgpiod: ptest: run all test-suites if possible
libgpiod: ptest: warn if the gpio-mockup kernel module is not selected
libgpiod: ptest: add kernel-modules to RRECOMMENDS
libgpiod: ptest: only rrecommend a single module that we need
libgpiod: add the python test-suite to the ptest package
libgpiod: update my email address
python3-joblib: new package
Ben Horgan (1):
cpputest: Add initial recipe. Version 4.0.
Carlos Rafael Giani (2):
pipewire: Add filter-chain files to modules-filter-chain package
pipewire: Upgrade to 0.3.30
Changqing Li (1):
mousepad: fix warning during postinst
Chen Qi (1):
minifi-cpp: set CLEANBROKEN to 1
Daiane Angolini (1):
wireguard-module: Stop overriding modules_install in the recipe
Daniel Klauer (1):
spidev-test: Update common-licenses reference
David Sterling (1):
can-isotp: Upgrade to latest on master
Ed Tanous (1):
Use the built-in options for removing pack tools
Geoff Parker (1):
cifs-utils: set ROOTSBINDIR to /usr/sbin if DISTRO_FEATURES has usrmerge
Gianfranco (2):
vboxguestdrivers: add a fix for build failure with kernel 5.13
dlt-daemon: update from 2.18.6 to 2.18.7
Hongxu Jia (1):
debootstrap: fix runtime failure on nativesdk
Joshua Watt (1):
gnome: gnome-shell: Move gsettings to their own package
Kai Kang (4):
python3-m2crypto: fix word size for qemuppc64 little endian
python3-m2crypto: avoid host contamination for swig
bats: fix qa issue when multilib eanbled
mariadb: fix failures to start install_db.service
Khem Raj (57):
glog: Upgrade to 0.5.0
mbedtls: Upgrade to 2.26.0
mbedtls: Add packageconfig for warning-as-errors
memcached: upgrade to 1.6.9
indent: Remove dead code using count_parens function
glm: Fix additional clang warnings
tbb: Fix warnings with clang
libwebsockets: Update to latest on v4.2-stable
packagegroup-meta-oe: Add libparse-yapp-perl
netplan: Fix a warning with clang
python3-yappi: Fix patching errors
packagegroup-meta-oe: Add zsync-curl
klibc: Add clang's -rtlib to known options
libpfm4: Upgrade to 4.11.0
ltrace: Remove unused static function
flashrom: Fix build with clang
mongodb: Enable wiredtiger only on aarch64/x86_64 hosts
mariadb: Fix build with clang/musl
c-ares: Upgrade to 1.17.1 release
nodejs: Update to 14.17.1
rocksdb: Upgrade to 6.20.3
rocksdb: Implement toku_time_now function for rv32/rv64
rocksdb: Fix build with ppc64/musl
rocksdb: Implement timer for mips
rocksdb: Implement timer for armv6+
rocksdb: Fix build with gcc on rv32 and mips
libzip: Upgrade to 1.8.0
czmq: Inherit pkgconfig
czmq: Add libmicrohttpd feature via packageconfig
czmq: Use Cmake knobs to enable/disable designed packageconfigs
czmq: Add nss packageconfig
meta-python: Add python3-fastjsonschema and its dependencies
packagegroup-meta-python: Add newly added recipes
python3-process-tests: Add recipe
python3-aspectlib: Add ptests
python3-execnet: Add ptests
python3-py-cpuinfo: Add ptests
libc-bench: Do not override ldflags in makefile
mpich: Add libgcc to ldflags on x86/glibc
mpd: Update to 0.22.9
imlib2: Use propert git SHA in SRCREV
suitesparse: Update to 5.10.1
packagegroup-meta-oe: Add libyang
sysdig: Disable JIT on ppc64
portaudio-v19: Use GNUInstallDirs to make it portable
keepalived: Upgrade to 2.2.2
suitesparse: Fix LIC_FILES_CHKSUM
xscreensaver: Update to 6.01
ltrace: Fix mips build with kernels 5.13+
python3-pyusb: Add missing runtime dependency on libusb1
can-isotp: Ignore in world builds
postfix: Upgrade to 3.6.1
packagegroup-meta-oe: Add new package cpputest
apitrace: Update to latest trunk
fatresize: Disable building documentation files
layers: Fix git send-email instructions in README
autofs: Upgrade to 5.1.7
Leon Anavi (61):
python3-oauthlib: Upgrade 3.1.0 -> 3.1.1
python3-django: Upgrade 3.2.3 -> 3.2.4
python3-sqlalchemy: Upgrade 1.4.15 -> 1.4.17
python3-aiohue: Upgrade 2.5.0 -> 2.5.1
python3-typeguard: Upgrade 2.12.0 -> 2.12.1
python3-cbor2: Upgrade 5.3.0 -> 5.4.0
python3-ipython: Upgrade 7.24.0 -> 7.24.1
python3-pkgconfig: Upgrade 1.5.2 -> 1.5.4
python3-humanize: Upgrade 3.6.0 -> 3.7.1
python3-fasteners: Upgrade 0.16 -> 0.16.1
python3-pythonping: Upgrade 1.0.16 -> 1.1.0
python3-bitarray: Upgrade 2.1.0 -> 2.1.2
python3-coloredlogs: Upgrade 15.0 -> 15.0.1
python3-pysonos: Upgrade 0.0.50 -> 0.0.51
python3-dill: Upgrade 0.3.3 -> 0.3.4
python3-humanfriendly: Upgrade 9.1 -> 9.2
python3-zeroconf: Add recipe
python3-pychromecast: Upgrade 9.1.2 -> 9.2.0
python3-ifaddr: Fix RDEPENDS
python3-bitarray: Upgrade 2.1.2 -> 2.1.3
python3-astroid: Upgrade 2.5.7 -> 2.5.8
python3-license-expression: Upgrade 1.2 -> 21.6.14
python3-humanize: Upgrade 3.7.1 -> 3.9.0
python3-ruamel-yaml: Upgrade 0.17.7 -> 0.17.9
python3-cmd2: Upgrade 1.5.0 -> 2.1.1
python3-fasteners: Upgrade 0.16.1 -> 0.16.3
python3-elementpath: Upgrade 2.2.2 -> 2.2.3
python3-prompt-toolkit: Upgrade 3.0.18 -> 3.0.19
python3-mypy: Upgrade 0.812 -> 0.902
python3-send2trash: Upgrade 1.5.0 -> 1.7.1
python3-pandas: Upgrade 1.2.4 -> 1.2.5
python3-mypy: Upgrade 0.902 -> 0.910
python3-astroid: Upgrade 2.5.8 -> 2.6.0
python3-tqdm: Upgrade 4.61.0 -> 4.61.1
python3-ruamel-yaml: Upgrade 0.17.9 -> 0.17.10
python3-httplib2: Fix runtime dependencies
python3-google-api-core: Add recipe
python3-google-auth: Add recipe
python3-googleapis-common-protos: Add recipe
python3-google-api-python-client: Upgrade 2.6.0 -> 2.10.0
python3-ipython: Upgrade 7.24.1 -> 7.25.0
python3-croniter: Upgrade 1.0.13 -> 1.0.15
python3-priority: Upgrade 1.3.0 -> 2.0.0
python3-astroid: Upgrade 2.6.0 -> 2.6.2
python3-watchdog: Upgrade 2.1.2 -> 2.1.3
python3-humanize: Upgrade 3.9.0 -> 3.10.0
python3-pillow: Upgrade 8.2.0 -> 8.3.1
python3-bitarray: Upgrade 2.1.3 -> 2.2.1
python3-cmd2: Upgrade 2.1.1 -> 2.1.2
python3-pandas: Upgrade 1.2.5 -> 1.3.0
python3-texttable: Upgrade 1.6.3 -> 1.6.4
python3-dateutil: Upgrade 2.8.1 -> 2.8.2
python3-requests: Upgrade 2.25.1 -> 2.26.0
python3-websocket-client: Upgrade 1.0.1 -> 1.1.0
python3-pysonos: Upgrade 0.0.51 -> 0.0.53
python3-bitarray: Upgrade 2.2.1 -> 2.2.2
python3-pyusb: Upgrade 1.2.0 -> 1.2.1
python3-zeroconf: Upgrade 0.31.0 -> 0.33.1
python3-yamlloader: Upgrade 1.0.0 -> 1.1.0
python3-astroid: Upgrade 2.6.2 -> 2.6.5
python3-pkgconfig: Upgrade 1.5.4 -> 1.5.5
Luan Rafael Carneiro (1):
libwebsockets: Update 4.2.0 -> 4.2.1
Luca Boccassi (2):
dbus-broker: remove deprecated linux-4-17 option
dbus-broker: enforce required versions of libselinux and libaudit
Marek Vasut (1):
nss: Fix build on Centos 7
Martin Jansa (1):
rygel: require gobject-introspection-data in DISTRO_FEATURES
Masaki Ambai (1):
nss: add CVE-2006-5201 to allowlist
Oleksandr Kravchuk (1):
iwd: update to 1.15
Olivier Georget (1):
libpfm4 4.10.1 : enable arm64 host platform
Ovidiu Panait (1):
libeigen: update LICENSE information
Pascal Bach (1):
python3-thrift: support native recipe
Persian Prince (1):
samba: Don't guess dirs for perllocal.pod removing
Peter Bergin (4):
linuxptp: use install from makefile and install more apps
linuxptp: add homepage
linuxptp: ship example configurations in separate package
hiredis: add cmake config file for pkgconfig
Peter Kjellerstedt (3):
net-snmp: A little clean up
net-snmp: Support building for native
cryptsetup: Only recommend kernel modules when building for target
Philip Balister (1):
fftw: Update recipe to 3.3.9.
Pierre-Jean Texier (5):
libtinyxml2: upgrade 8.1.0 -> 9.0.0
sshfs-fuse: upgrade 3.7.1 -> 3.7.2
monit: upgrade 5.27.2 -> 5.28.0
spitools: upgrade 0.8.7 -> 1.0.0
linuxptp: fix upstream version check
Ross Burton (1):
zsync-curl: add recipe
Sam Van Den Berge (1):
libiio: fix installing libiio when python3 bindings are enabled
Sekine Shigeki (2):
add CVE-2011-2411 to allowlist
ntp: add CVE-2016-9312 to allowlist
Signed-off-by: Bartosz Golaszewski (1):
Revert "libgpiod: ptest: warn if the gpio-mockup kernel module is not selected"
Tim Orling (8):
libcgi-perl: upgrade 4.51 -> 4.53
libcrypt-openssl-guess-perl: upgrade 0.12 -> 0.13
libextutils-cppguess-perl: upgrade 0.21 -> 0.23
libio-socket-ssl-perl: upgrade 2.068 -> 2.071
libmoo-perl: upgrade 2.004000 -> 2.005004
libnet-dns-perl: upgrade 1.26 -> 1.31
libtest-warnings-perl: upgrade 0.028 -> 0.030
logcheck: upgrade 1.3.20 -> 1.3.23
Tony Tascioglu (2):
libyang: create recipe for libyang
redis: upgrade to 6.2.4
Trevor Gamblin (9):
libnftnl: upgrade 1.1.9 -> 1.2.0
nftables: upgrade 0.9.8 -> 0.9.9
python3-yarl: backport fix for test_url_query test
python3-yappi: fix ptests
python3-django: upgrade 2.2.23 -> 2.2.24
python3-django: upgrade 3.2.4 -> 3.2.5
python3-geomet: add recipe
python3-cassandra-driver: add geomet to RDEPENDS, remove DISTUTILS options
python3-geomet: Add missing RDEPENDS; add to packagegroup-meta-python
Yi Zhao (14):
libldb: upgrade 1.5.8 -> 2.3.0
samba: upgrade 4.10.18 -> 4.14.4
samba: update smb.conf
libparse-yapp-perl: add recipe
dhcp-relay: update bundled bind to 9.11.32
dhcp-relay: disable backtrace in bundled bind
dhcp-relay: update 4.4.2 -> 4.4.2-P1
packagegroup-meta-networking: add dhcp-relay
samba: disable check fcntl RW_HINTS when configure
samba: upgrade 4.14.4 -> 4.14.5
minifi-cpp: set correct python processor directory in configure file
samba: fix shebang for pidl
samba: add missing runtime dependency for pidl
audit: upgrade 3.0.1 -> 3.0.2
Zoltán Böszörményi (2):
mariadb: Use qemu to run cross-compiled binaries
mariadb: Upgrade to 10.5.11
hayashi.satoshi@fujitsu.com (1):
dracut: add CVE-2010-4176 to allowlist
ito-yuichi@fujitsu.com (2):
cyrus-sasl: add CVE-2020-8032 to allowlist
dovecot: add CVE-2016-4983 to allowlist
massimo toscanelli (1):
sysbench: fix memory test
wangmy (8):
samba: Solve the dependency problem when installing Samba
fatresize: upgrade 1.0.2 -> 1.1.0
xfsprogs: upgrade 5.10.0 -> 5.12.0
ctags: upgrade 5.9.20210627.0 -> 5.9.20210711.0
icewm: upgrade 2.3.4 -> 2.6.0
yelp: upgrade 40.2 -> 40.3
live555: upgrade 20210406 -> 20210710
modemmanager: upgrade 1.16.6 -> 1.16.8
zangrc (49):
python3-idna: upgrade 3.1 -> 3.2
netplan: upgrade 0.101 -> 0.102
wireshark: upgrade 3.4.5 -> 3.4.6
tracker: upgrade 3.0.4 -> 3.1.1
tracker-miners: upgrade 3.0.5 -> 3.1.1
rasdaemon: upgrade 0.6.6 -> 0.6.7
speedtest-cli: upgrade 2.1.2 -> 2.1.3
abseil-cpp: upgrade 20210324 -> 20210324.2
cryptsetup: upgrade 2.3.5 -> 2.3.6
ctags: upgrade 5.9.20210502.0 -> 5.9.20210606.0
opencl-clhpp: upgrade 2.0.13 -> 2.0.14
protobuf: upgrade 3.17.0 -> 3.17.3
toybox: upgrade 0.8.4 -> 0.8.5
fuse3: upgrade 3.10.3 -> 3.10.4
evince: upgrade 40.1 -> 40.2
mosquitto: upgrade 2.0.10 -> 2.0.11
ctags: upgrade 5.9.20210606.0 -> 20210613.0
fsverity-utils: upgrade 1.3 -> 1.4
googletest: upgrade 1.10.0 -> 1.11.0
mg: upgrade 20210314 -> 20210609
nano: upgrade 5.7 -> 5.8
openvpn: upgrade 2.5.2 -> 2.5.3
snort: upgrade 2.9.17.1 -> 2.9.18
function2: upgrade 4.1.0 -> 4.2.0
python3-configargparse: upgrade 1.4.1 -> 1.5
python3-grpcio-tools: upgrade 1.37.0 -> 1.38.1
python3-h5py: upgrade 3.2.1 -> 3.3.0
python3-isort: upgrade 5.8.0 -> 5.9.1
can-utils: upgrade 2020.12.0 -> 2021.06.0
ctags: upgrade 5.9.20210620.0 -> 5.9.20210627.0
python3-gast: upgrade 0.4.0 -> 0.5.0
python3-grpcio: upgrade 1.38.0 -> 1.38.1
python3-haversine: upgrade 2.3.0 -> 2.3.1
python3-m2crypto: upgrade 0.37.1 -> 0.38.0
python3-pyrsistent: upgrade 0.17.3 -> 0.18.0
babl: upgrade 0.1.86 -> 0.1.88
python3-pyusb: upgrade 1.1.1 -> 1.2.0
python3-google-api-python-client: upgrade 2.10.0 -> 2.12.0
firewalld: upgrade 0.9.3 -> 0.9.4
strongswan: upgrade 5.9.2 -> 5.9.3
opencl-clhpp: upgrade 2.0.14 -> 2.0.15
python3-cffi: upgrade 1.14.5 -> 1.14.6
python3-configargparse: upgrade 1.5 -> 1.5.1
python3-cryptography-vectors: upgrade 3.4.6 -> 3.4.7
python3-flask-migrate: upgrade 3.0.0 -> 3.0.1
python3-flask-socketio: upgrade 5.0.3 -> 5.1.0
python3-isort: upgrade 5.9.1 -> 5.9.2
python3-networkx: upgrade 2.5.1 -> 2.6.1
python3-gnupg: upgrade 0.4.6 -> 0.4.7
zhengruoqin (30):
opensaf: upgrade 5.21.03 -> 5.21.06
fio: upgrade 3.26 -> 3.27
gensio: upgrade 2.2.5 -> 2.2.7
memtester: upgrade 4.5.0 -> 4.5.1
graphene: upgrade 1.10.2 -> 1.10.6
iozone3: upgrade 490 -> 492
net-snmp: upgrade 5.9 -> 5.9.1
rsnapshot: upgrade 1.4.3 -> 1.4.4
rsyslog: upgrade 8.2104.0 -> 8.2106.0
python3-absl: upgrade 0.12.0 -> 0.13.0
ctags: upgrade 5.9.20210613.0 -> 5.9.20210620.0
fwts: upgrade 21.03.00 -> 21.06.00
grpc: upgrade 1.38.0 -> 1.38.1
libconfig: upgrade 1.7.2 -> 1.7.3
satyr: upgrade 0.37 -> 0.38
libnet-telnet-perl: upgrade 3.04 -> 3.05
python3-scrypt: upgrade 0.8.17 -> 0.8.18
python3-urllib3: upgrade 1.26.5 -> 1.26.6
python3-sqlalchemy: upgrade 1.4.17 -> 1.4.20
python3-qrcode: upgrade 6.1 -> 7.1
python3-regex: upgrade 2021.4.4 -> 2021.7.6
python3-sentry-sdk: upgrade 1.1.0 -> 1.2.0
python3-tqdm: upgrade 4.61.1 -> 4.61.2
python3-xlsxwriter: upgrade 1.4.3 -> 1.4.4
ostree: upgrade 2021.2 -> 2021.3
span-lite: upgrade 0.9.2 -> 0.10.0
python3-pymisp: upgrade 2.4.143 -> 2.4.144
python3-protobuf: upgrade 3.17.0 -> 3.17.3
python3-pulsectl: upgrade 21.5.17 -> 21.5.18
python3-pytun: upgrade 2.3.0 -> 2.4.1
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Ie45184e6f308aa2fc98ee6edf4a3ca1c4afbb5b4
diff --git a/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl/0001-avoid-naming-local-function-as-one-of-printf-family.patch b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl/0001-avoid-naming-local-function-as-one-of-printf-family.patch
index f49ef2a..6232820 100644
--- a/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl/0001-avoid-naming-local-function-as-one-of-printf-family.patch
+++ b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl/0001-avoid-naming-local-function-as-one-of-printf-family.patch
@@ -1,6 +1,6 @@
-From e03b003610a176d608da9a02e433e7ded7e4b75f Mon Sep 17 00:00:00 2001
-From: Todd Cunningham <tcunningham07@gmail.com>
-Date: Wed, 11 Dec 2019 10:18:56 +1000
+From c29959e045dd09d0b5727682d4e9dbc10923ac4f Mon Sep 17 00:00:00 2001
+From: Trevor Gamblin <trevor.gamblin@windriver.com>
+Date: Wed, 2 Jun 2021 11:08:51 -0400
Subject: [PATCH] avoid naming local function as one of printf family
Fixes build issues with clang
@@ -11,6 +11,10 @@
Signed-off-by: Yuan Chao <yuanc.fnst@cn.fujitsu.com>
Signed-off-by: Todd Cunningham <tcunningham07@gmail.com>
+
+Use wiggle to get the patch to apply for version 1.2.0.
+
+Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
---
include/expr_ops.h | 2 +-
include/obj.h | 2 +-
@@ -62,56 +66,56 @@
src/obj/synproxy.c | 2 +-
src/obj/tunnel.c | 2 +-
src/object.c | 2 +-
- 49 files changed, 50 insertions(+), 50 deletions(-)
+ 50 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/include/expr_ops.h b/include/expr_ops.h
-index a7f1b9a..d2946de 100644
+index 7a6aa23..d3a2855 100644
--- a/include/expr_ops.h
+++ b/include/expr_ops.h
-@@ -17,7 +17,7 @@ struct expr_ops {
+@@ -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 type, uint32_t flags, const struct nftnl_expr *e);
-+ int (*snprintf_)(char *buf, size_t len, uint32_t type, uint32_t flags, const struct nftnl_expr *e);
+- int (*snprintf)(char *buf, size_t len, uint32_t flags, const struct nftnl_expr *e);
++ int (*snprintf_)(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 9394d79..08610d7 100644
+index 60dc853..1c1c3c1 100644
--- a/include/obj.h
+++ b/include/obj.h
-@@ -99,7 +99,7 @@ struct obj_ops {
+@@ -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 type, uint32_t flags, const struct nftnl_obj *e);
-+ int (*snprintf_)(char *buf, size_t len, uint32_t type, uint32_t flags, const struct nftnl_obj *e);
+- int (*snprintf)(char *buf, size_t len, uint32_t flags, const struct nftnl_obj *e);
++ int (*snprintf_)(char *buf, size_t len, uint32_t flags, const struct nftnl_obj *e);
};
extern struct obj_ops obj_ops_counter;
diff --git a/src/expr.c b/src/expr.c
-index 80c4c36..b698a60 100644
+index 277bbde..2231b21 100644
--- a/src/expr.c
+++ b/src/expr.c
-@@ -275,10 +275,10 @@ int nftnl_expr_snprintf(char *buf, size_t size, const struct nftnl_expr *expr,
- if (size)
+@@ -279,10 +279,10 @@ int nftnl_expr_snprintf(char *buf, size_t remain, const struct nftnl_expr *expr,
+ if (remain)
buf[0] = '\0';
-- if (!expr->ops->snprintf)
-+ if (!expr->ops->snprintf_)
+- if (!expr->ops->snprintf || type != NFTNL_OUTPUT_DEFAULT)
++ if (!expr->ops->snprintf_ || type != NFTNL_OUTPUT_DEFAULT)
return 0;
-- ret = expr->ops->snprintf(buf + offset, remain, type, flags, expr);
-+ ret = expr->ops->snprintf_(buf + offset, remain, type, flags, expr);
+- ret = expr->ops->snprintf(buf + offset, remain, flags, expr);
++ ret = expr->ops->snprintf_(buf + offset, remain, flags, expr);
SNPRINTF_BUFFER_SIZE(ret, remain, offset);
return offset;
diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c
-index c9d40df..27d644b 100644
+index d0c7827..eded505 100644
--- a/src/expr/bitwise.c
+++ b/src/expr/bitwise.c
-@@ -219,5 +219,5 @@ struct expr_ops expr_ops_bitwise = {
+@@ -282,5 +282,5 @@ struct expr_ops expr_ops_bitwise = {
.get = nftnl_expr_bitwise_get,
.parse = nftnl_expr_bitwise_parse,
.build = nftnl_expr_bitwise_build,
@@ -119,10 +123,10 @@
+ .snprintf_ = nftnl_expr_bitwise_snprintf,
};
diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c
-index efdfa2b..7ae9dfb 100644
+index d299745..0068ab2 100644
--- a/src/expr/byteorder.c
+++ b/src/expr/byteorder.c
-@@ -234,5 +234,5 @@ struct expr_ops expr_ops_byteorder = {
+@@ -220,5 +220,5 @@ struct expr_ops expr_ops_byteorder = {
.get = nftnl_expr_byteorder_get,
.parse = nftnl_expr_byteorder_parse,
.build = nftnl_expr_byteorder_build,
@@ -130,10 +134,10 @@
+ .snprintf_ = nftnl_expr_byteorder_snprintf,
};
diff --git a/src/expr/cmp.c b/src/expr/cmp.c
-index 86d7842..e3be442 100644
+index 6030693..7e548e6 100644
--- a/src/expr/cmp.c
+++ b/src/expr/cmp.c
-@@ -216,5 +216,5 @@ struct expr_ops expr_ops_cmp = {
+@@ -202,5 +202,5 @@ struct expr_ops expr_ops_cmp = {
.get = nftnl_expr_cmp_get,
.parse = nftnl_expr_cmp_parse,
.build = nftnl_expr_cmp_build,
@@ -141,10 +145,10 @@
+ .snprintf_ = nftnl_expr_cmp_snprintf,
};
diff --git a/src/expr/connlimit.c b/src/expr/connlimit.c
-index 53af93b..6c8bc40 100644
+index 3b37587..39b7092 100644
--- a/src/expr/connlimit.c
+++ b/src/expr/connlimit.c
-@@ -149,5 +149,5 @@ struct expr_ops expr_ops_connlimit = {
+@@ -135,5 +135,5 @@ struct expr_ops expr_ops_connlimit = {
.get = nftnl_expr_connlimit_get,
.parse = nftnl_expr_connlimit_parse,
.build = nftnl_expr_connlimit_build,
@@ -152,10 +156,10 @@
+ .snprintf_ = nftnl_expr_connlimit_snprintf,
};
diff --git a/src/expr/counter.c b/src/expr/counter.c
-index 89a602e..a32a69e 100644
+index 1676d70..42c96d9 100644
--- a/src/expr/counter.c
+++ b/src/expr/counter.c
-@@ -147,5 +147,5 @@ struct expr_ops expr_ops_counter = {
+@@ -133,5 +133,5 @@ struct expr_ops expr_ops_counter = {
.get = nftnl_expr_counter_get,
.parse = nftnl_expr_counter_parse,
.build = nftnl_expr_counter_build,
@@ -163,10 +167,10 @@
+ .snprintf_ = nftnl_expr_counter_snprintf,
};
diff --git a/src/expr/ct.c b/src/expr/ct.c
-index 124de9d..7bde179 100644
+index d5dfc81..8c15db1 100644
--- a/src/expr/ct.c
+++ b/src/expr/ct.c
-@@ -273,5 +273,5 @@ struct expr_ops expr_ops_ct = {
+@@ -258,5 +258,5 @@ struct expr_ops expr_ops_ct = {
.get = nftnl_expr_ct_get,
.parse = nftnl_expr_ct_parse,
.build = nftnl_expr_ct_build,
@@ -174,10 +178,10 @@
+ .snprintf_ = nftnl_expr_ct_snprintf,
};
diff --git a/src/expr/dup.c b/src/expr/dup.c
-index 2bb35e5..d9bd4b1 100644
+index f041b55..6238a43 100644
--- a/src/expr/dup.c
+++ b/src/expr/dup.c
-@@ -154,5 +154,5 @@ struct expr_ops expr_ops_dup = {
+@@ -138,5 +138,5 @@ struct expr_ops expr_ops_dup = {
.get = nftnl_expr_dup_get,
.parse = nftnl_expr_dup_parse,
.build = nftnl_expr_dup_build,
@@ -185,10 +189,10 @@
+ .snprintf_ = nftnl_expr_dup_snprintf,
};
diff --git a/src/expr/dynset.c b/src/expr/dynset.c
-index 68115ba..6e43bb4 100644
+index 85d64bb..9afbb94 100644
--- a/src/expr/dynset.c
+++ b/src/expr/dynset.c
-@@ -288,5 +288,5 @@ struct expr_ops expr_ops_dynset = {
+@@ -373,5 +373,5 @@ struct expr_ops expr_ops_dynset = {
.get = nftnl_expr_dynset_get,
.parse = nftnl_expr_dynset_parse,
.build = nftnl_expr_dynset_build,
@@ -196,10 +200,10 @@
+ .snprintf_ = nftnl_expr_dynset_snprintf,
};
diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c
-index e5f714b..e68792b 100644
+index 1b813b1..25f1491 100644
--- a/src/expr/exthdr.c
+++ b/src/expr/exthdr.c
-@@ -276,5 +276,5 @@ struct expr_ops expr_ops_exthdr = {
+@@ -262,5 +262,5 @@ struct expr_ops expr_ops_exthdr = {
.get = nftnl_expr_exthdr_get,
.parse = nftnl_expr_exthdr_parse,
.build = nftnl_expr_exthdr_build,
@@ -207,10 +211,10 @@
+ .snprintf_ = nftnl_expr_exthdr_snprintf,
};
diff --git a/src/expr/fib.c b/src/expr/fib.c
-index 9475af4..8e7090d 100644
+index aaff52a..3916e18 100644
--- a/src/expr/fib.c
+++ b/src/expr/fib.c
-@@ -213,5 +213,5 @@ struct expr_ops expr_ops_fib = {
+@@ -198,5 +198,5 @@ struct expr_ops expr_ops_fib = {
.get = nftnl_expr_fib_get,
.parse = nftnl_expr_fib_parse,
.build = nftnl_expr_fib_build,
@@ -218,10 +222,10 @@
+ .snprintf_ = nftnl_expr_fib_snprintf,
};
diff --git a/src/expr/flow_offload.c b/src/expr/flow_offload.c
-index 6ccec9a..c2f2478 100644
+index a826202..c1ca678 100644
--- a/src/expr/flow_offload.c
+++ b/src/expr/flow_offload.c
-@@ -134,5 +134,5 @@ struct expr_ops expr_ops_flow = {
+@@ -120,5 +120,5 @@ struct expr_ops expr_ops_flow = {
.get = nftnl_expr_flow_get,
.parse = nftnl_expr_flow_parse,
.build = nftnl_expr_flow_build,
@@ -229,10 +233,10 @@
+ .snprintf_ = nftnl_expr_flow_snprintf,
};
diff --git a/src/expr/fwd.c b/src/expr/fwd.c
-index cff8235..bcd7d3f 100644
+index 82e5a41..4e80687 100644
--- a/src/expr/fwd.c
+++ b/src/expr/fwd.c
-@@ -174,5 +174,5 @@ struct expr_ops expr_ops_fwd = {
+@@ -158,5 +158,5 @@ struct expr_ops expr_ops_fwd = {
.get = nftnl_expr_fwd_get,
.parse = nftnl_expr_fwd_parse,
.build = nftnl_expr_fwd_build,
@@ -240,10 +244,10 @@
+ .snprintf_ = nftnl_expr_fwd_snprintf,
};
diff --git a/src/expr/hash.c b/src/expr/hash.c
-index 2c801d2..a9f6e7e 100644
+index 10b4a72..84ace31 100644
--- a/src/expr/hash.c
+++ b/src/expr/hash.c
-@@ -241,5 +241,5 @@ struct expr_ops expr_ops_hash = {
+@@ -226,5 +226,5 @@ struct expr_ops expr_ops_hash = {
.get = nftnl_expr_hash_get,
.parse = nftnl_expr_hash_parse,
.build = nftnl_expr_hash_build,
@@ -251,10 +255,10 @@
+ .snprintf_ = nftnl_expr_hash_snprintf,
};
diff --git a/src/expr/immediate.c b/src/expr/immediate.c
-index 47106ae..ea86c88 100644
+index 94b043c..a8a3c1f 100644
--- a/src/expr/immediate.c
+++ b/src/expr/immediate.c
-@@ -235,5 +235,5 @@ struct expr_ops expr_ops_immediate = {
+@@ -229,5 +229,5 @@ struct expr_ops expr_ops_immediate = {
.get = nftnl_expr_immediate_get,
.parse = nftnl_expr_immediate_parse,
.build = nftnl_expr_immediate_build,
@@ -262,10 +266,10 @@
+ .snprintf_ = nftnl_expr_immediate_snprintf,
};
diff --git a/src/expr/limit.c b/src/expr/limit.c
-index 5872e27..0ce482f 100644
+index 3dfd54a..f652df0 100644
--- a/src/expr/limit.c
+++ b/src/expr/limit.c
-@@ -216,5 +216,5 @@ struct expr_ops expr_ops_limit = {
+@@ -202,5 +202,5 @@ struct expr_ops expr_ops_limit = {
.get = nftnl_expr_limit_get,
.parse = nftnl_expr_limit_parse,
.build = nftnl_expr_limit_build,
@@ -273,10 +277,10 @@
+ .snprintf_ = nftnl_expr_limit_snprintf,
};
diff --git a/src/expr/log.c b/src/expr/log.c
-index bbe43d2..5506bc2 100644
+index 86db548..d96b7ce 100644
--- a/src/expr/log.c
+++ b/src/expr/log.c
-@@ -267,5 +267,5 @@ struct expr_ops expr_ops_log = {
+@@ -253,5 +253,5 @@ struct expr_ops expr_ops_log = {
.get = nftnl_expr_log_get,
.parse = nftnl_expr_log_parse,
.build = nftnl_expr_log_build,
@@ -284,10 +288,10 @@
+ .snprintf_ = nftnl_expr_log_snprintf,
};
diff --git a/src/expr/lookup.c b/src/expr/lookup.c
-index a495ac0..678868c 100644
+index 83adce9..1fbace4 100644
--- a/src/expr/lookup.c
+++ b/src/expr/lookup.c
-@@ -221,5 +221,5 @@ struct expr_ops expr_ops_lookup = {
+@@ -206,5 +206,5 @@ struct expr_ops expr_ops_lookup = {
.get = nftnl_expr_lookup_get,
.parse = nftnl_expr_lookup_parse,
.build = nftnl_expr_lookup_build,
@@ -295,10 +299,10 @@
+ .snprintf_ = nftnl_expr_lookup_snprintf,
};
diff --git a/src/expr/masq.c b/src/expr/masq.c
-index f6f3ceb..88292a6 100644
+index 684708c..1ce099c 100644
--- a/src/expr/masq.c
+++ b/src/expr/masq.c
-@@ -169,5 +169,5 @@ struct expr_ops expr_ops_masq = {
+@@ -163,5 +163,5 @@ struct expr_ops expr_ops_masq = {
.get = nftnl_expr_masq_get,
.parse = nftnl_expr_masq_parse,
.build = nftnl_expr_masq_build,
@@ -306,10 +310,10 @@
+ .snprintf_ = nftnl_expr_masq_snprintf,
};
diff --git a/src/expr/match.c b/src/expr/match.c
-index 4fa74b2..249c6b5 100644
+index 533fdf5..8561986 100644
--- a/src/expr/match.c
+++ b/src/expr/match.c
-@@ -198,5 +198,5 @@ struct expr_ops expr_ops_match = {
+@@ -189,5 +189,5 @@ struct expr_ops expr_ops_match = {
.get = nftnl_expr_match_get,
.parse = nftnl_expr_match_parse,
.build = nftnl_expr_match_build,
@@ -317,10 +321,10 @@
+ .snprintf_ = nftnl_expr_match_snprintf,
};
diff --git a/src/expr/meta.c b/src/expr/meta.c
-index 73f6efa..35d5ec5 100644
+index 34fbb9b..1ef79a4 100644
--- a/src/expr/meta.c
+++ b/src/expr/meta.c
-@@ -226,5 +226,5 @@ struct expr_ops expr_ops_meta = {
+@@ -216,5 +216,5 @@ struct expr_ops expr_ops_meta = {
.get = nftnl_expr_meta_get,
.parse = nftnl_expr_meta_parse,
.build = nftnl_expr_meta_build,
@@ -328,10 +332,10 @@
+ .snprintf_ = nftnl_expr_meta_snprintf,
};
diff --git a/src/expr/nat.c b/src/expr/nat.c
-index 6b7d50e..be4a579 100644
+index 0a9cdd7..bc4a3fa 100644
--- a/src/expr/nat.c
+++ b/src/expr/nat.c
-@@ -279,5 +279,5 @@ struct expr_ops expr_ops_nat = {
+@@ -274,5 +274,5 @@ struct expr_ops expr_ops_nat = {
.get = nftnl_expr_nat_get,
.parse = nftnl_expr_nat_parse,
.build = nftnl_expr_nat_build,
@@ -339,10 +343,10 @@
+ .snprintf_ = nftnl_expr_nat_snprintf,
};
diff --git a/src/expr/numgen.c b/src/expr/numgen.c
-index 4e0d541..5995ee3 100644
+index 159dfec..99bb442 100644
--- a/src/expr/numgen.c
+++ b/src/expr/numgen.c
-@@ -195,5 +195,5 @@ struct expr_ops expr_ops_ng = {
+@@ -180,5 +180,5 @@ struct expr_ops expr_ops_ng = {
.get = nftnl_expr_ng_get,
.parse = nftnl_expr_ng_parse,
.build = nftnl_expr_ng_build,
@@ -350,10 +354,10 @@
+ .snprintf_ = nftnl_expr_ng_snprintf,
};
diff --git a/src/expr/objref.c b/src/expr/objref.c
-index 7388b18..e673ffd 100644
+index a4b6470..1b2d387 100644
--- a/src/expr/objref.c
+++ b/src/expr/objref.c
-@@ -210,5 +210,5 @@ struct expr_ops expr_ops_objref = {
+@@ -205,5 +205,5 @@ struct expr_ops expr_ops_objref = {
.get = nftnl_expr_objref_get,
.parse = nftnl_expr_objref_parse,
.build = nftnl_expr_objref_build,
@@ -361,10 +365,10 @@
+ .snprintf_ = nftnl_expr_objref_snprintf,
};
diff --git a/src/expr/osf.c b/src/expr/osf.c
-index 98d0df9..618b46e 100644
+index 215a681..75a6b3c 100644
--- a/src/expr/osf.c
+++ b/src/expr/osf.c
-@@ -161,5 +161,5 @@ struct expr_ops expr_ops_osf = {
+@@ -147,5 +147,5 @@ struct expr_ops expr_ops_osf = {
.get = nftnl_expr_osf_get,
.parse = nftnl_expr_osf_parse,
.build = nftnl_expr_osf_build,
@@ -372,10 +376,10 @@
+ .snprintf_ = nftnl_expr_osf_snprintf,
};
diff --git a/src/expr/payload.c b/src/expr/payload.c
-index 2192dad..37aacc4 100644
+index 9ccb78e..aa17025 100644
--- a/src/expr/payload.c
+++ b/src/expr/payload.c
-@@ -266,5 +266,5 @@ struct expr_ops expr_ops_payload = {
+@@ -258,5 +258,5 @@ struct expr_ops expr_ops_payload = {
.get = nftnl_expr_payload_get,
.parse = nftnl_expr_payload_parse,
.build = nftnl_expr_payload_build,
@@ -383,10 +387,10 @@
+ .snprintf_ = nftnl_expr_payload_snprintf,
};
diff --git a/src/expr/queue.c b/src/expr/queue.c
-index 051ef71..b06feff 100644
+index 8f70977..6bc76ef 100644
--- a/src/expr/queue.c
+++ b/src/expr/queue.c
-@@ -207,5 +207,5 @@ struct expr_ops expr_ops_queue = {
+@@ -193,5 +193,5 @@ struct expr_ops expr_ops_queue = {
.get = nftnl_expr_queue_get,
.parse = nftnl_expr_queue_parse,
.build = nftnl_expr_queue_build,
@@ -394,10 +398,10 @@
+ .snprintf_ = nftnl_expr_queue_snprintf,
};
diff --git a/src/expr/quota.c b/src/expr/quota.c
-index 39a92e6..41797be 100644
+index 8c841d8..1a5f2fa 100644
--- a/src/expr/quota.c
+++ b/src/expr/quota.c
-@@ -161,5 +161,5 @@ struct expr_ops expr_ops_quota = {
+@@ -147,5 +147,5 @@ struct expr_ops expr_ops_quota = {
.get = nftnl_expr_quota_get,
.parse = nftnl_expr_quota_parse,
.build = nftnl_expr_quota_build,
@@ -405,10 +409,10 @@
+ .snprintf_ = nftnl_expr_quota_snprintf,
};
diff --git a/src/expr/range.c b/src/expr/range.c
-index d1d5083..b619cdf 100644
+index f76843a..73a1930 100644
--- a/src/expr/range.c
+++ b/src/expr/range.c
-@@ -227,5 +227,5 @@ struct expr_ops expr_ops_range = {
+@@ -213,5 +213,5 @@ struct expr_ops expr_ops_range = {
.get = nftnl_expr_range_get,
.parse = nftnl_expr_range_parse,
.build = nftnl_expr_range_build,
@@ -416,10 +420,10 @@
+ .snprintf_ = nftnl_expr_range_snprintf,
};
diff --git a/src/expr/redir.c b/src/expr/redir.c
-index 477659a..5c4ebeb 100644
+index 4f56cb4..51ec71c 100644
--- a/src/expr/redir.c
+++ b/src/expr/redir.c
-@@ -181,5 +181,5 @@ struct expr_ops expr_ops_redir = {
+@@ -167,5 +167,5 @@ struct expr_ops expr_ops_redir = {
.get = nftnl_expr_redir_get,
.parse = nftnl_expr_redir_parse,
.build = nftnl_expr_redir_build,
@@ -427,10 +431,10 @@
+ .snprintf_ = nftnl_expr_redir_snprintf,
};
diff --git a/src/expr/reject.c b/src/expr/reject.c
-index 141942e..a98990d 100644
+index 716d25c..acf32c2 100644
--- a/src/expr/reject.c
+++ b/src/expr/reject.c
-@@ -148,5 +148,5 @@ struct expr_ops expr_ops_reject = {
+@@ -134,5 +134,5 @@ struct expr_ops expr_ops_reject = {
.get = nftnl_expr_reject_get,
.parse = nftnl_expr_reject_parse,
.build = nftnl_expr_reject_build,
@@ -438,10 +442,10 @@
+ .snprintf_ = nftnl_expr_reject_snprintf,
};
diff --git a/src/expr/rt.c b/src/expr/rt.c
-index 0fce72d..32ace19 100644
+index 1ad9b2a..9f2fdf3 100644
--- a/src/expr/rt.c
+++ b/src/expr/rt.c
-@@ -177,5 +177,5 @@ struct expr_ops expr_ops_rt = {
+@@ -162,5 +162,5 @@ struct expr_ops expr_ops_rt = {
.get = nftnl_expr_rt_get,
.parse = nftnl_expr_rt_parse,
.build = nftnl_expr_rt_build,
@@ -449,10 +453,10 @@
+ .snprintf_ = nftnl_expr_rt_snprintf,
};
diff --git a/src/expr/socket.c b/src/expr/socket.c
-index 96550d5..2394dbf 100644
+index 02d86f8..49a126b 100644
--- a/src/expr/socket.c
+++ b/src/expr/socket.c
-@@ -174,5 +174,5 @@ struct expr_ops expr_ops_socket = {
+@@ -165,5 +165,5 @@ struct expr_ops expr_ops_socket = {
.get = nftnl_expr_socket_get,
.parse = nftnl_expr_socket_parse,
.build = nftnl_expr_socket_build,
@@ -460,10 +464,10 @@
+ .snprintf_ = nftnl_expr_socket_snprintf,
};
diff --git a/src/expr/synproxy.c b/src/expr/synproxy.c
-index 245f4fb..9721029 100644
+index 630f3f4..b22ad2f 100644
--- a/src/expr/synproxy.c
+++ b/src/expr/synproxy.c
-@@ -166,5 +166,5 @@ struct expr_ops expr_ops_synproxy = {
+@@ -152,5 +152,5 @@ struct expr_ops expr_ops_synproxy = {
.get = nftnl_expr_synproxy_get,
.parse = nftnl_expr_synproxy_parse,
.build = nftnl_expr_synproxy_build,
@@ -471,10 +475,10 @@
+ .snprintf_ = nftnl_expr_synproxy_snprintf,
};
diff --git a/src/expr/target.c b/src/expr/target.c
-index 9100038..7180085 100644
+index b7c595a..31a039c 100644
--- a/src/expr/target.c
+++ b/src/expr/target.c
-@@ -198,5 +198,5 @@ struct expr_ops expr_ops_target = {
+@@ -189,5 +189,5 @@ struct expr_ops expr_ops_target = {
.get = nftnl_expr_target_get,
.parse = nftnl_expr_target_parse,
.build = nftnl_expr_target_build,
@@ -482,10 +486,10 @@
+ .snprintf_ = nftnl_expr_target_snprintf,
};
diff --git a/src/expr/tproxy.c b/src/expr/tproxy.c
-index 3827b75..feabbbe 100644
+index d3ee8f8..1b01591 100644
--- a/src/expr/tproxy.c
+++ b/src/expr/tproxy.c
-@@ -183,5 +183,5 @@ struct expr_ops expr_ops_tproxy = {
+@@ -170,5 +170,5 @@ struct expr_ops expr_ops_tproxy = {
.get = nftnl_expr_tproxy_get,
.parse = nftnl_expr_tproxy_parse,
.build = nftnl_expr_tproxy_build,
@@ -493,10 +497,10 @@
+ .snprintf_ = nftnl_expr_tproxy_snprintf,
};
diff --git a/src/expr/tunnel.c b/src/expr/tunnel.c
-index b2b8d72..1ed46d3 100644
+index 1460fd2..6c2f653 100644
--- a/src/expr/tunnel.c
+++ b/src/expr/tunnel.c
-@@ -173,5 +173,5 @@ struct expr_ops expr_ops_tunnel = {
+@@ -145,5 +145,5 @@ struct expr_ops expr_ops_tunnel = {
.get = nftnl_expr_tunnel_get,
.parse = nftnl_expr_tunnel_parse,
.build = nftnl_expr_tunnel_build,
@@ -504,10 +508,10 @@
+ .snprintf_ = nftnl_expr_tunnel_snprintf,
};
diff --git a/src/expr/xfrm.c b/src/expr/xfrm.c
-index 8fe5438..b6b2772 100644
+index c81d14d..e648ee5 100644
--- a/src/expr/xfrm.c
+++ b/src/expr/xfrm.c
-@@ -239,5 +239,5 @@ struct expr_ops expr_ops_xfrm = {
+@@ -196,5 +196,5 @@ struct expr_ops expr_ops_xfrm = {
.get = nftnl_expr_xfrm_get,
.parse = nftnl_expr_xfrm_parse,
.build = nftnl_expr_xfrm_build,
@@ -515,10 +519,10 @@
+ .snprintf_ = nftnl_expr_xfrm_snprintf,
};
diff --git a/src/obj/counter.c b/src/obj/counter.c
-index 1baba4e..3710bce 100644
+index ef0cd20..0c199f7 100644
--- a/src/obj/counter.c
+++ b/src/obj/counter.c
-@@ -145,5 +145,5 @@ struct obj_ops obj_ops_counter = {
+@@ -127,5 +127,5 @@ struct obj_ops obj_ops_counter = {
.get = nftnl_obj_counter_get,
.parse = nftnl_obj_counter_parse,
.build = nftnl_obj_counter_build,
@@ -526,10 +530,10 @@
+ .snprintf_ = nftnl_obj_counter_snprintf,
};
diff --git a/src/obj/ct_expect.c b/src/obj/ct_expect.c
-index c0bb5ba..953c08c 100644
+index 8136ad9..b3e1d70 100644
--- a/src/obj/ct_expect.c
+++ b/src/obj/ct_expect.c
-@@ -209,5 +209,5 @@ struct obj_ops obj_ops_ct_expect = {
+@@ -196,5 +196,5 @@ struct obj_ops obj_ops_ct_expect = {
.get = nftnl_obj_ct_expect_get,
.parse = nftnl_obj_ct_expect_parse,
.build = nftnl_obj_ct_expect_build,
@@ -537,10 +541,10 @@
+ .snprintf_ = nftnl_obj_ct_expect_snprintf,
};
diff --git a/src/obj/ct_helper.c b/src/obj/ct_helper.c
-index d91f636..2037461 100644
+index c52032a..12b783c 100644
--- a/src/obj/ct_helper.c
+++ b/src/obj/ct_helper.c
-@@ -166,5 +166,5 @@ struct obj_ops obj_ops_ct_helper = {
+@@ -150,5 +150,5 @@ struct obj_ops obj_ops_ct_helper = {
.get = nftnl_obj_ct_helper_get,
.parse = nftnl_obj_ct_helper_parse,
.build = nftnl_obj_ct_helper_build,
@@ -548,10 +552,10 @@
+ .snprintf_ = nftnl_obj_ct_helper_snprintf,
};
diff --git a/src/obj/ct_timeout.c b/src/obj/ct_timeout.c
-index e2e9991..a4f2dd2 100644
+index 1d4f8fb..0a12883 100644
--- a/src/obj/ct_timeout.c
+++ b/src/obj/ct_timeout.c
-@@ -330,5 +330,5 @@ struct obj_ops obj_ops_ct_timeout = {
+@@ -316,5 +316,5 @@ struct obj_ops obj_ops_ct_timeout = {
.get = nftnl_obj_ct_timeout_get,
.parse = nftnl_obj_ct_timeout_parse,
.build = nftnl_obj_ct_timeout_build,
@@ -559,10 +563,10 @@
+ .snprintf_ = nftnl_obj_ct_timeout_snprintf,
};
diff --git a/src/obj/limit.c b/src/obj/limit.c
-index 60b0159..538f37a 100644
+index 8b40f9d..2f049b8 100644
--- a/src/obj/limit.c
+++ b/src/obj/limit.c
-@@ -185,5 +185,5 @@ struct obj_ops obj_ops_limit = {
+@@ -168,5 +168,5 @@ struct obj_ops obj_ops_limit = {
.get = nftnl_obj_limit_get,
.parse = nftnl_obj_limit_parse,
.build = nftnl_obj_limit_build,
@@ -570,10 +574,10 @@
+ .snprintf_ = nftnl_obj_limit_snprintf,
};
diff --git a/src/obj/quota.c b/src/obj/quota.c
-index 1914037..585a088 100644
+index 8ab3300..8666334 100644
--- a/src/obj/quota.c
+++ b/src/obj/quota.c
-@@ -161,5 +161,5 @@ struct obj_ops obj_ops_quota = {
+@@ -144,5 +144,5 @@ struct obj_ops obj_ops_quota = {
.get = nftnl_obj_quota_get,
.parse = nftnl_obj_quota_parse,
.build = nftnl_obj_quota_build,
@@ -581,21 +585,32 @@
+ .snprintf_ = nftnl_obj_quota_snprintf,
};
diff --git a/src/obj/secmark.c b/src/obj/secmark.c
-index e27b5fa..6241bee 100644
+index 2ccc803..e96e06f 100644
--- a/src/obj/secmark.c
+++ b/src/obj/secmark.c
-@@ -133,5 +133,5 @@ struct obj_ops obj_ops_secmark = {
+@@ -116,5 +116,5 @@ struct obj_ops obj_ops_secmark = {
.get = nftnl_obj_secmark_get,
.parse = nftnl_obj_secmark_parse,
.build = nftnl_obj_secmark_build,
- .snprintf = nftnl_obj_secmark_snprintf,
+ .snprintf_ = nftnl_obj_secmark_snprintf,
};
+diff --git a/src/obj/synproxy.c b/src/obj/synproxy.c
+index d689fee..d06cb6d 100644
+--- a/src/obj/synproxy.c
++++ b/src/obj/synproxy.c
+@@ -143,5 +143,5 @@ struct obj_ops obj_ops_synproxy = {
+ .get = nftnl_obj_synproxy_get,
+ .parse = nftnl_obj_synproxy_parse,
+ .build = nftnl_obj_synproxy_build,
+- .snprintf = nftnl_obj_synproxy_snprintf,
++ .snprintf_ = nftnl_obj_synproxy_snprintf,
+ };
diff --git a/src/obj/tunnel.c b/src/obj/tunnel.c
-index 7ffade8..800eb3e 100644
+index 5ede6bd..d3743ff 100644
--- a/src/obj/tunnel.c
+++ b/src/obj/tunnel.c
-@@ -564,5 +564,5 @@ struct obj_ops obj_ops_tunnel = {
+@@ -547,5 +547,5 @@ struct obj_ops obj_ops_tunnel = {
.get = nftnl_obj_tunnel_get,
.parse = nftnl_obj_tunnel_parse,
.build = nftnl_obj_tunnel_build,
@@ -603,29 +618,18 @@
+ .snprintf_ = nftnl_obj_tunnel_snprintf,
};
diff --git a/src/object.c b/src/object.c
-index d8c87ee..5307d7e 100644
+index 46e208b..d321c50 100644
--- a/src/object.c
+++ b/src/object.c
-@@ -370,7 +370,7 @@ static int nftnl_obj_snprintf_dflt(char *buf, size_t size,
+@@ -396,7 +396,7 @@ static int nftnl_obj_snprintf_dflt(char *buf, size_t remain,
SNPRINTF_BUFFER_SIZE(ret, remain, offset);
if (obj->ops) {
-- ret = obj->ops->snprintf(buf + offset, offset, type, flags,
-+ ret = obj->ops->snprintf_(buf + offset, offset, type, flags,
- obj);
+- ret = obj->ops->snprintf(buf + offset, remain, flags, obj);
++ ret = obj->ops->snprintf_(buf + offset, remain, flags, obj);
SNPRINTF_BUFFER_SIZE(ret, remain, offset);
}
-diff --git a/src/obj/synproxy.c b/src/obj/synproxy.c
-index 56ebc85..6b5380f 100644
---- a/src/obj/synproxy.c
-+++ b/src/obj/synproxy.c
-@@ -157,5 +157,5 @@ struct obj_ops obj_ops_synproxy = {
- .get = nftnl_obj_synproxy_get,
- .parse = nftnl_obj_synproxy_parse,
- .build = nftnl_obj_synproxy_build,
-- .snprintf = nftnl_obj_synproxy_snprintf,
-+ .snprintf_ = nftnl_obj_synproxy_snprintf,
- };
+ ret = snprintf(buf + offset, remain, "]");
--
-2.17.1
+2.31.1