Given there's only a single valid output_format left, catch other values
early to help a bit with those calls to overlong function names.
Signed-off-by: Phil Sutter <phil@xxxxxx>
---
src/expr/data_reg.c | 31 ++++++++-----------------------
1 file changed, 8 insertions(+), 23 deletions(-)
diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c
index d3ccc612ce812..60dc9b81cb4d3 100644
--- a/src/expr/data_reg.c
+++ b/src/expr/data_reg.c
@@ -66,35 +66,20 @@ int nftnl_data_reg_snprintf(char *buf, size_t size,
uint32_t output_format, uint32_t flags,
int reg_type)
{
+ if (output_format != NFTNL_OUTPUT_DEFAULT)
+ return -1;
+
switch(reg_type) {
case DATA_VALUE:
- switch(output_format) {
- case NFTNL_OUTPUT_DEFAULT:
- return nftnl_data_reg_value_snprintf_default(buf, size,
- reg, flags);
- case NFTNL_OUTPUT_JSON:
- case NFTNL_OUTPUT_XML:
- default:
- break;
- }
- break;
+ return nftnl_data_reg_value_snprintf_default(buf, size, reg,
+ flags);
case DATA_VERDICT:
case DATA_CHAIN:
- switch(output_format) {
- case NFTNL_OUTPUT_DEFAULT:
- return nftnl_data_reg_verdict_snprintf_def(buf, size,
- reg, flags);
- case NFTNL_OUTPUT_JSON:
- case NFTNL_OUTPUT_XML:
- default:
- break;
- }
- break;
+ return nftnl_data_reg_verdict_snprintf_def(buf, size, reg,
+ flags);
default:
- break;
+ return -1;
}
-
- return -1;
}
static int nftnl_data_parse_cb(const struct nlattr *attr, void *data)
--
2.30.1
