meta-openembedded: subtree update:459dbf1078..ea8604a0e3
Adrian Bunk (6):
xfsprogs: Remove obsolete patch
gpsd: Add a PACKAGECONFIG for disabling usb support
libqmi: Upgrade 1.24.0 -> 1.24.2
enchant2: Upgrade 2.2.3 -> 2.2.7
geany-plugins: Use enchant2 instead of the old enchant
enchant2: Remove, moved to oe-core
Alex Kiernan (11):
nftables: Fix documentation generation
ldns: Add recipe
ostree: Fix DISTRO_FEATURES with ptest but w/o xattr
ostree: Drop tests for soup/xattr with ptest
ostree: Change PACKAGECONFIG to use manpages
ostree: Add PACKAGECONFIG for builtin-grub2-mkconfig
ostree: Backport build/test fixes from upstream
ostree: Upgrade 2019.5 -> 2019.6
ostree: Add support for gjs tests
nftables: Expand PACKAGECONFIG, cleanup build
ostree: Tidy FILES_${PN} using PACKAGE_BEFORE_PN
Alexander Kanavin (1):
enscript/indent/sharutils: fix build with gettext 0.20.x
Alistair Francis (2):
mycroft: RDEPENDS on mpg123 to allow singing
openocd: Enable remote-bitbang build option
Andreas Müller (76):
gnome-system-monitor: add gsettings to inherit
tracker-miners: initial add 2.3.1
nautilus: add tracker-miners to RDPENDS
libgnomekbd: cleanup DEPENDS inherit gsettings / remove unused config
nodejs: Add PACKAGECONFIG share to allow other projects to use node as library
xserver-xorg-cvt-native: initial add 1.20.5
mutter: initial add 3.34.1
pinpoint: remove dead project
gnome-keyring: upgrade 3.28.2 -> 3.34.0
libgsf: upgrade 1.14.45 -> 1.14.46
libgnome-keyring: remove
gvfs: upgrade 1.41.2 -> 1.42.1
grilo: initial add 0.3.10
gsound: initial add 1.0.2
gnome-backgrounds: initial add 3.34.0
metacity: upgrade 3.32.0 -> 3.34.1
gjs: initial add 1.58.3
gdm: re-add 3.34.1
gnome-shell: initial add 3.34.1
gnome-shell-extensions: initial add 3.34.1
accountsservice: initial add 0.6.55
rest: initial add 0.8.1
gnome-online-accounts: initial add 3.34.1
gnome-control-center: re-add 3.34.1
gnome-session: inital add 3.34.1
gnome-panel: (re)add 3.34.1
gnome-flashback: initial add 3.34.1
Add: packagegroup-gnome-apps / packagegroup-gnome-desktop
glfw: add features_check to inherit
stalonetray: Add x11 to required distro feature
projucer: add x11 to required distro features
colord-gtk: add polkit to required distro features
yelp: add x11 to required distro features
file-roller: remove nautilus from DEPENDS
libgdata: add x11 to required distro features
accountsservice: Hack musl build fix
accountsservice: fix build for systemd not in DISTRO_FEATURES
gnome-font-viewer: fix copy & paste typo in SUMMARY
libxfce4ui: give up glade3 (=glade for gtk2) support
glade3: remove ancient version of glade
exo: remove pythonnative from inherit
geany: remove pythonnative from inherit
gnome-tweaks: initial add 3.34.0
libhandy: initial add 0.0.12
fluidsynth: upgrade 2.0.9 -> 2.1.0
exo: upgrade 0.12.10 -> 0.12.11
tumbler: upgrade 0.2.7 -> 0.2.8
catfish: upgrade 1.4.10 -> 1.4.11
cppunit: upgrade 1.14.0 -> 1.15.1
xfce4-terminal: upgrade 0.8.8 -> 0.8.9
gnome-calculator: initial add 3.34.1
evince: upgrade 3.34.1 -> 3.34.1
file-roller: upgrade 3.32.2 -> 3.32.3
evolution-data-server: upgrade 3.34.1 -> 3.34.2
gedit: upgrade 3.34.0 -> 3.34.1
gnome-autoar: upgrade 0.2.3 -> 0.2.4
gnome-control-center: upgrade 3.34.1 -> 3.34.2
gnome-desktop3: upgrade 3.34.1 -> 3.34.2
gnome-flashback: upgrade 3.34.1 -> 3.34.2
gnome-session: 3.34.1 -> 3.34.2
gnome-settings-daemon: upgrade 3.34.1 -> 3.34.2
gnome-shell-extensions: upgrade 3.34.1 -> 3.34.2
gnome-shell: upgrade 3.34.1 -> 3.34.2
gvfs: upgrade 1.42.1 -> 1.42.2
libgdata: upgrade 0.17.10 -> 0.17.11
mutter: upgrade 3.34.1 -> 3.34.2
nautilus: upgrade 3.34.1 -> 3.34.2
yelp-xsl: upgrade 3.34.0 -> 3.34.2
poppler: upgrade 0.82.0 -> 0.84.0
xfce4-terminal: upgrade 0.8.9 -> 0.8.9.1
mutter: upgrade 3.34.2 -> 3.34.3
gnome-shell: upgrade 3.34.2 -> 3.34.3
evolution-data-server: upgrade 3.34.2 -> 3.34.3
gjs: upgrade 1.58.3 -> 1.58.4
gnome-desktop3: upgrade 3.34.2 -> 3.34.3
libsigc++-3: let meson build
Andrei Gherzan (1):
kernel-selftest: Include rtc tests
Andrej Valek (1):
ntp: split ntpdc into separate package
Andrey Zhizhikin (1):
flatbuffers: add PIC compiler flag required for aarch64
André Draszik (4):
python3-jsonrpcserver: update to v4.1.0
python3-jsonrpcserver: allow to use as non-root
oniguruma: update to v6.9.4
oniguruma: enable ptest
Armin Kuster (3):
glfw: missing feature check.
libvncserver: fix build depends issue
surf: Add opengl requirement
Bartosz Golaszewski (10):
librsync: new package
xdelta3: update to v3.1.0
xdelta3: add native and nativesdk to BBCLASSEXTEND
speedtest-cli: new package
doxygen: upgrade v1.8.16 -> v1.8.17
libsigrok: upgrade v0.5.1 -> v0.5.2
libsigrokdecode: upgrade v0.5.2 -> v0.5.3
libsigrok: add support for bluetooth integration
cloc: new package
libsigrok: add support for hidapi integration
Changqing Li (5):
samba: fix wrong shebang for python3
gtk-xfce-engine: remove this recipe
xfce4-kbdleds-plugin: remove this recipe
xfce-dusk-gtk3: correct invalid SRC_URI
libhugetlbfs: update patch to make it work for python3
Denys Dmytriyenko (1):
netperf: add "intervals" and "histogram" PACKAGECONFIGs
Diego Rondini (2):
cups-filters: add recipe
qpdf: add recipe
Fabio Berton (1):
nanopb: Add recipe for version 0.4.0
Gianfranco Costamagna (6):
boinc: update recipe to version 7.16.3
vboxguestdrivers: update to version 6.1.0 and unblacklist
websocketpp: add various upstream accepted and proposed patches to fix various issues, including:
brotli: rename static libraries avoding the -static suffix.
cpprest: fix cmake installation directory
websocketpp: also install examples in a new -examples subpackage
Hongxu Jia (2):
gvfs: add user polkitd and missing depends
python3-astor: fix VERSION file not found
Jacopo Dall'Aglio (1):
netplan: add recipe
Jens Rehsack (6):
log4cplus: update to 2.0.5
libstatgrab: add logging/tracing options
libtest-warnings-perl: add recipe
libfile-slurper-perl: add recipe
libconfig-autoconf-perl: add recipe
libunix-statgrab: add recipe
Kai Kang (12):
blueman: disable appindicator support
xfce4-panel-profiles: 1.0.8 -> 1.0.9
exo: 0.12.9 -> 0.12.10
thunar: 1.8.9 -> 1.8.10
fltk: fix build error when enable package config examples
corosync: fix build error when package config rdma enabled
rdma-core: 18.1 -> 27.0
openl2tp: update systemd service file
bdwgc: make libatomic-ops as dependency
volume-key: not create python2 bindings
libbytesize: disable doc build
adduser: set default shell with /sbin/nologin
Khem Raj (113):
python-evdev: Fix build for 32bit arches with 64bit time_t
x11vnc: Fix build for 32bit arches with 64bit time_t
evtest: Fix build for 32bit arches with 64bit time_t
lirc: Fix build for 32bit arches with 64bit time_t
v4l-utils: Update to 1.18.0
tslib: Fix build for 32bit arches with 64bit time_t
utouch-evemu,utouch-frame: Fix build for 32bit arches with 64bit time_t
directfb: Fix build for 32bit arches with 64bit time_t
kernel-module-emlog: Use compile task from module bbclass
emlog: Use RRECOMMEND instead of RDEPEND
projucer: Upgrade to 5.4.5
packagegroup-meta-oe: Remove nodejs and uim on riscv
libnih: Fix build with latest gettext
liblockdev: Loosen the regexp for py3
sigrok-cli: Update to 0.7.1
python-pywbem: Update to 0.15.0
udisks2: Update to 2.8.4
id3lib: Update to newer debian patchset
libdc1394: Update to 2.2.6 release
libsmi: Use right name for tcl license
hdf5: Upgrade to 1.8.21
xterm: Fix latent issue found with musl
mozjs: extend --with-intl-api=build to all mips
klibc: Apply -no-integrated-as on mips/clang
grpc: Define libdir and cmakedir in terms of multilib
ufs-utils: Renames from ufs-tool
breakpad: Update to latest upstream
rsyslog: Sync VALGRIND supported arch list
packagegroup-meta-oe: Remove ppc64 specific incompatible packages
libpfm4: Moved here from oe-core
rdma-core: Replace pthread_yield with sched_yield
fvwm: Upgrade to 2.6.9
nlohmann-json: Upgrade to 3.7.3
libqb: Add --enable-nosection-fallback with mips64/clang
lcdproc: Upgrade to latest top of tree
tinyalsa: fix installation libdir path to match multilibs
luajit: Add ppc/ppc64 to unsupported arch list
rsyslog: Do not assume atomic built-ins on ppc
hiredis: Upgrade to 0.14.0
libfann: Define LIB_SUFFIX suitable for OE multilib needs
libgit2: Upgrade to 0.28.4
libinih: Fix multilib build
poco: Define LIB_SUFFIX per OE multilibs
libcec: Fix multilib build
dfu-util-native,sjf2410-linux-native: Fix Deploy in multimachine builds
mpv: Remove luajit dependency for ppc64
cannelloni: Update to latest and fix multilib builds
nvme-cli: Use nonarch libdir for dracut config files
cli11: Fix multilib build
lockdev: Make baselib configurable
avro-c: Update to 1.9.1
nftables: Package python scripts into nonarch libdir
mercurial: Add python scripts into separate python package
fluentbit: Fix packaging in multilib env
dcadec: Define BASELIB as a knob
dbus-broker: Use nonarch_libdir for systemd catalog files
websocketapp: Fix multilib build
ade: Fix install paths in multilib builds
thrift: Upgrade to 0.13
gattlib: Update to latest tip
rygel: Use nonarch_libdir for systemd units
firewalld: Package firewalld files
iwd: Package module conf files via nonarch_libdir
civetweb: Upgrade to latest tip
ruli: Define OOP_LIB_DIR and INSTALL_LIB_DIR
liblightmodbus: Fix packaging errors when using multilib
ostree: Fix packaging errors when using lib64 libdir
boinc-client: Use nonarch_libdir for systemd_units
spirv-tools: Fix multilib builds
pam-plugin-ldapdb: Include <stdexcept> for std::invalid_argument
dvb-apps: Replace stime with clock_settime
redis: Upgrade to 5.0.7
cannelloni: Include stdexcept for runtime_error
libubox: Update to latest
upm: Fix 'may be used uninitialized' errors
memcached: upgrade to 1.5.20
ltrace: Fix build with gcc10
mpd: Fix build with gcc10
wvstreams: Fix build with gcc10
tvheadend: Fix format-truncation warnings
open-vm-tools: Ignore -Warray-bounds
jsoncpp: Upgrade to 1.9.2
ippool: Fix strncpy -Wformat-truncation warning
opensc: Fix misaligned indentation
glm: Upgrade to 0.9.9.6
rocksdb: Upgrade to 6.5.2
mariadb: Upgrade to 10.4.11
ruli: Fix implicit conversion from 'unsigned int' to 'float'
glfw: Update to latest
fluentbit: Upgrade to 1.3.5
renderdoc: Upgrade to 1.5
spirv-tools: Upgrade to v2019.5
upm: Disable -Wno-misleading-indentation with clang10+
libyui: Disable Warnings as errors
sanlock: Upgrade to 3.8.0+
udisks2: Updare to latest master beyond 2.8.4
netcat: Fix build with gettext 0.20.x
gtkperf: Fix build with latest gettext 0.20.x
hddtemp: Fix build with latest gettext 0.20.x
vorbis-tools: Use external gettext
rwmem: Upgrade to latest
wireshark: Enable plugins when enabling qt5
python3-jsonrpcserver: Use PYTHON_BASEVERSION instead of hardcoding py version
smbnetfs: Update to latest 0.6.2 rev
makedumpfile: Drop linking with libebl
cmpi-bindings: append PYTHON_ABI suffix to libpython soname
websocketpp: Fix clang specific flags in cmake files
rocksdb: Disable Werror
spirv-tools: Disable Werror
libspatialite: Workaround proj_api.h deprecation in proj 6.0.0
zbar: Switch to github and update to latest
gstd: Upgrade to 0.8.1
gst-shark: Upgrade to 0.6.1
Laurent Bonnans (1):
opensc: fix RDEPENDS in pcsc PACKAGECONFIG
Leon Anavi (1):
mosquitto: update to 1.6.8
Martin Jansa (2):
googletest: fix build with newer oe-core without python in HOSTTOOLS
proj: upgrade to 6.2.0
Max Krummenacher (1):
libsoc: use python3 for python bindings
Maxime Roussin-Bélanger (1):
libvncserver: add missing cmake configration option to packageconfig
Mingde (Matthew) Zeng (1):
poppler/poppler-data: Add HOMEPAGE tags
Nicola Lunghi (1):
python3-jsonrpcserver: update to 4.1.2
Pau Espin Pedrol (1):
lksctp-tools: Add RRECOMENDS kernel-module-sctp for pkg lksctp-tools
Peter Kolbus (9):
python(3)-ujson: extend to native(sdk)
python-ipaddress: remove unneeded pip dependency
python3-html2text: add recipe
python(3)-beautifulsoup4: fix RDEPENDS
python3-soupsieve: add recipe
python-soupsieve: add recipe
python(3)-beautifulsoup4: add soupsieve to RDEPENDS
python3-booleanpy: add recipe
python3-license-expression: add recipe
Pierre-Jean Texier (3):
libssh2: add nativesdk support
python3-xmltodict: add recipe
libmxml: upgrade 3.0 -> 3.1
Quanyang Wang (1):
glog: fix do_fetch error
Randy MacLeod (3):
imagemagick: update from 7.8.47 to 7.9.16
tigervnc: update from 1.9.0 to 1.10.1
rsyslog: update from 8.1910 to 8.1911
Robert Yang (1):
rocksdb: Fix compile error for DEBUG_BUILD
Ross Burton (11):
python-jsonpointer: enable native/nativesdk
python3-pystemd: upgrade to 0.7.0
python-slip-dbus: don't use relative paths
python-m2crypto: don't use relative paths
python-coloredlogs: don't use relative paths
python-lxml: remove redundant sed (fixed in 4.3.0 onwards)
python-lxml: remove redundant RDEPENDS_class-native
opencv: don't download during configure
opencv: also download face alignment data in do_fetch()
opencv: PACKAGECONFIG for G-API, use system ADE
opencv: abort configure if we need to download
Stefan Agner (1):
Revert "zstd: move recipe to oe-core"
Stefan Lendl (2):
tinyproxy: Install a default tinyproxy.conf
tinyproxy: Fix user and group in tinyproxy install
Sumit Garg (1):
mariadb: fix library LZ4 lookup
Todd Cunningham (2):
libnftnl: upgrade 1.1.4 -> 1.1.5
nftables: upgrade 0.9.2 -> 0.9.3
Trevor Gamblin (4):
python-twisted: add python3-pyserial to RDEPENDS
python-twisted: add missing RDEPENDS for conch
samba: disable guest access and anonymous queries
python3-twisted: fix broken MemoryReactor import
Wang Mingyu (66):
python-cmd2: upgrade 0.9.19 -> 0.9.21
python-pluggy: upgrade 0.13.0 -> 0.13.1
python-pyasn1: upgrade 0.4.7 -> 0.4.8
python-pyopenssl: upgrade 19.0.0 -> 19.1.0
python-simplejson: upgrade 3.16.0 -> 3.17.0
python-thrift: upgrade 0.11.0 -> 0.13.0
python-alembic: upgrade 1.3.0 -> 1.3.1
python-dbus: upgrade 1.2.12 -> 1.2.14
python-pbr: upgrade 5.4.3 -> 5.4.4
python-paste: 3.2.2 -> 3.2.3
python-lxml: 4.4.1 -> 4.4.2
postgresql: 12.0 -> 12.1
python-jsonschema: 3.1.1 -> 3.2.0
python-pytest: upgrade 5.2.2 -> 5.3.1
xterm: upgrade 350 -> 351
wireshark: upgrade 3.0.6 -> 3.0.7
python3-xxhash: upgrade 1.4.2 -> 1.4.3
fuse3: upgrade 3.8.0 -> 3.9.0
kea: upgrade 1.7.0 -> 1.7.2
krb5: upgrade 1.17 -> 1.17.1
hwdata: upgrade 0.329 -> 0.330
python-pytest: upgrade 5.2.1 -> 5.3.2
python-waitress: upgrade 1.3.1 -> 1.4.1
python-cachetools: upgrade 3.1.1 -> 4.0.0
python-sqlalchemy: upgrade 1.1.17 -> 1.3.12
strongswan: upgrade 5.8.1 -> 5.8.2
smartmontools: upgrade 7.0 -> 7.1
spitools: upgrade 0.8.3 -> 0.8.4
python-pyyaml: upgrade 5.1.2 -> 5.2
arno-iptables-firewall: upgrade 2.0.3 -> 2.1.0
ipvsadm: upgrade 1.30 -> 1.31
lftp: upgrade 4.8.4 -> 4.9.0
nghttp2: upgrade 1.39.2 -> 1.40.0
opensaf: upgrade 5.19.07 -> 5.19.10
wolfssl: upgrade 4.2.0 -> 4.3.0
kea: upgrade 1.7.2 -> 1.7.3
wireshark: upgrade 3.0.7 -> 3.2.0
botan: upgrade 2.11.0 -> 2.13.0
cppzmq: upgrade 4.4.1 -> 4.5.0
iozone3: upgrade 487 -> 488
libmbim: upgrade 1.20.2 -> 1.20.4
libnfc: upgrade to 1.7.1
libsigc++-2.0: upgrade 3.0.0 -> 3.0.2
libuv: upgrade 1.33.1 -> 1.34.0
phoronix-test-suite: upgrade 9.0.1 -> 9.2.1
rabbitmq-c: upgrade 0.9.0 -> 0.10.0
cscope: upgrade 15.8b -> 15.9
msgpack-c: upgrade 3.1.1 -> 3.2.1
gnuplot: upgrade 5.2.2 -> 5.2.8
gphoto2: upgrade 2.5.14 -> 2.5.23
gtkwave: upgrade 3.3.102 -> 3.3.103
haveged: upgrade 1.9.6 -> 1.9.8
libgphoto2: upgrade 2.5.17 -> 2.5.23
libplist: upgrade 2.0.0 -> 2.1.0
ipmiutil: upgrade 3.0.5 -> 3.1.5
libburn: upgrade 1.5.0 -> 1.5.2
libdvdread: upgrade 6.0.1 -> 6.0.2
libsdl2-image: upgrade 2.0.3 -> 2.0.5
libsdl2-mixer: upgrade 2.0.2 -> 2.0.4
libsdl2-ttf: upgrade 2.0.14 -> 2.0.15
yad: upgrade 4.1 -> 5.0
python3-astor: 0.8 -> 0.8.1
python3-bandit: 1.5.1 -> 1.6.2
python-asn1crypto: 1.2.0 -> 1.3.0
python-bitarray: 1.2.0 -> 1.2.1
python-pyconnman: 0.1.0 -> 0.2.0
William A. Kennington III via Openembedded-devel (1):
stunnel: bump to version 5.56
Yi Zhao (4):
phpmyadmin: upgrade 4.9.1 -> 4.9.2
tk: upgrade 8.6.9 -> 8.6.10
ntp: restrict NTP mode 6 queries
samba: upgrade 4.10.10 -> 4.10.11
Yongxin Liu (1):
ndctl: Upgrade to v67
Zang Ruochen (17):
python-alembic: upgrade 1.3.1 -> 1.3.2
python-beautifulsoup4: upgrade 4.8.1 -> 4.8.2
python-bitarray: upgrade 1.1.0 -> 1.2.0
python-certifi: upgrade 2019.9.11 -> 2019.11.28
python-cmd2: upgrade 0.9.21 -> 0.9.22
python-engineio: upgrade 3.10.0 -> 3.11.1
python-parse: upgrade 1.12.1 -> 1.14.0
python-passlib: upgrade 1.7.1 -> 1.7.2
python-pexpect: upgrade 4.6.0 -> 4.7.0
python-psutil: upgrade 5.6.5 -> 5.6.7
python-py: upgrade 1.8.0 -> 1.8.1
python-pycryptodome: upgrade 3.9.3 -> 3.9.4
python-pymisp: upgrade 2.4.117.2 -> 2.4.119.1
python-pymongo: upgrade 3.9.0 -> 3.10.0
python-pyparsing: upgrade 2.4.5 -> 2.4.6
python-pyperf: upgrade 1.6.1 -> 1.7.0
python-backports-functools-lru-cache: Add python3 version
Zhixiong Chi (1):
dnsmasq: CVE-2019-14834
hmenn (1):
add sqlite-orm v1.5
madhavank27 (1):
Added bb file for libcamera integration
sangelovic (1):
sdbus-c++: Introduce recipes for sdbus-c++ library and its tools
Change-Id: I5e7559de35d61167e234161ffb768f6f95d30f41
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
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
new file mode 100644
index 0000000..f49ef2a
--- /dev/null
+++ b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl/0001-avoid-naming-local-function-as-one-of-printf-family.patch
@@ -0,0 +1,631 @@
+From e03b003610a176d608da9a02e433e7ded7e4b75f Mon Sep 17 00:00:00 2001
+From: Todd Cunningham <tcunningham07@gmail.com>
+Date: Wed, 11 Dec 2019 10:18:56 +1000
+Subject: [PATCH] avoid naming local function as one of printf family
+
+Fixes build issues with clang
+error: no member named '__builtin___snprintf_chk' in 'struct expr_ops'
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
+
+Signed-off-by: Yuan Chao <yuanc.fnst@cn.fujitsu.com>
+Signed-off-by: Todd Cunningham <tcunningham07@gmail.com>
+---
+ include/expr_ops.h | 2 +-
+ include/obj.h | 2 +-
+ src/expr.c | 4 ++--
+ src/expr/bitwise.c | 2 +-
+ src/expr/byteorder.c | 2 +-
+ src/expr/cmp.c | 2 +-
+ src/expr/connlimit.c | 2 +-
+ src/expr/counter.c | 2 +-
+ src/expr/ct.c | 2 +-
+ src/expr/dup.c | 2 +-
+ src/expr/dynset.c | 2 +-
+ src/expr/exthdr.c | 2 +-
+ src/expr/fib.c | 2 +-
+ src/expr/flow_offload.c | 2 +-
+ src/expr/fwd.c | 2 +-
+ src/expr/hash.c | 2 +-
+ src/expr/immediate.c | 2 +-
+ src/expr/limit.c | 2 +-
+ src/expr/log.c | 2 +-
+ src/expr/lookup.c | 2 +-
+ src/expr/masq.c | 2 +-
+ src/expr/match.c | 2 +-
+ src/expr/meta.c | 2 +-
+ src/expr/nat.c | 2 +-
+ src/expr/numgen.c | 2 +-
+ src/expr/objref.c | 2 +-
+ src/expr/osf.c | 2 +-
+ src/expr/payload.c | 2 +-
+ src/expr/queue.c | 2 +-
+ src/expr/quota.c | 2 +-
+ src/expr/range.c | 2 +-
+ src/expr/redir.c | 2 +-
+ src/expr/reject.c | 2 +-
+ src/expr/rt.c | 2 +-
+ src/expr/socket.c | 2 +-
+ src/expr/synproxy.c | 2 +-
+ src/expr/target.c | 2 +-
+ src/expr/tproxy.c | 2 +-
+ src/expr/tunnel.c | 2 +-
+ src/expr/xfrm.c | 2 +-
+ src/obj/counter.c | 2 +-
+ src/obj/ct_expect.c | 2 +-
+ src/obj/ct_helper.c | 2 +-
+ src/obj/ct_timeout.c | 2 +-
+ src/obj/limit.c | 2 +-
+ src/obj/quota.c | 2 +-
+ src/obj/secmark.c | 2 +-
+ src/obj/synproxy.c | 2 +-
+ src/obj/tunnel.c | 2 +-
+ src/object.c | 2 +-
+ 49 files changed, 50 insertions(+), 50 deletions(-)
+
+diff --git a/include/expr_ops.h b/include/expr_ops.h
+index a7f1b9a..d2946de 100644
+--- a/include/expr_ops.h
++++ b/include/expr_ops.h
+@@ -17,7 +17,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);
+ };
+
+ struct expr_ops *nftnl_expr_ops_lookup(const char *name);
+diff --git a/include/obj.h b/include/obj.h
+index 9394d79..08610d7 100644
+--- a/include/obj.h
++++ b/include/obj.h
+@@ -99,7 +99,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);
+ };
+
+ extern struct obj_ops obj_ops_counter;
+diff --git a/src/expr.c b/src/expr.c
+index 80c4c36..b698a60 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)
+ buf[0] = '\0';
+
+- if (!expr->ops->snprintf)
++ if (!expr->ops->snprintf_)
+ return 0;
+
+- ret = expr->ops->snprintf(buf + offset, remain, type, flags, expr);
++ ret = expr->ops->snprintf_(buf + offset, remain, type, 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
+--- a/src/expr/bitwise.c
++++ b/src/expr/bitwise.c
+@@ -219,5 +219,5 @@ struct expr_ops expr_ops_bitwise = {
+ .get = nftnl_expr_bitwise_get,
+ .parse = nftnl_expr_bitwise_parse,
+ .build = nftnl_expr_bitwise_build,
+- .snprintf = nftnl_expr_bitwise_snprintf,
++ .snprintf_ = nftnl_expr_bitwise_snprintf,
+ };
+diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c
+index efdfa2b..7ae9dfb 100644
+--- a/src/expr/byteorder.c
++++ b/src/expr/byteorder.c
+@@ -234,5 +234,5 @@ struct expr_ops expr_ops_byteorder = {
+ .get = nftnl_expr_byteorder_get,
+ .parse = nftnl_expr_byteorder_parse,
+ .build = nftnl_expr_byteorder_build,
+- .snprintf = nftnl_expr_byteorder_snprintf,
++ .snprintf_ = nftnl_expr_byteorder_snprintf,
+ };
+diff --git a/src/expr/cmp.c b/src/expr/cmp.c
+index 86d7842..e3be442 100644
+--- a/src/expr/cmp.c
++++ b/src/expr/cmp.c
+@@ -216,5 +216,5 @@ struct expr_ops expr_ops_cmp = {
+ .get = nftnl_expr_cmp_get,
+ .parse = nftnl_expr_cmp_parse,
+ .build = nftnl_expr_cmp_build,
+- .snprintf = nftnl_expr_cmp_snprintf,
++ .snprintf_ = nftnl_expr_cmp_snprintf,
+ };
+diff --git a/src/expr/connlimit.c b/src/expr/connlimit.c
+index 53af93b..6c8bc40 100644
+--- a/src/expr/connlimit.c
++++ b/src/expr/connlimit.c
+@@ -149,5 +149,5 @@ struct expr_ops expr_ops_connlimit = {
+ .get = nftnl_expr_connlimit_get,
+ .parse = nftnl_expr_connlimit_parse,
+ .build = nftnl_expr_connlimit_build,
+- .snprintf = nftnl_expr_connlimit_snprintf,
++ .snprintf_ = nftnl_expr_connlimit_snprintf,
+ };
+diff --git a/src/expr/counter.c b/src/expr/counter.c
+index 89a602e..a32a69e 100644
+--- a/src/expr/counter.c
++++ b/src/expr/counter.c
+@@ -147,5 +147,5 @@ struct expr_ops expr_ops_counter = {
+ .get = nftnl_expr_counter_get,
+ .parse = nftnl_expr_counter_parse,
+ .build = nftnl_expr_counter_build,
+- .snprintf = nftnl_expr_counter_snprintf,
++ .snprintf_ = nftnl_expr_counter_snprintf,
+ };
+diff --git a/src/expr/ct.c b/src/expr/ct.c
+index 124de9d..7bde179 100644
+--- a/src/expr/ct.c
++++ b/src/expr/ct.c
+@@ -273,5 +273,5 @@ struct expr_ops expr_ops_ct = {
+ .get = nftnl_expr_ct_get,
+ .parse = nftnl_expr_ct_parse,
+ .build = nftnl_expr_ct_build,
+- .snprintf = nftnl_expr_ct_snprintf,
++ .snprintf_ = nftnl_expr_ct_snprintf,
+ };
+diff --git a/src/expr/dup.c b/src/expr/dup.c
+index 2bb35e5..d9bd4b1 100644
+--- a/src/expr/dup.c
++++ b/src/expr/dup.c
+@@ -154,5 +154,5 @@ struct expr_ops expr_ops_dup = {
+ .get = nftnl_expr_dup_get,
+ .parse = nftnl_expr_dup_parse,
+ .build = nftnl_expr_dup_build,
+- .snprintf = nftnl_expr_dup_snprintf,
++ .snprintf_ = nftnl_expr_dup_snprintf,
+ };
+diff --git a/src/expr/dynset.c b/src/expr/dynset.c
+index 68115ba..6e43bb4 100644
+--- a/src/expr/dynset.c
++++ b/src/expr/dynset.c
+@@ -288,5 +288,5 @@ struct expr_ops expr_ops_dynset = {
+ .get = nftnl_expr_dynset_get,
+ .parse = nftnl_expr_dynset_parse,
+ .build = nftnl_expr_dynset_build,
+- .snprintf = nftnl_expr_dynset_snprintf,
++ .snprintf_ = nftnl_expr_dynset_snprintf,
+ };
+diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c
+index e5f714b..e68792b 100644
+--- a/src/expr/exthdr.c
++++ b/src/expr/exthdr.c
+@@ -276,5 +276,5 @@ struct expr_ops expr_ops_exthdr = {
+ .get = nftnl_expr_exthdr_get,
+ .parse = nftnl_expr_exthdr_parse,
+ .build = nftnl_expr_exthdr_build,
+- .snprintf = nftnl_expr_exthdr_snprintf,
++ .snprintf_ = nftnl_expr_exthdr_snprintf,
+ };
+diff --git a/src/expr/fib.c b/src/expr/fib.c
+index 9475af4..8e7090d 100644
+--- a/src/expr/fib.c
++++ b/src/expr/fib.c
+@@ -213,5 +213,5 @@ struct expr_ops expr_ops_fib = {
+ .get = nftnl_expr_fib_get,
+ .parse = nftnl_expr_fib_parse,
+ .build = nftnl_expr_fib_build,
+- .snprintf = nftnl_expr_fib_snprintf,
++ .snprintf_ = nftnl_expr_fib_snprintf,
+ };
+diff --git a/src/expr/flow_offload.c b/src/expr/flow_offload.c
+index 6ccec9a..c2f2478 100644
+--- a/src/expr/flow_offload.c
++++ b/src/expr/flow_offload.c
+@@ -134,5 +134,5 @@ struct expr_ops expr_ops_flow = {
+ .get = nftnl_expr_flow_get,
+ .parse = nftnl_expr_flow_parse,
+ .build = nftnl_expr_flow_build,
+- .snprintf = nftnl_expr_flow_snprintf,
++ .snprintf_ = nftnl_expr_flow_snprintf,
+ };
+diff --git a/src/expr/fwd.c b/src/expr/fwd.c
+index cff8235..bcd7d3f 100644
+--- a/src/expr/fwd.c
++++ b/src/expr/fwd.c
+@@ -174,5 +174,5 @@ struct expr_ops expr_ops_fwd = {
+ .get = nftnl_expr_fwd_get,
+ .parse = nftnl_expr_fwd_parse,
+ .build = nftnl_expr_fwd_build,
+- .snprintf = nftnl_expr_fwd_snprintf,
++ .snprintf_ = nftnl_expr_fwd_snprintf,
+ };
+diff --git a/src/expr/hash.c b/src/expr/hash.c
+index 2c801d2..a9f6e7e 100644
+--- a/src/expr/hash.c
++++ b/src/expr/hash.c
+@@ -241,5 +241,5 @@ struct expr_ops expr_ops_hash = {
+ .get = nftnl_expr_hash_get,
+ .parse = nftnl_expr_hash_parse,
+ .build = nftnl_expr_hash_build,
+- .snprintf = nftnl_expr_hash_snprintf,
++ .snprintf_ = nftnl_expr_hash_snprintf,
+ };
+diff --git a/src/expr/immediate.c b/src/expr/immediate.c
+index 47106ae..ea86c88 100644
+--- a/src/expr/immediate.c
++++ b/src/expr/immediate.c
+@@ -235,5 +235,5 @@ struct expr_ops expr_ops_immediate = {
+ .get = nftnl_expr_immediate_get,
+ .parse = nftnl_expr_immediate_parse,
+ .build = nftnl_expr_immediate_build,
+- .snprintf = nftnl_expr_immediate_snprintf,
++ .snprintf_ = nftnl_expr_immediate_snprintf,
+ };
+diff --git a/src/expr/limit.c b/src/expr/limit.c
+index 5872e27..0ce482f 100644
+--- a/src/expr/limit.c
++++ b/src/expr/limit.c
+@@ -216,5 +216,5 @@ struct expr_ops expr_ops_limit = {
+ .get = nftnl_expr_limit_get,
+ .parse = nftnl_expr_limit_parse,
+ .build = nftnl_expr_limit_build,
+- .snprintf = nftnl_expr_limit_snprintf,
++ .snprintf_ = nftnl_expr_limit_snprintf,
+ };
+diff --git a/src/expr/log.c b/src/expr/log.c
+index bbe43d2..5506bc2 100644
+--- a/src/expr/log.c
++++ b/src/expr/log.c
+@@ -267,5 +267,5 @@ struct expr_ops expr_ops_log = {
+ .get = nftnl_expr_log_get,
+ .parse = nftnl_expr_log_parse,
+ .build = nftnl_expr_log_build,
+- .snprintf = nftnl_expr_log_snprintf,
++ .snprintf_ = nftnl_expr_log_snprintf,
+ };
+diff --git a/src/expr/lookup.c b/src/expr/lookup.c
+index a495ac0..678868c 100644
+--- a/src/expr/lookup.c
++++ b/src/expr/lookup.c
+@@ -221,5 +221,5 @@ struct expr_ops expr_ops_lookup = {
+ .get = nftnl_expr_lookup_get,
+ .parse = nftnl_expr_lookup_parse,
+ .build = nftnl_expr_lookup_build,
+- .snprintf = nftnl_expr_lookup_snprintf,
++ .snprintf_ = nftnl_expr_lookup_snprintf,
+ };
+diff --git a/src/expr/masq.c b/src/expr/masq.c
+index f6f3ceb..88292a6 100644
+--- a/src/expr/masq.c
++++ b/src/expr/masq.c
+@@ -169,5 +169,5 @@ struct expr_ops expr_ops_masq = {
+ .get = nftnl_expr_masq_get,
+ .parse = nftnl_expr_masq_parse,
+ .build = nftnl_expr_masq_build,
+- .snprintf = nftnl_expr_masq_snprintf,
++ .snprintf_ = nftnl_expr_masq_snprintf,
+ };
+diff --git a/src/expr/match.c b/src/expr/match.c
+index 4fa74b2..249c6b5 100644
+--- a/src/expr/match.c
++++ b/src/expr/match.c
+@@ -198,5 +198,5 @@ struct expr_ops expr_ops_match = {
+ .get = nftnl_expr_match_get,
+ .parse = nftnl_expr_match_parse,
+ .build = nftnl_expr_match_build,
+- .snprintf = nftnl_expr_match_snprintf,
++ .snprintf_ = nftnl_expr_match_snprintf,
+ };
+diff --git a/src/expr/meta.c b/src/expr/meta.c
+index 73f6efa..35d5ec5 100644
+--- a/src/expr/meta.c
++++ b/src/expr/meta.c
+@@ -226,5 +226,5 @@ struct expr_ops expr_ops_meta = {
+ .get = nftnl_expr_meta_get,
+ .parse = nftnl_expr_meta_parse,
+ .build = nftnl_expr_meta_build,
+- .snprintf = nftnl_expr_meta_snprintf,
++ .snprintf_ = nftnl_expr_meta_snprintf,
+ };
+diff --git a/src/expr/nat.c b/src/expr/nat.c
+index 6b7d50e..be4a579 100644
+--- a/src/expr/nat.c
++++ b/src/expr/nat.c
+@@ -279,5 +279,5 @@ struct expr_ops expr_ops_nat = {
+ .get = nftnl_expr_nat_get,
+ .parse = nftnl_expr_nat_parse,
+ .build = nftnl_expr_nat_build,
+- .snprintf = nftnl_expr_nat_snprintf,
++ .snprintf_ = nftnl_expr_nat_snprintf,
+ };
+diff --git a/src/expr/numgen.c b/src/expr/numgen.c
+index 4e0d541..5995ee3 100644
+--- a/src/expr/numgen.c
++++ b/src/expr/numgen.c
+@@ -195,5 +195,5 @@ struct expr_ops expr_ops_ng = {
+ .get = nftnl_expr_ng_get,
+ .parse = nftnl_expr_ng_parse,
+ .build = nftnl_expr_ng_build,
+- .snprintf = nftnl_expr_ng_snprintf,
++ .snprintf_ = nftnl_expr_ng_snprintf,
+ };
+diff --git a/src/expr/objref.c b/src/expr/objref.c
+index 7388b18..e673ffd 100644
+--- a/src/expr/objref.c
++++ b/src/expr/objref.c
+@@ -210,5 +210,5 @@ struct expr_ops expr_ops_objref = {
+ .get = nftnl_expr_objref_get,
+ .parse = nftnl_expr_objref_parse,
+ .build = nftnl_expr_objref_build,
+- .snprintf = nftnl_expr_objref_snprintf,
++ .snprintf_ = nftnl_expr_objref_snprintf,
+ };
+diff --git a/src/expr/osf.c b/src/expr/osf.c
+index 98d0df9..618b46e 100644
+--- a/src/expr/osf.c
++++ b/src/expr/osf.c
+@@ -161,5 +161,5 @@ struct expr_ops expr_ops_osf = {
+ .get = nftnl_expr_osf_get,
+ .parse = nftnl_expr_osf_parse,
+ .build = nftnl_expr_osf_build,
+- .snprintf = nftnl_expr_osf_snprintf,
++ .snprintf_ = nftnl_expr_osf_snprintf,
+ };
+diff --git a/src/expr/payload.c b/src/expr/payload.c
+index 2192dad..37aacc4 100644
+--- a/src/expr/payload.c
++++ b/src/expr/payload.c
+@@ -266,5 +266,5 @@ struct expr_ops expr_ops_payload = {
+ .get = nftnl_expr_payload_get,
+ .parse = nftnl_expr_payload_parse,
+ .build = nftnl_expr_payload_build,
+- .snprintf = nftnl_expr_payload_snprintf,
++ .snprintf_ = nftnl_expr_payload_snprintf,
+ };
+diff --git a/src/expr/queue.c b/src/expr/queue.c
+index 051ef71..b06feff 100644
+--- a/src/expr/queue.c
++++ b/src/expr/queue.c
+@@ -207,5 +207,5 @@ struct expr_ops expr_ops_queue = {
+ .get = nftnl_expr_queue_get,
+ .parse = nftnl_expr_queue_parse,
+ .build = nftnl_expr_queue_build,
+- .snprintf = nftnl_expr_queue_snprintf,
++ .snprintf_ = nftnl_expr_queue_snprintf,
+ };
+diff --git a/src/expr/quota.c b/src/expr/quota.c
+index 39a92e6..41797be 100644
+--- a/src/expr/quota.c
++++ b/src/expr/quota.c
+@@ -161,5 +161,5 @@ struct expr_ops expr_ops_quota = {
+ .get = nftnl_expr_quota_get,
+ .parse = nftnl_expr_quota_parse,
+ .build = nftnl_expr_quota_build,
+- .snprintf = nftnl_expr_quota_snprintf,
++ .snprintf_ = nftnl_expr_quota_snprintf,
+ };
+diff --git a/src/expr/range.c b/src/expr/range.c
+index d1d5083..b619cdf 100644
+--- a/src/expr/range.c
++++ b/src/expr/range.c
+@@ -227,5 +227,5 @@ struct expr_ops expr_ops_range = {
+ .get = nftnl_expr_range_get,
+ .parse = nftnl_expr_range_parse,
+ .build = nftnl_expr_range_build,
+- .snprintf = nftnl_expr_range_snprintf,
++ .snprintf_ = nftnl_expr_range_snprintf,
+ };
+diff --git a/src/expr/redir.c b/src/expr/redir.c
+index 477659a..5c4ebeb 100644
+--- a/src/expr/redir.c
++++ b/src/expr/redir.c
+@@ -181,5 +181,5 @@ struct expr_ops expr_ops_redir = {
+ .get = nftnl_expr_redir_get,
+ .parse = nftnl_expr_redir_parse,
+ .build = nftnl_expr_redir_build,
+- .snprintf = nftnl_expr_redir_snprintf,
++ .snprintf_ = nftnl_expr_redir_snprintf,
+ };
+diff --git a/src/expr/reject.c b/src/expr/reject.c
+index 141942e..a98990d 100644
+--- a/src/expr/reject.c
++++ b/src/expr/reject.c
+@@ -148,5 +148,5 @@ struct expr_ops expr_ops_reject = {
+ .get = nftnl_expr_reject_get,
+ .parse = nftnl_expr_reject_parse,
+ .build = nftnl_expr_reject_build,
+- .snprintf = nftnl_expr_reject_snprintf,
++ .snprintf_ = nftnl_expr_reject_snprintf,
+ };
+diff --git a/src/expr/rt.c b/src/expr/rt.c
+index 0fce72d..32ace19 100644
+--- a/src/expr/rt.c
++++ b/src/expr/rt.c
+@@ -177,5 +177,5 @@ struct expr_ops expr_ops_rt = {
+ .get = nftnl_expr_rt_get,
+ .parse = nftnl_expr_rt_parse,
+ .build = nftnl_expr_rt_build,
+- .snprintf = nftnl_expr_rt_snprintf,
++ .snprintf_ = nftnl_expr_rt_snprintf,
+ };
+diff --git a/src/expr/socket.c b/src/expr/socket.c
+index 96550d5..2394dbf 100644
+--- a/src/expr/socket.c
++++ b/src/expr/socket.c
+@@ -174,5 +174,5 @@ struct expr_ops expr_ops_socket = {
+ .get = nftnl_expr_socket_get,
+ .parse = nftnl_expr_socket_parse,
+ .build = nftnl_expr_socket_build,
+- .snprintf = nftnl_expr_socket_snprintf,
++ .snprintf_ = nftnl_expr_socket_snprintf,
+ };
+diff --git a/src/expr/synproxy.c b/src/expr/synproxy.c
+index 245f4fb..9721029 100644
+--- a/src/expr/synproxy.c
++++ b/src/expr/synproxy.c
+@@ -166,5 +166,5 @@ struct expr_ops expr_ops_synproxy = {
+ .get = nftnl_expr_synproxy_get,
+ .parse = nftnl_expr_synproxy_parse,
+ .build = nftnl_expr_synproxy_build,
+- .snprintf = nftnl_expr_synproxy_snprintf,
++ .snprintf_ = nftnl_expr_synproxy_snprintf,
+ };
+diff --git a/src/expr/target.c b/src/expr/target.c
+index 9100038..7180085 100644
+--- a/src/expr/target.c
++++ b/src/expr/target.c
+@@ -198,5 +198,5 @@ struct expr_ops expr_ops_target = {
+ .get = nftnl_expr_target_get,
+ .parse = nftnl_expr_target_parse,
+ .build = nftnl_expr_target_build,
+- .snprintf = nftnl_expr_target_snprintf,
++ .snprintf_ = nftnl_expr_target_snprintf,
+ };
+diff --git a/src/expr/tproxy.c b/src/expr/tproxy.c
+index 3827b75..feabbbe 100644
+--- a/src/expr/tproxy.c
++++ b/src/expr/tproxy.c
+@@ -183,5 +183,5 @@ struct expr_ops expr_ops_tproxy = {
+ .get = nftnl_expr_tproxy_get,
+ .parse = nftnl_expr_tproxy_parse,
+ .build = nftnl_expr_tproxy_build,
+- .snprintf = nftnl_expr_tproxy_snprintf,
++ .snprintf_ = nftnl_expr_tproxy_snprintf,
+ };
+diff --git a/src/expr/tunnel.c b/src/expr/tunnel.c
+index b2b8d72..1ed46d3 100644
+--- a/src/expr/tunnel.c
++++ b/src/expr/tunnel.c
+@@ -173,5 +173,5 @@ struct expr_ops expr_ops_tunnel = {
+ .get = nftnl_expr_tunnel_get,
+ .parse = nftnl_expr_tunnel_parse,
+ .build = nftnl_expr_tunnel_build,
+- .snprintf = nftnl_expr_tunnel_snprintf,
++ .snprintf_ = nftnl_expr_tunnel_snprintf,
+ };
+diff --git a/src/expr/xfrm.c b/src/expr/xfrm.c
+index 8fe5438..b6b2772 100644
+--- a/src/expr/xfrm.c
++++ b/src/expr/xfrm.c
+@@ -239,5 +239,5 @@ struct expr_ops expr_ops_xfrm = {
+ .get = nftnl_expr_xfrm_get,
+ .parse = nftnl_expr_xfrm_parse,
+ .build = nftnl_expr_xfrm_build,
+- .snprintf = nftnl_expr_xfrm_snprintf,
++ .snprintf_ = nftnl_expr_xfrm_snprintf,
+ };
+diff --git a/src/obj/counter.c b/src/obj/counter.c
+index 1baba4e..3710bce 100644
+--- a/src/obj/counter.c
++++ b/src/obj/counter.c
+@@ -145,5 +145,5 @@ struct obj_ops obj_ops_counter = {
+ .get = nftnl_obj_counter_get,
+ .parse = nftnl_obj_counter_parse,
+ .build = nftnl_obj_counter_build,
+- .snprintf = nftnl_obj_counter_snprintf,
++ .snprintf_ = nftnl_obj_counter_snprintf,
+ };
+diff --git a/src/obj/ct_expect.c b/src/obj/ct_expect.c
+index c0bb5ba..953c08c 100644
+--- a/src/obj/ct_expect.c
++++ b/src/obj/ct_expect.c
+@@ -209,5 +209,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,
+- .snprintf = nftnl_obj_ct_expect_snprintf,
++ .snprintf_ = nftnl_obj_ct_expect_snprintf,
+ };
+diff --git a/src/obj/ct_helper.c b/src/obj/ct_helper.c
+index d91f636..2037461 100644
+--- a/src/obj/ct_helper.c
++++ b/src/obj/ct_helper.c
+@@ -166,5 +166,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,
+- .snprintf = nftnl_obj_ct_helper_snprintf,
++ .snprintf_ = nftnl_obj_ct_helper_snprintf,
+ };
+diff --git a/src/obj/ct_timeout.c b/src/obj/ct_timeout.c
+index e2e9991..a4f2dd2 100644
+--- a/src/obj/ct_timeout.c
++++ b/src/obj/ct_timeout.c
+@@ -330,5 +330,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,
+- .snprintf = nftnl_obj_ct_timeout_snprintf,
++ .snprintf_ = nftnl_obj_ct_timeout_snprintf,
+ };
+diff --git a/src/obj/limit.c b/src/obj/limit.c
+index 60b0159..538f37a 100644
+--- a/src/obj/limit.c
++++ b/src/obj/limit.c
+@@ -185,5 +185,5 @@ struct obj_ops obj_ops_limit = {
+ .get = nftnl_obj_limit_get,
+ .parse = nftnl_obj_limit_parse,
+ .build = nftnl_obj_limit_build,
+- .snprintf = nftnl_obj_limit_snprintf,
++ .snprintf_ = nftnl_obj_limit_snprintf,
+ };
+diff --git a/src/obj/quota.c b/src/obj/quota.c
+index 1914037..585a088 100644
+--- a/src/obj/quota.c
++++ b/src/obj/quota.c
+@@ -161,5 +161,5 @@ struct obj_ops obj_ops_quota = {
+ .get = nftnl_obj_quota_get,
+ .parse = nftnl_obj_quota_parse,
+ .build = nftnl_obj_quota_build,
+- .snprintf = nftnl_obj_quota_snprintf,
++ .snprintf_ = nftnl_obj_quota_snprintf,
+ };
+diff --git a/src/obj/secmark.c b/src/obj/secmark.c
+index e27b5fa..6241bee 100644
+--- a/src/obj/secmark.c
++++ b/src/obj/secmark.c
+@@ -133,5 +133,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/tunnel.c b/src/obj/tunnel.c
+index 7ffade8..800eb3e 100644
+--- a/src/obj/tunnel.c
++++ b/src/obj/tunnel.c
+@@ -564,5 +564,5 @@ struct obj_ops obj_ops_tunnel = {
+ .get = nftnl_obj_tunnel_get,
+ .parse = nftnl_obj_tunnel_parse,
+ .build = nftnl_obj_tunnel_build,
+- .snprintf = nftnl_obj_tunnel_snprintf,
++ .snprintf_ = nftnl_obj_tunnel_snprintf,
+ };
+diff --git a/src/object.c b/src/object.c
+index d8c87ee..5307d7e 100644
+--- a/src/object.c
++++ b/src/object.c
+@@ -370,7 +370,7 @@ static int nftnl_obj_snprintf_dflt(char *buf, size_t size,
+ 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);
+ 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,
+ };
+--
+2.17.1
+