expr/data_reg: Drop output_format parameter

The function nftnl_data_reg_snprintf is exclusively called with
NFTNL_OUTPUT_DEFAULT as parameter, others are not supported - just drop
it.

Signed-off-by: Phil Sutter <phil@nwl.cc>

diff --git a/include/data_reg.h b/include/data_reg.h
index 0d6b77829cf89b668c6062d5646b69faa9f0d00e..6d2dc66858bf8198392261086757028159d2f129 100644 (file)
--- a/include/data_reg.h
+++ b/include/data_reg.h
@@ -31,8 +31,7 @@ union nftnl_data_reg {
 
 int nftnl_data_reg_snprintf(char *buf, size_t size,
                            const union nftnl_data_reg *reg,
-                           uint32_t output_format, uint32_t flags,
-                           int reg_type);
+                           uint32_t flags, int reg_type);
 struct nlattr;
 
 int nftnl_parse_data(union nftnl_data_reg *data, struct nlattr *attr, int *type);

diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c
index 139f25f86b80245ea9f1a7607038f678333cdb1a..1d46a97757dfdfe8a6db5678978b8e02605c8b8e 100644 (file)
--- a/src/expr/bitwise.c
+++ b/src/expr/bitwise.c
@@ -220,14 +220,14 @@ nftnl_expr_bitwise_snprintf_bool(char *buf, size_t size,
        SNPRINTF_BUFFER_SIZE(ret, remain, offset);
 
        ret = nftnl_data_reg_snprintf(buf + offset, remain, &bitwise->mask,
-                                     NFTNL_OUTPUT_DEFAULT, 0, DATA_VALUE);
+                                     0, DATA_VALUE);
        SNPRINTF_BUFFER_SIZE(ret, remain, offset);
 
        ret = snprintf(buf + offset, remain, ") ^ ");
        SNPRINTF_BUFFER_SIZE(ret, remain, offset);
 
        ret = nftnl_data_reg_snprintf(buf + offset, remain, &bitwise->xor,
-                                     NFTNL_OUTPUT_DEFAULT, 0, DATA_VALUE);
+                                     0, DATA_VALUE);
        SNPRINTF_BUFFER_SIZE(ret, remain, offset);
 
        return offset;
@@ -243,7 +243,7 @@ nftnl_expr_bitwise_snprintf_shift(char *buf, size_t size, const char *op,
        SNPRINTF_BUFFER_SIZE(ret, remain, offset);
 
        ret = nftnl_data_reg_snprintf(buf + offset, remain, &bitwise->data,
-                                     NFTNL_OUTPUT_DEFAULT, 0, DATA_VALUE);
+                                     0, DATA_VALUE);
        SNPRINTF_BUFFER_SIZE(ret, remain, offset);
 
        ret = snprintf(buf + offset, remain, ") ");

diff --git a/src/expr/cmp.c b/src/expr/cmp.c
index 6b1c0fa3ac97fef7423e637cfda8dd009a7aecd1..04b9f25806725268d90d7f757f8283acf3b5c0c3 100644 (file)
--- a/src/expr/cmp.c
+++ b/src/expr/cmp.c
@@ -188,7 +188,7 @@ nftnl_expr_cmp_snprintf(char *buf, size_t size,
        SNPRINTF_BUFFER_SIZE(ret, remain, offset);
 
        ret = nftnl_data_reg_snprintf(buf + offset, remain, &cmp->data,
-                                   NFTNL_OUTPUT_DEFAULT, 0, DATA_VALUE);
+                                     0, DATA_VALUE);
        SNPRINTF_BUFFER_SIZE(ret, remain, offset);
 
        return offset;

diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c
index d3ccc612ce8124adcbc176b48c492f677afafa00..bafdc6f3dadd36d87f46e8ddfcddeed4d6fbfd74 100644 (file)
--- a/src/expr/data_reg.c
+++ b/src/expr/data_reg.c
@@ -63,38 +63,19 @@ nftnl_data_reg_verdict_snprintf_def(char *buf, size_t size,
 
 int nftnl_data_reg_snprintf(char *buf, size_t size,
                            const union nftnl_data_reg *reg,
-                           uint32_t output_format, uint32_t flags,
-                           int reg_type)
+                           uint32_t flags, int reg_type)
 {
        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)

diff --git a/src/expr/immediate.c b/src/expr/immediate.c
index 08ddd22a54c5f03057d0cc506ab0de3be4238399..241aad3b5507c299da89eb93a15cea48a1f8d4d6 100644 (file)
--- a/src/expr/immediate.c
+++ b/src/expr/immediate.c
@@ -195,17 +195,17 @@ nftnl_expr_immediate_snprintf(char *buf, size_t len,
 
        if (e->flags & (1 << NFTNL_EXPR_IMM_DATA)) {
                ret = nftnl_data_reg_snprintf(buf + offset, remain, &imm->data,
-                                       NFTNL_OUTPUT_DEFAULT, flags, DATA_VALUE);
+                                             flags, DATA_VALUE);
                SNPRINTF_BUFFER_SIZE(ret, remain, offset);
 
        } else if (e->flags & (1 << NFTNL_EXPR_IMM_VERDICT)) {
                ret = nftnl_data_reg_snprintf(buf + offset, remain, &imm->data,
-                               NFTNL_OUTPUT_DEFAULT, flags, DATA_VERDICT);
+                                             flags, DATA_VERDICT);
                SNPRINTF_BUFFER_SIZE(ret, remain, offset);
 
        } else if (e->flags & (1 << NFTNL_EXPR_IMM_CHAIN)) {
                ret = nftnl_data_reg_snprintf(buf + offset, remain, &imm->data,
-                                       NFTNL_OUTPUT_DEFAULT, flags, DATA_CHAIN);
+                                             flags, DATA_CHAIN);
                SNPRINTF_BUFFER_SIZE(ret, remain, offset);
        }
 

diff --git a/src/expr/range.c b/src/expr/range.c
index a93b2ea74d6d4eb6e875246a46bfcb125fe04e8f..eed48829a246d006a0481637e5e8b78074a3237d 100644 (file)
--- a/src/expr/range.c
+++ b/src/expr/range.c
@@ -195,11 +195,11 @@ static int nftnl_expr_range_snprintf(char *buf, size_t size,
        SNPRINTF_BUFFER_SIZE(ret, remain, offset);
 
        ret = nftnl_data_reg_snprintf(buf + offset, remain, &range->data_from,
-                                     NFTNL_OUTPUT_DEFAULT, 0, DATA_VALUE);
+                                     0, DATA_VALUE);
        SNPRINTF_BUFFER_SIZE(ret, remain, offset);
 
        ret = nftnl_data_reg_snprintf(buf + offset, remain, &range->data_to,
-                                     NFTNL_OUTPUT_DEFAULT, 0, DATA_VALUE);
+                                     0, DATA_VALUE);
        SNPRINTF_BUFFER_SIZE(ret, remain, offset);
 
        return offset;

diff --git a/src/set_elem.c b/src/set_elem.c
index ad528e28475a783982af924798f1f4fdde0c91aa..061469a74789c22b7b93c19246f9626475c13efe 100644 (file)
--- a/src/set_elem.c
+++ b/src/set_elem.c
@@ -710,7 +710,6 @@ int nftnl_set_elem_snprintf_default(char *buf, size_t size,
        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);
 
@@ -719,7 +718,6 @@ int nftnl_set_elem_snprintf_default(char *buf, size_t size,
                SNPRINTF_BUFFER_SIZE(ret, remain, offset);
 
                ret = nftnl_data_reg_snprintf(buf + offset, remain, &e->key_end,
-                                             NFTNL_OUTPUT_DEFAULT,
                                              DATA_F_NOPFX, DATA_VALUE);
                SNPRINTF_BUFFER_SIZE(ret, remain, offset);
        }
@@ -728,7 +726,6 @@ int nftnl_set_elem_snprintf_default(char *buf, size_t size,
        SNPRINTF_BUFFER_SIZE(ret, remain, offset);
 
        ret = nftnl_data_reg_snprintf(buf + offset, remain, &e->data,
-                                     NFTNL_OUTPUT_DEFAULT,
                                      DATA_F_NOPFX, dregtype);
        SNPRINTF_BUFFER_SIZE(ret, remain, offset);