From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Tue, 19 Jun 2012 20:24:53 +0000 (+0200)
Subject: ipset help lists set types multiple times, fixed (reported by Mr Dash Four)
X-Git-Tag: v6.13~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1b4f87c8d9f466edfaa25896892031d78738f335;p=ipset

ipset help lists set types multiple times, fixed (reported by Mr Dash Four)

ipset help listed every set type, including the ones with multiple
revisions - which were listed thus multiple times. Set types with
multiple revisions are listed once from now on.
---

diff --git a/src/ipset.c b/src/ipset.c
index 8e5411f..e649f08 100644
--- a/src/ipset.c
+++ b/src/ipset.c
@@ -623,10 +623,14 @@ parse_commandline(int argc, char *argv[])
 					       type->family == NFPROTO_IPV4
 						? "INET" : "INET6");
 			} else {
+				const char *name = NULL;
+
 				printf("\nSupported set types:\n");
 				type = ipset_types();
 				while (type) {
-					printf("    %s\n", type->name);
+					if (!(name && STREQ(name, type->name)))
+						printf("    %s\n", type->name);
+					name = type->name;
 					type = type->next;
 				}
 			}