diff options
Diffstat (limited to 'src/set.c')
| -rw-r--r-- | src/set.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -543,10 +543,10 @@ static int nft_set_snprintf_json(char *buf, size_t size, struct nft_set *s, int len = size, offset = 0, ret; struct nft_set_elem *elem; - ret = snprintf(buf, len, "{ \"set\": { \"name\": \"%s\"," - "\"table\": \"%s\"," - "\"flags\": %u,\"family\": \"%s\"," - "\"key_type\": %u,\"key_len\": %u", + ret = snprintf(buf, len, "{\"set\":{\"name\":\"%s\"," + "\"table\":\"%s\"," + "\"flags\":%u,\"family\":\"%s\"," + "\"key_type\":%u,\"key_len\":%u", s->name, s->table, s->set_flags, nft_family2str(s->family), s->key_type, s->key_len); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); @@ -554,7 +554,7 @@ static int nft_set_snprintf_json(char *buf, size_t size, struct nft_set *s, if(s->flags & (1 << NFT_SET_ATTR_DATA_TYPE) && s->flags & (1 << NFT_SET_ATTR_DATA_LEN)){ ret = snprintf(buf+offset, len, - ",\"data_type\": %u,\"data_len\": %u", + ",\"data_type\":%u,\"data_len\":%u", s->data_type, s->data_len); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } @@ -566,7 +566,7 @@ static int nft_set_snprintf_json(char *buf, size_t size, struct nft_set *s, return offset; } - ret = snprintf(buf+offset, len, ",\"set_elem\": ["); + ret = snprintf(buf+offset, len, ",\"set_elem\":["); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); list_for_each_entry(elem, &s->element_list, head) { @@ -576,11 +576,11 @@ static int nft_set_snprintf_json(char *buf, size_t size, struct nft_set *s, ret = nft_set_elem_snprintf(buf+offset, len, elem, type, flags); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); - ret = snprintf(buf+offset, len, "}, "); + ret = snprintf(buf+offset, len, "},"); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); } /* Overwrite trailing ", " from last set element */ - offset -= 2; + offset --; ret = snprintf(buf+offset, len, "]}}"); SNPRINTF_BUFFER_SIZE(ret, size, len, offset); |