From: Jozsef Kadlecsik Date: Tue, 19 Apr 2011 10:25:38 +0000 (+0200) Subject: Get rid of the trailing empty line at listing sets. X-Git-Tag: v6.4~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31ee222fa9d4360ac3a066ba2d8c5076aaf7a57b;p=thirdparty%2Fipset.git 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 5e20a322..c55c3114 100644 --- 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, "\n "); safe_dprintf(session, ipset_print_number, IPSET_OPT_REFERENCES); - safe_snprintf(session, "\n \n \n"); + safe_snprintf(session, + session->envopts & IPSET_ENV_LIST_HEADER ? + "\n \n" : + "\n \n \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, "\n"); + break; + } + if (session->saved_setname[0] != '\0') safe_snprintf(session, " \n\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 5f6b35df..e3bbf3b3 100644 --- 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 60647176..c97f3590 100644 --- 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 e00abc9b..f3db85c5 100644 --- 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 2d5e7a7b..8d427b54 100644 --- 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 53004cf4..43418be6 100644 --- 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 65d338d3..7d4c34da 100644 --- 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 13b75ad7..e5a7c07e 100644 --- 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 daad2dbe..779649f5 100644 --- 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 fb0b4a49..2e42e5a6 100644 --- 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 967e6931..3ce6e1f6 100644 --- 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 fb6a8ecc..7896f573 100644 --- 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 d455117c..0b71466f 100644 --- 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 33911a06..bb6e9e43 100644 --- 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 117faf21..09a18507 100644 --- 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 b15a2128..cb21bc41 100644 --- 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 468ba672..ec085bf4 100644 --- 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 463f0a48..7bdf31a5 100644 --- 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 8192dfb9..061ea94c 100644 --- 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 16fdb92e..b05e3ffa 100644 --- 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 d3d6503b..0b0fabd4 100644 --- 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 1336a3f3..d64f0db4 100644 --- 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 8dec3e85..31c2fd50 100644 --- 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 ff1c0da4..25df7d97 100644 --- 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 00b33231..215677d2 100644 --- 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 5cd39fb1..339bf3f3 100644 --- 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 dce06603..b7f7d12f 100644 --- 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 8194872b..4988d96a 100644 --- 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 c049cf76..753c5753 100644 --- 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 b5cc00bb..7e4d92bb 100644 --- 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 515a93c8..fb8dc80d 100644 --- 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 7c9b46d9..e66d2dfd 100644 --- 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 31c3eca5..f3b23cbf 100644 --- 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 afe1f2c6..4b06c8cc 100644 --- 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 05d47464..891c0ce2 100644 --- 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 e2cc4ca6..b871248c 100644 --- 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 ec9b4935..652c3665 100644 --- 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 8bf54c2b..c97caef3 100644 --- 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 4541cf55..d971782b 100644 --- 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 5f78ba60..09a305c2 100644 --- 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 0acb3ee8..037051b7 100644 --- 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 67a0c4ff..7135ff49 100644 --- 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 e28593cb..c31e1510 100644 --- 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 1fbfc9cf..a99b8dbd 100644 --- 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 623e6833..055aaf29 100644 --- 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 104a94ad..22784b7f 100644 --- 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 ebc2ab68..96fa73f1 100644 --- 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 fc90f78d..2d287e45 100644 --- 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 f93546dc..73beb61c 100644 --- 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 15db1fe6..a1c74354 100644 --- 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 9403224c..7239eb01 100644 --- 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 3420abee..2c4a8000 100644 --- 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 f154a52b..b4d943ba 100644 --- 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 04b66b51..93a0db39 100644 --- 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 2809d793..4c73c564 100644 --- 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 9934a75e..88636c18 100644 --- 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 4f13e32d..1dff3130 100644 --- 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 66e06b8c..f2e511f0 100644 --- 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 b79cd1ec..1af93d6d 100644 --- 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 43b84222..6c568858 100644 --- 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 fd9b82d3..146748d5 100644 --- 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 99f88fb5..ab0ddee5 100644 --- 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 7bba167c..419a03fe 100644 --- 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 2dc752ac..dff03142 100644 --- 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 5abe9e43..1fdb7e53 100644 --- 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 f8675089..956d59e2 100644 --- 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 ccdbc4ea..69aebd5f 100755 --- 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