Get rid of the trailing empty line at listing sets.

Also, remove the empty "members" section when listing
just the set headers.

Testsuite is updated to reflect the changes in the output.

diff --git a/lib/session.c b/lib/session.c
index 5e20a322649ac9b9276c792407fd0117a1df7967..c55c3114d7d760190f0603aaeccf08a9563ef231 100644 (file)
--- a/lib/session.c
+++ b/lib/session.c
@@ -35,6 +35,7 @@ struct ipset_session {
        /* Command state */
        enum ipset_cmd cmd;                     /* Current command */
        uint32_t lineno;                        /* Current lineno in restore mode */
+       uint32_t printed_set;                   /* Printed sets so far */
        char saved_setname[IPSET_MAXNAMELEN];   /* Saved setname */
        const struct ipset_type *saved_type;    /* Saved type */
        struct nlattr *nested[IPSET_NEST_MAX];  /* Pointer to nest levels */
@@ -829,8 +830,9 @@ list_create(struct ipset_session *session, struct nlattr *nla[])
                              type->name);
                break;
        case IPSET_LIST_PLAIN:
-               safe_snprintf(session, "Name: %s\n"
+               safe_snprintf(session, "%sName: %s\n"
                              "Type: %s\nHeader: ",
+                             session->printed_set ? "\n" : "",
                              ipset_data_setname(data),
                              type->name);
                break;
@@ -896,11 +898,15 @@ list_create(struct ipset_session *session, struct nlattr *nla[])
                safe_dprintf(session, ipset_print_number, IPSET_OPT_MEMSIZE);
                safe_snprintf(session, "</memsize>\n    <references>");
                safe_dprintf(session, ipset_print_number, IPSET_OPT_REFERENCES);
-               safe_snprintf(session, "</references>\n  </header>\n  <members>\n");
+               safe_snprintf(session,
+                       session->envopts & IPSET_ENV_LIST_HEADER ?
+                       "</references>\n  </header>\n" :
+                       "</references>\n  </header>\n  <members>\n");
                break;
        default:
                break;
        }
+       session->printed_set++;
 
        return MNL_CB_OK;
 }
@@ -912,16 +918,17 @@ print_set_done(struct ipset_session *session)
                ? "NONE" : session->saved_setname);
        switch (session->mode) {
        case IPSET_LIST_XML:
-               if (session->saved_setname[0] == '\0')
-                       safe_snprintf(session, "\n");
-               else
+               if (session->envopts & IPSET_ENV_LIST_SETNAME)
+                       break;
+               if (session->envopts & IPSET_ENV_LIST_HEADER) {
+                       if (session->saved_setname[0] != '\0')
+                               safe_snprintf(session, "</ipset>\n");
+                       break;
+               }
+               if (session->saved_setname[0] != '\0')
                        safe_snprintf(session, "  </members>\n</ipset>\n");
                break;
-       case IPSET_LIST_SAVE:
-               /* No empty lines between the sets */
-               break;
        default:
-               safe_snprintf(session, "\n");
                break;
        }
        return call_outfn(session) ? MNL_CB_ERROR : MNL_CB_STOP;
@@ -933,8 +940,11 @@ callback_list(struct ipset_session *session, struct nlattr *nla[],
 {
        struct ipset_data *data = session->data;
 
-       if (setjmp(printf_failure))
+       if (setjmp(printf_failure)) {
+               session->saved_setname[0] = '\0';
+               session->printed_set = 0;
                return MNL_CB_ERROR;
+       }
 
        if (!nla[IPSET_ATTR_SETNAME])
                FAILURE("Broken %s kernel message: missing setname!",
@@ -1629,7 +1639,7 @@ build_msg(struct ipset_session *session, bool aggregate)
                        flags |= IPSET_FLAG_LIST_HEADER;
                if (ipset_data_test(data, IPSET_SETNAME))
                        ADDATTR_SETNAME(session, nlh, data);
-               if (flags) {
+               if (flags && session->mode != IPSET_LIST_SAVE) {
                        ipset_data_set(data, IPSET_OPT_FLAGS, &flags);
                        ADDATTR(session, nlh, data, IPSET_ATTR_FLAGS, AF_INET,
                                cmd_attrs);
@@ -1756,6 +1766,7 @@ ipset_commit(struct ipset_session *session)
 
        /* Reset saved data and nested state */
        session->saved_setname[0] = '\0';
+       session->printed_set = 0;
        for (i = session->nestid - 1; i >= 0; i--)
                session->nested[i] = NULL;
        session->nestid = 0;

diff --git a/tests/bitmap:ip.t.list0 b/tests/bitmap:ip.t.list0
index 5f6b35df602e48b1dc6fa2d1dbd7733029a72cc8..e3bbf3b35520407cd7527edcb393542c4e23c9fd 100644 (file)
--- a/tests/bitmap:ip.t.list0
+++ b/tests/bitmap:ip.t.list0
@@ -5,4 +5,3 @@ Size in memory: 524408
 References: 0
 Members:
 2.1.0.0 timeout 0
-

diff --git a/tests/bitmap:ip.t.list1 b/tests/bitmap:ip.t.list1
index 60647176a0d1add62c2ea773a97830031ae5f583..c97f35905ff822f0a76f78e7c2e853b3d7f2f9e9 100644 (file)
--- a/tests/bitmap:ip.t.list1
+++ b/tests/bitmap:ip.t.list1
@@ -5,4 +5,3 @@ Size in memory: 524408
 References: 0
 Members:
 2.0.0.0 timeout 0
-

diff --git a/tests/bitmap:ip.t.list2 b/tests/bitmap:ip.t.list2
index e00abc9b48d0f242dd7fc5035717733a623adfea..f3db85c5e4fbf10af24b5e8bb798de7a29797641 100644 (file)
--- a/tests/bitmap:ip.t.list2
+++ b/tests/bitmap:ip.t.list2
@@ -5,4 +5,3 @@ Size in memory: 524408
 References: 0
 Members:
 10.255.255.0 timeout 0
-

diff --git a/tests/bitmap:ip.t.list3 b/tests/bitmap:ip.t.list3
index 2d5e7a7b97850e1902f7d1763b6e45f386eb4092..8d427b5483ed2faff2ea09a2f1b330316d4fdff0 100644 (file)
--- a/tests/bitmap:ip.t.list3
+++ b/tests/bitmap:ip.t.list3
@@ -6,4 +6,3 @@ References: 0
 Members:
 0.0.0.0 timeout 0
 255.255.0.0 timeout 0
-

diff --git a/tests/bitmap:ip.t.list4 b/tests/bitmap:ip.t.list4
index 53004cf4f57d9b7e4322369e7a8b887978b4b83d..43418be6977f0a79c57babc85f41e8c54b425af8 100644 (file)
--- a/tests/bitmap:ip.t.list4
+++ b/tests/bitmap:ip.t.list4
@@ -10,4 +10,3 @@ Members:
 2.0.0.130 timeout x
 2.0.0.131 timeout x
 2.1.0.0 timeout x
-

diff --git a/tests/bitmap:ip.t.list5 b/tests/bitmap:ip.t.list5
index 65d338d30e3f0d8ef52270f865cb254452f7c5d1..7d4c34dacd3f921c2dab91a9337910aa629a8fec 100644 (file)
--- a/tests/bitmap:ip.t.list5
+++ b/tests/bitmap:ip.t.list5
@@ -6,4 +6,3 @@ References: 0
 Members:
 2.0.0.0 timeout x
 2.0.255.255 timeout x
-

diff --git a/tests/bitmap:ip.t.list6 b/tests/bitmap:ip.t.list6
index 13b75ad7bb15ef0524513fa52f787263caa992b1..e5a7c07e941ef40fe3c9be14a877a9fd08565628 100644 (file)
--- a/tests/bitmap:ip.t.list6
+++ b/tests/bitmap:ip.t.list6
@@ -262,4 +262,3 @@ Members:
 10.8.254.0 timeout x
 10.8.255.0 timeout x
 10.255.255.0 timeout x
-

diff --git a/tests/hash:ip,port,ip.t.list0 b/tests/hash:ip,port,ip.t.list0
index daad2dbe5bc6d0330b507785e485e49af62245ac..779649f538114f8106dcca2bce9b44aff2e75e55 100644 (file)
--- a/tests/hash:ip,port,ip.t.list0
+++ b/tests/hash:ip,port,ip.t.list0
@@ -8,4 +8,3 @@ Members:
 2.0.0.1,tcp:5,1.1.1.1 timeout x
 2.1.0.0,tcp:128,2.2.2.2 timeout x
 2.1.0.1,tcp:128,2.2.2.2 timeout x
-

diff --git a/tests/hash:ip,port,ip.t.list1 b/tests/hash:ip,port,ip.t.list1
index fb0b4a49879ff57f5c3ccbda5bc61e85b22da00a..2e42e5a6ed486702be5702ebca5e3b81cc7fa264 100644 (file)
--- a/tests/hash:ip,port,ip.t.list1
+++ b/tests/hash:ip,port,ip.t.list1
@@ -4,4 +4,3 @@ Header: family inet hashsize 1024 maxelem 65536 timeout 5
 Size in memory: 8304
 References: 0
 Members:
-

diff --git a/tests/hash:ip,port,net.t.list0 b/tests/hash:ip,port,net.t.list0
index 967e6931448c2ca6f760cee654fc157c07be4149..3ce6e1f6385c0715342d7d0d0623fa56166fed44 100644 (file)
--- a/tests/hash:ip,port,net.t.list0
+++ b/tests/hash:ip,port,net.t.list0
@@ -8,4 +8,3 @@ Members:
 2.0.0.1,tcp:5,192.168.0.0/24 timeout x
 2.1.0.0,tcp:128,10.0.0.0/16 timeout x
 2.1.0.1,tcp:128,10.0.0.0/17 timeout x
-

diff --git a/tests/hash:ip,port.t.list0 b/tests/hash:ip,port.t.list0
index fb6a8eccb8eaab62c83bc55384bc1e33741cc64f..7896f573c82da37505277aa6c5c704cd7ffc3784 100644 (file)
--- a/tests/hash:ip,port.t.list0
+++ b/tests/hash:ip,port.t.list0
@@ -8,4 +8,3 @@ Members:
 2.0.0.1,tcp:5 timeout x
 2.1.0.0,tcp:128 timeout x
 2.1.0.1,tcp:128 timeout x
-

diff --git a/tests/hash:ip,port.t.list1 b/tests/hash:ip,port.t.list1
index d455117c754f3faebae00c9bf6f0047f599295dd..0b71466f250dc771ad4d49eb500f7ebf6bcbfa71 100644 (file)
--- a/tests/hash:ip,port.t.list1
+++ b/tests/hash:ip,port.t.list1
@@ -4,4 +4,3 @@ Header: family inet hashsize 1024 maxelem 65536 timeout 5
 Size in memory: 8304
 References: 0
 Members:
-

diff --git a/tests/hash:ip,port.t.list2 b/tests/hash:ip,port.t.list2
index 33911a06ef97433a248fe538c4a81ed2b0723225..bb6e9e43c8a1bacb0d13ce50500b600693bdcafe 100644 (file)
--- a/tests/hash:ip,port.t.list2
+++ b/tests/hash:ip,port.t.list2
@@ -7,4 +7,3 @@ Members:
 2.0.0.1,tcp:80
 2.0.0.1,udp:80
 2.0.0.1,vrrp:0
-

diff --git a/tests/hash:ip.t.list0 b/tests/hash:ip.t.list0
index 117faf21a47896cca3718ab8b8ca4ff45ece495e..09a18507ce44ea980ee23d52fc0a9bc4634eb715 100644 (file)
--- a/tests/hash:ip.t.list0
+++ b/tests/hash:ip.t.list0
@@ -5,4 +5,3 @@ Size in memory: 1208
 References: 0
 Members:
 192.168.68.69 timeout 0
-

diff --git a/tests/hash:ip.t.list1 b/tests/hash:ip.t.list1
index b15a2128140d9b0a4dfa17314f2b82aaaf9fc667..cb21bc41f4454c7ffd55bef4e5e94667e315ee99 100644 (file)
--- a/tests/hash:ip.t.list1
+++ b/tests/hash:ip.t.list1
@@ -5,4 +5,3 @@ Size in memory: 1352
 References: 0
 Members:
 200.100.10.0 timeout 0
-

diff --git a/tests/hash:ip.t.list2 b/tests/hash:ip.t.list2
index 468ba67203639a84e655840f3c49751fe8520449..ec085bf412ecb19d3434d83b17927948f649da89 100644 (file)
--- a/tests/hash:ip.t.list2
+++ b/tests/hash:ip.t.list2
@@ -6,4 +6,3 @@ References: 0
 Members:
 192.168.68.69 timeout x
 2.0.0.1 timeout x
-

diff --git a/tests/hash:ip.t.list3 b/tests/hash:ip.t.list3
index 463f0a486bca8d2e53a42523e6cabe152fdd902d..7bdf31a56e7db3acb59d2dbb972c9cc319b587f2 100644 (file)
--- a/tests/hash:ip.t.list3
+++ b/tests/hash:ip.t.list3
@@ -7,4 +7,3 @@ Members:
 192.168.68.0 timeout x
 2.0.0.0 timeout x
 200.100.10.0 timeout x
-

diff --git a/tests/hash:ip6,port,ip6.t.list0 b/tests/hash:ip6,port,ip6.t.list0
index 8192dfb965a8a99ed6ed10675a73da09c5cbd233..061ea94cfbd01ff32aa3b96f455ccb0d2c2830ec 100644 (file)
--- a/tests/hash:ip6,port,ip6.t.list0
+++ b/tests/hash:ip6,port,ip6.t.list0
@@ -8,4 +8,3 @@ Members:
 2:1::1,tcp:128,2:2:2::2 timeout x
 2::,tcp:5,1:1:1::1 timeout x
 2::1,tcp:5,1:1:1::1 timeout x
-

diff --git a/tests/hash:ip6,port,ip6.t.list1 b/tests/hash:ip6,port,ip6.t.list1
index 16fdb92eda9e8c3da1b6ef5e7ce5d2d2a99b5b51..b05e3ffa182f3e50da765e70f438d4cd0f819861 100644 (file)
--- a/tests/hash:ip6,port,ip6.t.list1
+++ b/tests/hash:ip6,port,ip6.t.list1
@@ -4,4 +4,3 @@ Header: family inet6 hashsize 1024 maxelem 65536 timeout 5
 Size in memory: 8304
 References: 0
 Members:
-

diff --git a/tests/hash:ip6,port,net6.t.list0 b/tests/hash:ip6,port,net6.t.list0
index d3d6503b4480d77288fe1be31369e65876b4e2fa..0b0fabd4ae7df765764d4c380c9cd92b87b28243 100644 (file)
--- a/tests/hash:ip6,port,net6.t.list0
+++ b/tests/hash:ip6,port,net6.t.list0
@@ -8,4 +8,3 @@ Members:
 2:1::1,tcp:128,::/12
 2::,tcp:5,1::/24
 2::1,tcp:5,1::/24
-

diff --git a/tests/hash:ip6,port.t.list0 b/tests/hash:ip6,port.t.list0
index 1336a3f3eacfd15dd6e479ea4ede30a97baeb102..d64f0db46da473a2d079456ecc5e3cfd33ef9538 100644 (file)
--- a/tests/hash:ip6,port.t.list0
+++ b/tests/hash:ip6,port.t.list0
@@ -8,4 +8,3 @@ Members:
 2:1::1,tcp:128 timeout x
 2::,tcp:5 timeout x
 2::1,tcp:5 timeout x
-

diff --git a/tests/hash:ip6,port.t.list1 b/tests/hash:ip6,port.t.list1
index 8dec3e85da3b3bda679af9dc69f3dc425413442d..31c2fd50959e5188ef0423b8243f7d2d7977d2cd 100644 (file)
--- a/tests/hash:ip6,port.t.list1
+++ b/tests/hash:ip6,port.t.list1
@@ -4,4 +4,3 @@ Header: family inet6 hashsize 1024 maxelem 65536 timeout 5
 Size in memory: 8304
 References: 0
 Members:
-

diff --git a/tests/hash:ip6.t.list0 b/tests/hash:ip6.t.list0
index ff1c0da4abbd69f49c913c4384606e3696c5bc5d..25df7d9739c390cd1f9c59224731ecf934a3d799 100644 (file)
--- a/tests/hash:ip6.t.list0
+++ b/tests/hash:ip6.t.list0
@@ -5,4 +5,3 @@ Size in memory: 1240
 References: 0
 Members:
 192:168:68::69 timeout 0
-

diff --git a/tests/hash:ip6.t.list1 b/tests/hash:ip6.t.list1
index 00b3323179c53b808088603ac27cb44843a29112..215677d21988e78d5f7e727688e9f0423af48ea6 100644 (file)
--- a/tests/hash:ip6.t.list1
+++ b/tests/hash:ip6.t.list1
@@ -5,4 +5,3 @@ Size in memory: 1448
 References: 0
 Members:
 200:100:10:: timeout 0
-

diff --git a/tests/hash:ip6.t.list2 b/tests/hash:ip6.t.list2
index 5cd39fb10a48823911ed458599acaaed89fbb248..339bf3f3d3e60e5ad41c7e97988f0c56287b5a0d 100644 (file)
--- a/tests/hash:ip6.t.list2
+++ b/tests/hash:ip6.t.list2
@@ -6,4 +6,3 @@ References: 0
 Members:
 192:168:68::69 timeout x
 2::1 timeout x
-

diff --git a/tests/hash:ip6.t.list3 b/tests/hash:ip6.t.list3
index dce066031922aa10b18699a2e457a41eaad9b3ab..b7f7d12f87a79608dfe2f3e79fce1ea8738e1231 100644 (file)
--- a/tests/hash:ip6.t.list3
+++ b/tests/hash:ip6.t.list3
@@ -7,4 +7,3 @@ Members:
 192:168:68:: timeout x
 200:100:10:: timeout x
 2:: timeout x
-

diff --git a/tests/hash:net,port.t.list0 b/tests/hash:net,port.t.list0
index 8194872b739e7a0f5521c357f9ac24c04f3c5fc4..4988d96a28f9c9feafa4214760ff36554a56e0c0 100644 (file)
--- a/tests/hash:net,port.t.list0
+++ b/tests/hash:net,port.t.list0
@@ -8,4 +8,3 @@ Members:
 192.168.68.64/27,tcp:8 timeout x
 2.0.0.0/24,icmp:echo-request timeout x
 2.0.0.1,icmp:echo-request timeout x
-

diff --git a/tests/hash:net,port.t.list1 b/tests/hash:net,port.t.list1
index c049cf76d5595ce7ed477768900fac4ebca39f2e..753c5753d533105a788ccf8b3ea69710b2a2ceff 100644 (file)
--- a/tests/hash:net,port.t.list1
+++ b/tests/hash:net,port.t.list1
@@ -4,4 +4,3 @@ Header: family inet hashsize 128 maxelem 65536 timeout 5
 Size in memory: 2000
 References: 0
 Members:
-

diff --git a/tests/hash:net.t.list0 b/tests/hash:net.t.list0
index b5cc00bb69aa7aa3853bec74b8191d6d87618300..7e4d92bbd12639acd97e27285f2eb47cbd553394 100644 (file)
--- a/tests/hash:net.t.list0
+++ b/tests/hash:net.t.list0
@@ -8,4 +8,3 @@ Members:
 192.168.68.64/27 timeout x
 2.0.0.0/24 timeout x
 2.0.0.1 timeout x
-

diff --git a/tests/hash:net.t.list1 b/tests/hash:net.t.list1
index 515a93c87d7ce28e97999078184dcfd62c99139c..fb8dc80deffa941374da940a79be7c3063387f6f 100644 (file)
--- a/tests/hash:net.t.list1
+++ b/tests/hash:net.t.list1
@@ -4,4 +4,3 @@ Header: family inet hashsize 128 maxelem 65536 timeout 5
 Size in memory: 1672
 References: 0
 Members:
-

diff --git a/tests/hash:net6,port.t.list0 b/tests/hash:net6,port.t.list0
index 7c9b46d919c8c95735d6d20b213762b2410254f6..e66d2dfdf262e569e277ae1a799bfca12266d05d 100644 (file)
--- a/tests/hash:net6,port.t.list0
+++ b/tests/hash:net6,port.t.list0
@@ -8,4 +8,3 @@ Members:
 1:1:1::1,tcp:8 timeout x
 2::/24,tcp:8 timeout x
 3::1,tcp:8 timeout x
-

diff --git a/tests/hash:net6,port.t.list1 b/tests/hash:net6,port.t.list1
index 31c3eca50ec4ef0ab5670866e69ab192082b0cfa..f3b23cbfe3740e22c78d445a92fb09b9c785c9bb 100644 (file)
--- a/tests/hash:net6,port.t.list1
+++ b/tests/hash:net6,port.t.list1
@@ -5,4 +5,3 @@ Size in memory: 2328
 References: 0
 Members:
 1:1:1::1,tcp:8 timeout 0
-

diff --git a/tests/hash:net6.t.list0 b/tests/hash:net6.t.list0
index afe1f2c67fa8fdb081e3e50406165163d7a74daf..4b06c8cc05b051040e0b78caba1433cbe54391ec 100644 (file)
--- a/tests/hash:net6.t.list0
+++ b/tests/hash:net6.t.list0
@@ -8,4 +8,3 @@ Members:
 1:1:1::1 timeout x
 2::/24 timeout x
 3::1 timeout x
-

diff --git a/tests/hash:net6.t.list1 b/tests/hash:net6.t.list1
index 05d4746471745fda7af9906b1c2d57a219a3df88..891c0ce27bd29d62fba08e2ef768d18c7860702a 100644 (file)
--- a/tests/hash:net6.t.list1
+++ b/tests/hash:net6.t.list1
@@ -4,4 +4,3 @@ Header: family inet6 hashsize 128 maxelem 65536 timeout 5
 Size in memory: 2696
 References: 0
 Members:
-

diff --git a/tests/iphash.t.list0 b/tests/iphash.t.list0
index e2cc4ca6b4d4a21ad47d77891a065ab1ed8e9e4f..b871248cf489c33e64be58791fb8de87888ab69f 100644 (file)
--- a/tests/iphash.t.list0
+++ b/tests/iphash.t.list0
@@ -6,4 +6,3 @@ References: 0
 Members:
 192.168.68.69
 2.0.0.1
-

diff --git a/tests/iphash.t.list1 b/tests/iphash.t.list1
index ec9b49351b4771c19c7855eb00e49e887d070407..652c366576995330da12cd9ef85e1341dd73dfeb 100644 (file)
--- a/tests/iphash.t.list1
+++ b/tests/iphash.t.list1
@@ -6,4 +6,3 @@ References: 0
 Members:
 192.168.68.0
 2.0.0.0
-

diff --git a/tests/ipmap.t.list0 b/tests/ipmap.t.list0
index 8bf54c2b543d95e0a894643270bef282e8ee9dac..c97caef3ffa48887e938b8dd65f59721918a108a 100644 (file)
--- a/tests/ipmap.t.list0
+++ b/tests/ipmap.t.list0
@@ -10,4 +10,3 @@ Members:
 2.0.0.130
 2.0.0.131
 2.1.0.0
-

diff --git a/tests/ipmap.t.list1 b/tests/ipmap.t.list1
index 4541cf553850d242af5b4c6a3b80a90e62d3d289..d971782b1a5861c969d568c230c4cea61449ebf2 100644 (file)
--- a/tests/ipmap.t.list1
+++ b/tests/ipmap.t.list1
@@ -6,4 +6,3 @@ References: 0
 Members:
 2.0.0.1
 2.1.0.0
-

diff --git a/tests/ipmap.t.list2 b/tests/ipmap.t.list2
index 5f78ba603c049618a0476e5245979d146c89bcd4..09a305c21b25d721ddc7e4ebae4dfb41a33d2bd9 100644 (file)
--- a/tests/ipmap.t.list2
+++ b/tests/ipmap.t.list2
@@ -6,4 +6,3 @@ References: 0
 Members:
 2.0.0.0
 2.0.255.255
-

diff --git a/tests/ipmap.t.list3 b/tests/ipmap.t.list3
index 0acb3ee81422edfc2c13ed2d0e2d5aa0d3f1c388..037051b7e65666be10cffec1dfb12feb6460e9b1 100644 (file)
--- a/tests/ipmap.t.list3
+++ b/tests/ipmap.t.list3
@@ -262,4 +262,3 @@ Members:
 10.8.254.0
 10.8.255.0
 10.255.255.0
-

diff --git a/tests/ipmap.t.list4 b/tests/ipmap.t.list4
index 67a0c4ff1e7148bfbf03be98e91f12e154cc3127..7135ff49712b51c989700bf07a3f31200eb863fa 100644 (file)
--- a/tests/ipmap.t.list4
+++ b/tests/ipmap.t.list4
@@ -6,4 +6,3 @@ References: 0
 Members:
 0.0.0.0
 255.255.0.0
-

diff --git a/tests/ipporthash.t.list0 b/tests/ipporthash.t.list0
index e28593cb09e8946c60b034c687b735317ef8fb9c..c31e15102430ad1e94cd5dd7df1e4957f1e551c6 100644 (file)
--- a/tests/ipporthash.t.list0
+++ b/tests/ipporthash.t.list0
@@ -8,4 +8,3 @@ Members:
 2.0.0.1,tcp:5
 2.1.0.0,tcp:128
 2.1.0.1,tcp:128
-

diff --git a/tests/ipporthash.t.list1 b/tests/ipporthash.t.list1
index 1fbfc9cf5c6a7955e76348d36a3a0723e9b8e78e..a99b8dbd73a68f5a7b1518fa2f249875d2df40c6 100644 (file)
--- a/tests/ipporthash.t.list1
+++ b/tests/ipporthash.t.list1
@@ -8,4 +8,3 @@ Members:
 2.0.0.0,tcp:5
 2.0.255.255,tcp:128
 2.1.0.0,tcp:128
-

diff --git a/tests/ipportiphash.t.list0 b/tests/ipportiphash.t.list0
index 623e6833f27193a08bbf6178420a42cb688eec24..055aaf29ec0366436e18019d23ee518767ea2b4a 100644 (file)
--- a/tests/ipportiphash.t.list0
+++ b/tests/ipportiphash.t.list0
@@ -8,4 +8,3 @@ Members:
 2.0.0.1,tcp:5,1.1.1.1
 2.1.0.0,tcp:128,2.2.2.2
 2.1.0.1,tcp:128,2.2.2.2
-

diff --git a/tests/ipportiphash.t.list1 b/tests/ipportiphash.t.list1
index 104a94ad7e129debb7adeac433a53fa1df8af7c8..22784b7fe622d49f2a91792dc3966175248d166b 100644 (file)
--- a/tests/ipportiphash.t.list1
+++ b/tests/ipportiphash.t.list1
@@ -6,4 +6,3 @@ References: 0
 Members:
 2.0.0.0,tcp:5,1.1.1.1
 2.0.255.255,tcp:128,2.2.2.2
-

diff --git a/tests/ipportnethash.t.list0 b/tests/ipportnethash.t.list0
index ebc2ab68c5f36c9da79ebe9603e8ffa6758ed001..96fa73f182b6b15318a5c21f9372eef6d3f2ef59 100644 (file)
--- a/tests/ipportnethash.t.list0
+++ b/tests/ipportnethash.t.list0
@@ -8,4 +8,3 @@ Members:
 2.0.0.1,tcp:5,1.1.1.0/24
 2.1.0.0,tcp:128,2.0.0.0/12
 2.1.0.1,tcp:128,2.0.0.0/12
-

diff --git a/tests/ipportnethash.t.list1 b/tests/ipportnethash.t.list1
index fc90f78d8f45342ac93868979e05d24f2ca22c39..2d287e45406adf23366ee3a91237928299ab0700 100644 (file)
--- a/tests/ipportnethash.t.list1
+++ b/tests/ipportnethash.t.list1
@@ -8,4 +8,3 @@ Members:
 2.0.0.0,tcp:5,1.1.1.0/24
 2.0.255.255,tcp:128,2.0.0.0/12
 2.1.0.0,tcp:128,2.0.0.0/12
-

diff --git a/tests/iptree.t.list0 b/tests/iptree.t.list0
index f93546dc7716b5a2f0818933f904f360948d6beb..73beb61c88078350058554eeeae4ef10150a316c 100644 (file)
--- a/tests/iptree.t.list0
+++ b/tests/iptree.t.list0
@@ -6,4 +6,3 @@ References: 0
 Members:
 192.168.68.69
 2.0.0.1
-

diff --git a/tests/iptreemap.t.list0 b/tests/iptreemap.t.list0
index 15db1fe6fe729072c680003eaf0aaf8ee46977da..a1c7435493497298d7fc1bdaa688922831993006 100644 (file)
--- a/tests/iptreemap.t.list0
+++ b/tests/iptreemap.t.list0
@@ -35,4 +35,3 @@ Members:
 2.0.0.1
 3.0.0.0
 3.0.0.2
-

diff --git a/tests/macipmap.t.list0 b/tests/macipmap.t.list0
index 9403224c98d24de9451f5de70e7e82e7d42ea6de..7239eb01ae9e29de9359cb3c8bd00ac45a2058ef 100644 (file)
--- a/tests/macipmap.t.list0
+++ b/tests/macipmap.t.list0
@@ -7,4 +7,3 @@ Members:
 2.0.0.1,00:11:22:33:44:56
 2.0.0.2,00:11:22:33:44:55
 2.1.0.0
-

diff --git a/tests/macipmap.t.list1 b/tests/macipmap.t.list1
index 3420abee14f9aef5111aa1a1aafb0616dba5d183..2c4a80003967c1938b108e06aa3182ca770589ea 100644 (file)
--- a/tests/macipmap.t.list1
+++ b/tests/macipmap.t.list1
@@ -7,4 +7,3 @@ Members:
 2.0.0.0
 2.0.0.2,00:11:22:33:44:55
 2.0.255.255,00:11:22:33:44:56
-

diff --git a/tests/macipmap.t.list2 b/tests/macipmap.t.list2
index f154a52b90aef8fe1a82fc7262d01e82bd767926..b4d943ba437a7fb86cdd52a7e57ef9c7abbde4dc 100644 (file)
--- a/tests/macipmap.t.list2
+++ b/tests/macipmap.t.list2
@@ -5,4 +5,3 @@ Size in memory: 1048688
 References: 0
 Members:
 2.1.0.0 timeout x
-

diff --git a/tests/macipmap.t.list3 b/tests/macipmap.t.list3
index 04b66b51bc34494f081cab2e80d426c8b9ed1678..93a0db3967a572426e9c96a1aad71cbf8c652448 100644 (file)
--- a/tests/macipmap.t.list3
+++ b/tests/macipmap.t.list3
@@ -7,4 +7,3 @@ Members:
 2.0.0.1,00:11:22:33:44:56 timeout x
 2.0.0.2,00:11:22:33:44:55 timeout x
 2.1.0.0 timeout x
-

diff --git a/tests/nethash.t.list0 b/tests/nethash.t.list0
index 2809d79384832251db4bc5c70ae6daeca3519cf5..4c73c564f0df7b794752e4efc391148a5a9868ba 100644 (file)
--- a/tests/nethash.t.list0
+++ b/tests/nethash.t.list0
@@ -8,4 +8,3 @@ Members:
 192.168.68.64/27
 2.0.0.0/24
 2.0.0.1
-

diff --git a/tests/portmap.t.list0 b/tests/portmap.t.list0
index 9934a75eca2eec5499c323c679502fdbb2025135..88636c18f52a5d051389eba83ba0f627381b72bd 100644 (file)
--- a/tests/portmap.t.list0
+++ b/tests/portmap.t.list0
@@ -6,4 +6,3 @@ References: 0
 Members:
 1
 1024
-

diff --git a/tests/portmap.t.list1 b/tests/portmap.t.list1
index 4f13e32dde0191318d985189db4f50839a710f5e..1dff3130def93a9e8595301b2d48f8b4b4fd0bbc 100644 (file)
--- a/tests/portmap.t.list1
+++ b/tests/portmap.t.list1
@@ -6,4 +6,3 @@ References: 0
 Members:
 0
 65535
-

diff --git a/tests/portmap.t.list2 b/tests/portmap.t.list2
index 66e06b8ce038b99e5dbdcd09493c65de6b05c8ce..f2e511f0c79b1904c46a7934c8020e148f157515 100644 (file)
--- a/tests/portmap.t.list2
+++ b/tests/portmap.t.list2
@@ -6,4 +6,3 @@ Size in memory: 524288
 References: 0
 Members:
 65535 timeout 0
-

diff --git a/tests/portmap.t.list3 b/tests/portmap.t.list3
index b79cd1ec65bc2dd19af52f4910fa279f2c823327..1af93d6d19e278b4b2f6225d9e0e1e4b90a44217 100644 (file)
--- a/tests/portmap.t.list3
+++ b/tests/portmap.t.list3
@@ -6,4 +6,3 @@ References: 0
 Members:
 0 timeout x
 65535 timeout x
-

diff --git a/tests/restore.t.list0 b/tests/restore.t.list0
index 43b84222297280733c2d2b5e8055a4ee3873d16f..6c5688581837603e947d8bef4453a5a032f5c297 100644 (file)
--- a/tests/restore.t.list0
+++ b/tests/restore.t.list0
@@ -7,4 +7,3 @@ Members:
 3::3
 4::4
 a::a
-

diff --git a/tests/restore.t.list1 b/tests/restore.t.list1
index fd9b82d3a0a9e35688f3cdab1888da7613f1a3e6..146748d5d8d2d6676f6a724b43d8451cb10cf587 100644 (file)
--- a/tests/restore.t.list1
+++ b/tests/restore.t.list1
@@ -7,4 +7,3 @@ Members:
 1::1
 2::2
 b::b
-

diff --git a/tests/setlist.t.list0 b/tests/setlist.t.list0
index 99f88fb5b9ec46ea523ad9c05823ba30b6a71aa1..ab0ddee5fdedb53d70a8cedf20c73bb61ef30bf1 100644 (file)
--- a/tests/setlist.t.list0
+++ b/tests/setlist.t.list0
@@ -6,4 +6,3 @@ References: 0
 Members:
 foo
 bar
-

diff --git a/tests/setlist.t.list1 b/tests/setlist.t.list1
index 7bba167c10eef04fd59da1f7abe8d450b3532bf5..419a03fe35c2e11bc4eda43d60d8ab7ab173fbaf 100644 (file)
--- a/tests/setlist.t.list1
+++ b/tests/setlist.t.list1
@@ -7,4 +7,3 @@ Members:
 a
 b
 c
-

diff --git a/tests/setlist.t.list2 b/tests/setlist.t.list2
index 2dc752ac60bf0fb0a6acd0fd1e775e7470464256..dff031420b5f59d20d4118b032ea37d81a99bfa6 100644 (file)
--- a/tests/setlist.t.list2
+++ b/tests/setlist.t.list2
@@ -6,4 +6,3 @@ References: 0
 Members:
 a
 c
-

diff --git a/tests/setlist.t.list3 b/tests/setlist.t.list3
index 5abe9e431885809765aeb0029ddece272957285e..1fdb7e5340316147d077c26e1f30c50618cac906 100644 (file)
--- a/tests/setlist.t.list3
+++ b/tests/setlist.t.list3
@@ -5,4 +5,3 @@ Size in memory: 120
 References: 0
 Members:
 a
-

diff --git a/tests/setlist.t.list4 b/tests/setlist.t.list4
index f86750899a07396abb8949268da1bdb51abb4f8c..956d59e2d80857531bb0b325690a012f9044b639 100644 (file)
--- a/tests/setlist.t.list4
+++ b/tests/setlist.t.list4
@@ -33,4 +33,3 @@ Size in memory: 112
 References: 0
 Members:
 a
-

diff --git a/tests/sort.sh b/tests/sort.sh
index ccdbc4eafde212ea6fd991c90c874b8296ffcf7c..69aebd5f98461ab43112a7d83a2803f92faa4477 100755 (executable)
--- a/tests/sort.sh
+++ b/tests/sort.sh
@@ -2,5 +2,4 @@
 
 head -n 6 $1 > .foo
 tail -n +7 $1 | grep  '[[:alnum:]]' | sort >> .foo
-echo >> .foo
 rm $1