diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-04-19 01:51:57 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-04-19 01:55:58 +0200 |
commit | 1c8a6c57b0936ca24fe2dd8455c47d6a2fb5cb7f (patch) | |
tree | 71ab9e76a4b187bdc0db5e554497147f4417766f /src/set.c | |
parent | b0f2066ac0ebf3c5151ae2ece231b2317dfa3a5f (diff) |
src: remove trailing \n from all nft_*_snprintf functions
The caller should add it in case it needs it.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/set.c')
-rw-r--r-- | src/set.c | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -270,10 +270,17 @@ int nft_set_snprintf(char *buf, size_t size, struct nft_set *s, int len = size, offset = 0; struct nft_set_elem *elem; - ret = snprintf(buf, size, "set=%s table=%s flags=%x\n", + ret = snprintf(buf, size, "set=%s table=%s flags=%x", s->name, s->table, s->set_flags); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + /* Empty set? Skip printinf of elements */ + if (list_empty(&s->element_list)) + return offset; + + ret = snprintf(buf+offset, size, "\n"); + SNPRINTF_BUFFER_SIZE(ret, size, len, offset); + list_for_each_entry(elem, &s->element_list, head) { ret = snprintf(buf+offset, size, "\t"); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); |