diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2010-12-18 02:04:59 +0100 |
|---|---|---|
| committer | Jan Engelhardt <jengelh@medozas.de> | 2011-01-31 03:05:34 +0100 |
| commit | 73866357e4a7a0fdc1b293bf8863fee2bd56da9e (patch) | |
| tree | 1890725e5f327ba14ccf452ff9e5916954d7908f /extensions/libipt_ECN.c | |
| parent | bb8be30857edd501e701c2f22db6c59bd6839c87 (diff) | |
iptables: do not print trailing whitespaces
Due to the use of printf("foobar "), iptables emits spaces at the
end-of-line, which looks odd to some users because it causes the
terminal to wrap even if there is seemingly nothing to print.
It may also have other points of annoyance, such as mailers
interpreting a trailing space as an indicator that the paragraph
continues when format=flowed is also on.
And git highlights trailing spaces in red, so let's avoid :)
Preexisting inconsistencies in outputting spaces in the right
spot are also addressed right away.
References: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=429579
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Diffstat (limited to 'extensions/libipt_ECN.c')
| -rw-r--r-- | extensions/libipt_ECN.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/extensions/libipt_ECN.c b/extensions/libipt_ECN.c index cad20a86..216a9963 100644 --- a/extensions/libipt_ECN.c +++ b/extensions/libipt_ECN.c @@ -108,21 +108,21 @@ static void ECN_print(const void *ip, const struct xt_entry_target *target, const struct ipt_ECN_info *einfo = (const struct ipt_ECN_info *)target->data; - printf("ECN "); + printf(" ECN"); if (einfo->operation == (IPT_ECN_OP_SET_ECE|IPT_ECN_OP_SET_CWR) && einfo->proto.tcp.ece == 0 && einfo->proto.tcp.cwr == 0) - printf("TCP remove "); + printf(" TCP remove"); else { if (einfo->operation & IPT_ECN_OP_SET_ECE) - printf("ECE=%u ", einfo->proto.tcp.ece); + printf(" ECE=%u", einfo->proto.tcp.ece); if (einfo->operation & IPT_ECN_OP_SET_CWR) - printf("CWR=%u ", einfo->proto.tcp.cwr); + printf(" CWR=%u", einfo->proto.tcp.cwr); if (einfo->operation & IPT_ECN_OP_SET_IP) - printf("ECT codepoint=%u ", einfo->ip_ect); + printf(" ECT codepoint=%u", einfo->ip_ect); } } @@ -134,17 +134,17 @@ static void ECN_save(const void *ip, const struct xt_entry_target *target) if (einfo->operation == (IPT_ECN_OP_SET_ECE|IPT_ECN_OP_SET_CWR) && einfo->proto.tcp.ece == 0 && einfo->proto.tcp.cwr == 0) - printf("--ecn-tcp-remove "); + printf(" --ecn-tcp-remove"); else { if (einfo->operation & IPT_ECN_OP_SET_ECE) - printf("--ecn-tcp-ece %d ", einfo->proto.tcp.ece); + printf(" --ecn-tcp-ece %d", einfo->proto.tcp.ece); if (einfo->operation & IPT_ECN_OP_SET_CWR) - printf("--ecn-tcp-cwr %d ", einfo->proto.tcp.cwr); + printf(" --ecn-tcp-cwr %d", einfo->proto.tcp.cwr); if (einfo->operation & IPT_ECN_OP_SET_IP) - printf("--ecn-ip-ect %d ", einfo->ip_ect); + printf(" --ecn-ip-ect %d", einfo->ip_ect); } } |