expr: no need to nul-terminate buffer from expression ->snprintf indirection

->snprintf() is always called via nftnl_expr_snprintf() wrapper, which
is already dealing with this corner case for us.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c
index ff9ade4d86d001d205eeefa32a056aa7ef161922..a89734b5f2d4e9f3eeef5a8b0c420a1fa06cfd2b 100644 (file)
--- a/src/expr/bitwise.c
+++ b/src/expr/bitwise.c
@@ -257,9 +257,6 @@ static int
 nftnl_expr_bitwise_snprintf(char *buf, size_t size, uint32_t type,
                            uint32_t flags, const struct nftnl_expr *e)
 {
-       if (size)
-               buf[0] = '\0';
-
        switch (type) {
        case NFTNL_OUTPUT_DEFAULT:
                return nftnl_expr_bitwise_snprintf_default(buf, size, e);

diff --git a/src/expr/byteorder.c b/src/expr/byteorder.c
index 4bb95b497701ead4c424478aff0e2686db78d468..47c04cfea69fb9341631c5cd2deb36155ad54ed1 100644 (file)
--- a/src/expr/byteorder.c
+++ b/src/expr/byteorder.c
@@ -272,9 +272,6 @@ static int
 nftnl_expr_byteorder_snprintf(char *buf, size_t size, uint32_t type,
                              uint32_t flags, const struct nftnl_expr *e)
 {
-       if (size)
-               buf[0] = '\0';
-
        switch (type) {
        case NFTNL_OUTPUT_DEFAULT:
                return nftnl_expr_byteorder_snprintf_default(buf, size, e);

diff --git a/src/expr/cmp.c b/src/expr/cmp.c
index 7bafaec573e771585893fc7e590e72a9c2274351..b26d0eb08bb20f6274c0b7da9e31a8057da70522 100644 (file)
--- a/src/expr/cmp.c
+++ b/src/expr/cmp.c
@@ -246,9 +246,6 @@ static int
 nftnl_expr_cmp_snprintf(char *buf, size_t size, uint32_t type,
                        uint32_t flags, const struct nftnl_expr *e)
 {
-       if (size)
-               buf[0] = '\0';
-
        switch (type) {
        case NFTNL_OUTPUT_DEFAULT:
                return nftnl_expr_cmp_snprintf_default(buf, size, e);

diff --git a/src/expr/counter.c b/src/expr/counter.c
index 5c196d451843195230297a41f537ea35e15b9a57..21901e892471ee808e15a2a82f38334666d06c42 100644 (file)
--- a/src/expr/counter.c
+++ b/src/expr/counter.c
@@ -164,9 +164,6 @@ static int nftnl_expr_counter_snprintf(char *buf, size_t len, uint32_t type,
                                       uint32_t flags,
                                       const struct nftnl_expr *e)
 {
-       if (len)
-               buf[0] = '\0';
-
        switch (type) {
        case NFTNL_OUTPUT_DEFAULT:
                return nftnl_expr_counter_snprintf_default(buf, len, e);

diff --git a/src/expr/ct.c b/src/expr/ct.c
index 021a27795a690e39a03c58741f503f9283afbd99..6f87a72487ae742e30f5d6805958771ef2f9edcb 100644 (file)
--- a/src/expr/ct.c
+++ b/src/expr/ct.c
@@ -317,9 +317,6 @@ static int
 nftnl_expr_ct_snprintf(char *buf, size_t len, uint32_t type,
                       uint32_t flags, const struct nftnl_expr *e)
 {
-       if (len)
-               buf[0] = '\0';
-
        switch (type) {
        case NFTNL_OUTPUT_DEFAULT:
                return nftnl_expr_ct_snprintf_default(buf, len, e);

diff --git a/src/expr/dup.c b/src/expr/dup.c
index e2171f4ef1fb762e591b85eb97a62040dd22371e..ed8e6208cfabaf0b82ae4c401b415cf1fffe763c 100644 (file)
--- a/src/expr/dup.c
+++ b/src/expr/dup.c
@@ -170,9 +170,6 @@ static int nftnl_expr_dup_snprintf_default(char *buf, size_t len,
 static int nftnl_expr_dup_snprintf(char *buf, size_t len, uint32_t type,
                                   uint32_t flags, const struct nftnl_expr *e)
 {
-       if (len)
-               buf[0] = '\0';
-
        switch (type) {
        case NFTNL_OUTPUT_DEFAULT:
                return nftnl_expr_dup_snprintf_default(buf, len, e, flags);

diff --git a/src/expr/dynset.c b/src/expr/dynset.c
index 2755d492e085cb7c0cbcc1d38465e875a29298d4..160d0e15c1514b28d2ba2a1c1c9bdca89eb8fd0e 100644 (file)
--- a/src/expr/dynset.c
+++ b/src/expr/dynset.c
@@ -314,9 +314,6 @@ static int
 nftnl_expr_dynset_snprintf(char *buf, size_t size, uint32_t type,
                           uint32_t flags, const struct nftnl_expr *e)
 {
-       if (size)
-               buf[0] = '\0';
-
        switch (type) {
        case NFTNL_OUTPUT_DEFAULT:
                return nftnl_expr_dynset_snprintf_default(buf, size, e);

diff --git a/src/expr/exthdr.c b/src/expr/exthdr.c
index 11766fafc0278f1c0637c0c4ac2fca2e3232ae24..75cafbc113f73f0523872162a41f107efd8de303 100644 (file)
--- a/src/expr/exthdr.c
+++ b/src/expr/exthdr.c
@@ -339,9 +339,6 @@ static int
 nftnl_expr_exthdr_snprintf(char *buf, size_t len, uint32_t type,
                           uint32_t flags, const struct nftnl_expr *e)
 {
-       if (len)
-               buf[0] = '\0';
-
        switch (type) {
        case NFTNL_OUTPUT_DEFAULT:
                return nftnl_expr_exthdr_snprintf_default(buf, len, e);

diff --git a/src/expr/fib.c b/src/expr/fib.c
index cbadeef7ce4976c733c588530160ff58fb4d67ea..b922b26681e799a7ac2986ccbac469eec6107ea2 100644 (file)
--- a/src/expr/fib.c
+++ b/src/expr/fib.c
@@ -236,9 +236,6 @@ static int
 nftnl_expr_fib_snprintf(char *buf, size_t len, uint32_t type,
                         uint32_t flags, const struct nftnl_expr *e)
 {
-       if (len)
-               buf[0] = '\0';
-
        switch (type) {
        case NFTNL_OUTPUT_DEFAULT:
                return nftnl_expr_fib_snprintf_default(buf, len, e);

diff --git a/src/expr/fwd.c b/src/expr/fwd.c
index 38923df647603da7060a84050fc27f554b8e9afa..1312ea10b07c465ca1806cc4b441f8883f4f8b66 100644 (file)
--- a/src/expr/fwd.c
+++ b/src/expr/fwd.c
@@ -147,9 +147,6 @@ static int nftnl_expr_fwd_snprintf_default(char *buf, size_t len,
 static int nftnl_expr_fwd_snprintf(char *buf, size_t len, uint32_t type,
                                   uint32_t flags, const struct nftnl_expr *e)
 {
-       if (len)
-               buf[0] = '\0';
-
        switch (type) {
        case NFTNL_OUTPUT_DEFAULT:
                return nftnl_expr_fwd_snprintf_default(buf, len, e, flags);

diff --git a/src/expr/hash.c b/src/expr/hash.c
index 066c790d5b5085fc487115587e64f169f20fc73c..fcc4fa5c051611306a95e078f6f72e997a73037e 100644 (file)
--- a/src/expr/hash.c
+++ b/src/expr/hash.c
@@ -288,9 +288,6 @@ static int
 nftnl_expr_hash_snprintf(char *buf, size_t len, uint32_t type,
                         uint32_t flags, const struct nftnl_expr *e)
 {
-       if (len)
-               buf[0] = '\0';
-
        switch (type) {
        case NFTNL_OUTPUT_DEFAULT:
                return nftnl_expr_hash_snprintf_default(buf, len, e);

diff --git a/src/expr/immediate.c b/src/expr/immediate.c
index aba84ea0823e352fd18c3f6fc8b8108e7f93c2c3..b0570bd539a4e409f9021f53981a8924e804e206 100644 (file)
--- a/src/expr/immediate.c
+++ b/src/expr/immediate.c
@@ -262,9 +262,6 @@ static int
 nftnl_expr_immediate_snprintf(char *buf, size_t len, uint32_t type,
                              uint32_t flags, const struct nftnl_expr *e)
 {
-       if (len)
-               buf[0] = '\0';
-
        switch(type) {
        case NFTNL_OUTPUT_DEFAULT:
                return nftnl_expr_immediate_snprintf_default(buf, len, e, flags);

diff --git a/src/expr/limit.c b/src/expr/limit.c
index 8e1f02abb617c5a1f38623b34c76352aef5a4d49..856ab1839b0a6fbf88af47a92730516202c9d56e 100644 (file)
--- a/src/expr/limit.c
+++ b/src/expr/limit.c
@@ -243,9 +243,6 @@ static int
 nftnl_expr_limit_snprintf(char *buf, size_t len, uint32_t type,
                          uint32_t flags, const struct nftnl_expr *e)
 {
-       if (len)
-               buf[0] = '\0';
-
        switch(type) {
        case NFTNL_OUTPUT_DEFAULT:
                return nftnl_expr_limit_snprintf_default(buf, len, e);

diff --git a/src/expr/log.c b/src/expr/log.c
index 161327b4b5f236f9e6e074e367fd04a16a49f664..86d965136cd4c6c574f9987c70783f5aa47d6348 100644 (file)
--- a/src/expr/log.c
+++ b/src/expr/log.c
@@ -301,9 +301,6 @@ static int
 nftnl_expr_log_snprintf(char *buf, size_t len, uint32_t type,
                        uint32_t flags, const struct nftnl_expr *e)
 {
-       if (len)
-               buf[0] = '\0';
-
        switch(type) {
        case NFTNL_OUTPUT_DEFAULT:
                return nftnl_expr_log_snprintf_default(buf, len, e);

diff --git a/src/expr/lookup.c b/src/expr/lookup.c
index 32220a30dbce10958b41e5944f619e5cf35c1d40..5fcb81f3a7a24d6b3a5882b56ff6e5927ac1daf5 100644 (file)
--- a/src/expr/lookup.c
+++ b/src/expr/lookup.c
@@ -242,9 +242,6 @@ static int
 nftnl_expr_lookup_snprintf(char *buf, size_t size, uint32_t type,
                           uint32_t flags, const struct nftnl_expr *e)
 {
-       if (size)
-               buf[0] = '\0';
-
        switch(type) {
        case NFTNL_OUTPUT_DEFAULT:
                return nftnl_expr_lookup_snprintf_default(buf, size, e);

diff --git a/src/expr/masq.c b/src/expr/masq.c
index 1c75ee9cdd53b1ad28fa03f80b032d401b2635dc..7c235d3b0bdc75dbc508ed369c2d9f9728fcc75d 100644 (file)
--- a/src/expr/masq.c
+++ b/src/expr/masq.c
@@ -190,9 +190,6 @@ static int nftnl_expr_masq_snprintf_default(char *buf, size_t len,
 static int nftnl_expr_masq_snprintf(char *buf, size_t len, uint32_t type,
                                    uint32_t flags, const struct nftnl_expr *e)
 {
-       if (len)
-               buf[0] = '\0';
-
        switch (type) {
        case NFTNL_OUTPUT_DEFAULT:
                return nftnl_expr_masq_snprintf_default(buf, len, e);

diff --git a/src/expr/match.c b/src/expr/match.c
index af659b3821c8f38765b5d7858fce15d411dac6d3..dd09e1e851925579b393ffae1558a9d7e14d74a3 100644 (file)
--- a/src/expr/match.c
+++ b/src/expr/match.c
@@ -200,9 +200,6 @@ nftnl_expr_match_snprintf(char *buf, size_t len, uint32_t type,
 {
        struct nftnl_expr_match *match = nftnl_expr_data(e);
 
-       if (len)
-               buf[0] = '\0';
-
        switch (type) {
        case NFTNL_OUTPUT_DEFAULT:
                return snprintf(buf, len, "name %s rev %u ",

diff --git a/src/expr/meta.c b/src/expr/meta.c
index b5c27e66dc51361d214c7ed9130b0166b1793c2f..2c758412bf2e3f1791636628a7c9f1693eed7cad 100644 (file)
--- a/src/expr/meta.c
+++ b/src/expr/meta.c
@@ -252,9 +252,6 @@ static int
 nftnl_expr_meta_snprintf(char *buf, size_t len, uint32_t type,
                         uint32_t flags, const struct nftnl_expr *e)
 {
-       if (len)
-               buf[0] = '\0';
-
        switch (type) {
        case NFTNL_OUTPUT_DEFAULT:
                return nftnl_expr_meta_snprintf_default(buf, len, e);

diff --git a/src/expr/nat.c b/src/expr/nat.c
index 350633fd5e0a0db9eadc089f87942e3a6719f66a..92713033a6e766b81137a207a5eb48cebfe6eabf 100644 (file)
--- a/src/expr/nat.c
+++ b/src/expr/nat.c
@@ -339,9 +339,6 @@ static int
 nftnl_expr_nat_snprintf(char *buf, size_t size, uint32_t type,
                        uint32_t flags, const struct nftnl_expr *e)
 {
-       if (size)
-               buf[0] = '\0';
-
        switch (type) {
        case NFTNL_OUTPUT_DEFAULT:
                return nftnl_expr_nat_snprintf_default(buf, size, e);

diff --git a/src/expr/numgen.c b/src/expr/numgen.c
index 9b5b1b7892069b68f930d696b8a2e9bf18531dbe..1369b01d9401d825b69662c1d7e04360fb8d8f14 100644 (file)
--- a/src/expr/numgen.c
+++ b/src/expr/numgen.c
@@ -224,9 +224,6 @@ static int
 nftnl_expr_ng_snprintf(char *buf, size_t len, uint32_t type,
                       uint32_t flags, const struct nftnl_expr *e)
 {
-       if (len)
-               buf[0] = '\0';
-
        switch (type) {
        case NFTNL_OUTPUT_DEFAULT:
                return nftnl_expr_ng_snprintf_default(buf, len, e);

diff --git a/src/expr/objref.c b/src/expr/objref.c
index b4b3383e8a7ca49b37ab433e123c0876e8e1b5be..4cfa3cbfbd2b570cb02030b2a6350adeebc40a5a 100644 (file)
--- a/src/expr/objref.c
+++ b/src/expr/objref.c
@@ -236,9 +236,6 @@ static int nftnl_expr_objref_snprintf(char *buf, size_t len, uint32_t type,
                                      uint32_t flags,
                                      const struct nftnl_expr *e)
 {
-       if (len)
-               buf[0] = '\0';
-
        switch (type) {
        case NFTNL_OUTPUT_DEFAULT:
                return nftnl_expr_objref_snprintf_default(buf, len, e);

diff --git a/src/expr/payload.c b/src/expr/payload.c
index 897fc7746166e62a337ff60209ff796c05177d06..91e1587ff239b3236705e9125e6588f4c4a359f9 100644 (file)
--- a/src/expr/payload.c
+++ b/src/expr/payload.c
@@ -290,9 +290,6 @@ nftnl_expr_payload_snprintf(char *buf, size_t len, uint32_t type,
 {
        struct nftnl_expr_payload *payload = nftnl_expr_data(e);
 
-       if (len)
-               buf[0] = '\0';
-
        switch (type) {
        case NFTNL_OUTPUT_DEFAULT:
                if (payload->sreg)

diff --git a/src/expr/queue.c b/src/expr/queue.c
index e0fb785a490bb7740637d5b48b3ce2d60a255cb4..a392a271a6fb48b58ffd660236cd27591dc93c1d 100644 (file)
--- a/src/expr/queue.c
+++ b/src/expr/queue.c
@@ -235,9 +235,6 @@ static int
 nftnl_expr_queue_snprintf(char *buf, size_t len, uint32_t type,
                          uint32_t flags, const struct nftnl_expr *e)
 {
-       if (len)
-               buf[0] = '\0';
-
        switch (type) {
        case NFTNL_OUTPUT_DEFAULT:
                return nftnl_expr_queue_snprintf_default(buf, len, e);

diff --git a/src/expr/quota.c b/src/expr/quota.c
index c247b0a03341565b369c80078325e9e185f6e8cd..667e6e17c28ce159182408930fec84c9bf959da1 100644 (file)
--- a/src/expr/quota.c
+++ b/src/expr/quota.c
@@ -183,9 +183,6 @@ static int nftnl_expr_quota_snprintf(char *buf, size_t len, uint32_t type,
                                       uint32_t flags,
                                       const struct nftnl_expr *e)
 {
-       if (len)
-               buf[0] = '\0';
-
        switch (type) {
        case NFTNL_OUTPUT_DEFAULT:
                return nftnl_expr_quota_snprintf_default(buf, len, e);

diff --git a/src/expr/range.c b/src/expr/range.c
index c7bb7c7f3d7ada1030d10451cf4525a67e11b01a..b2789ffaada340b425bb7b07ac3b8804c5c52fda 100644 (file)
--- a/src/expr/range.c
+++ b/src/expr/range.c
@@ -263,9 +263,6 @@ static int nftnl_expr_range_snprintf_default(char *buf, size_t size,
 static int nftnl_expr_range_snprintf(char *buf, size_t size, uint32_t type,
                                     uint32_t flags, const struct nftnl_expr *e)
 {
-       if (size)
-               buf[0] = '\0';
-
        switch (type) {
        case NFTNL_OUTPUT_DEFAULT:
                return nftnl_expr_range_snprintf_default(buf, size, e);

diff --git a/src/expr/redir.c b/src/expr/redir.c
index 9fb634afaa193ee64183c5329aff3a9da967ec5b..b2aa3453870a90a3cd88622d3ac8a6e25095b3cb 100644 (file)
--- a/src/expr/redir.c
+++ b/src/expr/redir.c
@@ -204,9 +204,6 @@ static int
 nftnl_expr_redir_snprintf(char *buf, size_t len, uint32_t type,
                          uint32_t flags, const struct nftnl_expr *e)
 {
-       if (len)
-               buf[0] = '\0';
-
        switch (type) {
        case NFTNL_OUTPUT_DEFAULT:
                return nftnl_expr_redir_snprintf_default(buf, len, e);

diff --git a/src/expr/reject.c b/src/expr/reject.c
index 1e6fdf5c5ba035d8c6b50738b76d1ae900958678..11d8b20096aec74bf5779be275c673cb1bac8160 100644 (file)
--- a/src/expr/reject.c
+++ b/src/expr/reject.c
@@ -164,9 +164,6 @@ static int
 nftnl_expr_reject_snprintf(char *buf, size_t len, uint32_t type,
                           uint32_t flags, const struct nftnl_expr *e)
 {
-       if (len)
-               buf[0] = '\0';
-
        switch (type) {
        case NFTNL_OUTPUT_DEFAULT:
                return nftnl_expr_reject_snprintf_default(buf, len, e);

diff --git a/src/expr/rt.c b/src/expr/rt.c
index 10cb1e27ce682a8ba99f32997b3d1b94ead6c97c..62c01a0be0f523edf2802d9281b88b67b6640128 100644 (file)
--- a/src/expr/rt.c
+++ b/src/expr/rt.c
@@ -203,9 +203,6 @@ static int
 nftnl_expr_rt_snprintf(char *buf, size_t len, uint32_t type,
                       uint32_t flags, const struct nftnl_expr *e)
 {
-       if (len)
-               buf[0] = '\0';
-
        switch (type) {
        case NFTNL_OUTPUT_DEFAULT:
                return nftnl_expr_rt_snprintf_default(buf, len, e);

diff --git a/src/expr/target.c b/src/expr/target.c
index 3c58b03d20dd0f0520a0ef63f1fc3f15d765d3d5..ed4bf7df632879749a53cbe140862e318b58fabe 100644 (file)
--- a/src/expr/target.c
+++ b/src/expr/target.c
@@ -200,9 +200,6 @@ nftnl_expr_target_snprintf(char *buf, size_t len, uint32_t type,
 {
        struct nftnl_expr_target *target = nftnl_expr_data(e);
 
-       if (len)
-               buf[0] = '\0';
-
        switch (type) {
        case NFTNL_OUTPUT_DEFAULT:
                return snprintf(buf, len, "name %s rev %u ",