From: Joachim <kross@kaffeeschluerfer.com>
Date: Fri, 18 Apr 2025 13:14:27 +0000 (+0200)
Subject: Fix extraneous comma in terse list json output
X-Git-Tag: v7.24~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=58efd98188004c5cc9e7ad195f69e098966039d8;p=thirdparty%2Fipset.git

Fix extraneous comma in terse list json output

Also fix extra whitespace before closing curly brace.

Signed-off-by: Jozsef Kadlecsik <kadlec@netfilter.org>
---

diff --git a/lib/session.c b/lib/session.c
index f822288..375e89e 100644
--- a/lib/session.c
+++ b/lib/session.c
@@ -1142,7 +1142,7 @@ list_create(struct ipset_session *session, struct nlattr *nla[])
 		safe_snprintf(session, "\n");
 		safe_snprintf(session,
 			session->envopts & IPSET_ENV_LIST_HEADER ?
-			"    },\n" :
+			"    }\n" :
 			"    },\n    \"members\" : [");
 		break;
 	default:
@@ -1285,7 +1285,7 @@ print_set_done(struct ipset_session *session, bool callback_done)
 			break;
 		if (session->envopts & IPSET_ENV_LIST_HEADER) {
 			if (session->saved_setname[0] != '\0')
-				safe_snprintf(session, "    }");
+				safe_snprintf(session, "  }");
 			break;
 		}
 		if (session->saved_setname[0] != '\0')