From e53b6fdacea2c4b68c0932804546cf10babfb43e Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Mon, 14 Dec 2020 17:53:47 +0100 Subject: set_elem: Use nftnl_data_reg_snprintf() Introduce a flag to allow toggling the '0x' prefix when printing data values, then use the existing routines to print data registers from set_elem code. Signed-off-by: Phil Sutter --- src/set_elem.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/set_elem.c') diff --git a/src/set_elem.c b/src/set_elem.c index e82684b..51bf2c7 100644 --- a/src/set_elem.c +++ b/src/set_elem.c @@ -629,18 +629,18 @@ static int nftnl_set_elem_snprintf_default(char *buf, size_t size, ret = snprintf(buf, remain, "element "); SNPRINTF_BUFFER_SIZE(ret, remain, offset); - for (i = 0; i < div_round_up(e->key.len, sizeof(uint32_t)); i++) { - ret = snprintf(buf + offset, remain, "%.8x ", e->key.val[i]); - SNPRINTF_BUFFER_SIZE(ret, remain, offset); - } + ret = nftnl_data_reg_snprintf(buf + offset, remain, &e->key, + NFTNL_OUTPUT_DEFAULT, + DATA_F_NOPFX, DATA_VALUE); + SNPRINTF_BUFFER_SIZE(ret, remain, offset); ret = snprintf(buf + offset, remain, " : "); SNPRINTF_BUFFER_SIZE(ret, remain, offset); - for (i = 0; i < div_round_up(e->data.len, sizeof(uint32_t)); i++) { - ret = snprintf(buf + offset, remain, "%.8x ", e->data.val[i]); - SNPRINTF_BUFFER_SIZE(ret, remain, offset); - } + ret = nftnl_data_reg_snprintf(buf + offset, remain, &e->data, + NFTNL_OUTPUT_DEFAULT, + DATA_F_NOPFX, DATA_VALUE); + SNPRINTF_BUFFER_SIZE(ret, remain, offset); ret = snprintf(buf + offset, remain, "%u [end]", e->set_elem_flags); SNPRINTF_BUFFER_SIZE(ret, remain, offset); -- cgit v1.2.3