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/libxt_connmark.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/libxt_connmark.c')
| -rw-r--r-- | extensions/libxt_connmark.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/extensions/libxt_connmark.c b/extensions/libxt_connmark.c index 4cc59acd..a0e89fe7 100644 --- a/extensions/libxt_connmark.c +++ b/extensions/libxt_connmark.c @@ -109,9 +109,9 @@ connmark_parse(int c, char **argv, int invert, unsigned int *flags, static void print_mark(unsigned int mark, unsigned int mask) { if (mask != 0xffffffffU) - printf("0x%x/0x%x ", mark, mask); + printf(" 0x%x/0x%x", mark, mask); else - printf("0x%x ", mark); + printf(" 0x%x", mark); } static void connmark_mt_check(unsigned int flags) @@ -126,7 +126,7 @@ connmark_print(const void *ip, const struct xt_entry_match *match, int numeric) { const struct xt_connmark_info *info = (const void *)match->data; - printf("CONNMARK match "); + printf(" CONNMARK match "); if (info->invert) printf("!"); print_mark(info->mark, info->mask); @@ -137,7 +137,7 @@ connmark_mt_print(const void *ip, const struct xt_entry_match *match, int numeri { const struct xt_connmark_mtinfo1 *info = (const void *)match->data; - printf("connmark match "); + printf(" connmark match "); if (info->invert) printf("!"); print_mark(info->mark, info->mask); @@ -148,9 +148,9 @@ static void connmark_save(const void *ip, const struct xt_entry_match *match) const struct xt_connmark_info *info = (const void *)match->data; if (info->invert) - printf("! "); + printf(" !"); - printf("--mark "); + printf(" --mark"); print_mark(info->mark, info->mask); } @@ -160,9 +160,9 @@ connmark_mt_save(const void *ip, const struct xt_entry_match *match) const struct xt_connmark_mtinfo1 *info = (const void *)match->data; if (info->invert) - printf("! "); + printf(" !"); - printf("--mark "); + printf(" --mark"); print_mark(info->mark, info->mask); } |