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_connbytes.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_connbytes.c')
-rw-r--r-- | extensions/libxt_connbytes.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/extensions/libxt_connbytes.c b/extensions/libxt_connbytes.c index 7c96c321..1d3391ae 100644 --- a/extensions/libxt_connbytes.c +++ b/extensions/libxt_connbytes.c @@ -105,16 +105,16 @@ static void print_mode(const struct xt_connbytes_info *sinfo) { switch (sinfo->what) { case XT_CONNBYTES_PKTS: - fputs("packets ", stdout); + fputs(" packets", stdout); break; case XT_CONNBYTES_BYTES: - fputs("bytes ", stdout); + fputs(" bytes", stdout); break; case XT_CONNBYTES_AVGPKT: - fputs("avgpkt ", stdout); + fputs(" avgpkt", stdout); break; default: - fputs("unknown ", stdout); + fputs(" unknown", stdout); break; } } @@ -123,16 +123,16 @@ static void print_direction(const struct xt_connbytes_info *sinfo) { switch (sinfo->direction) { case XT_CONNBYTES_DIR_ORIGINAL: - fputs("original ", stdout); + fputs(" original", stdout); break; case XT_CONNBYTES_DIR_REPLY: - fputs("reply ", stdout); + fputs(" reply", stdout); break; case XT_CONNBYTES_DIR_BOTH: - fputs("both ", stdout); + fputs(" both", stdout); break; default: - fputs("unknown ", stdout); + fputs(" unknown", stdout); break; } } @@ -143,18 +143,18 @@ connbytes_print(const void *ip, const struct xt_entry_match *match, int numeric) const struct xt_connbytes_info *sinfo = (const void *)match->data; if (sinfo->count.from > sinfo->count.to) - printf("connbytes ! %llu:%llu ", + printf(" connbytes ! %llu:%llu", (unsigned long long)sinfo->count.to, (unsigned long long)sinfo->count.from); else - printf("connbytes %llu:%llu ", + printf(" connbytes %llu:%llu", (unsigned long long)sinfo->count.from, (unsigned long long)sinfo->count.to); - fputs("connbytes mode ", stdout); + fputs(" connbytes mode", stdout); print_mode(sinfo); - fputs("connbytes direction ", stdout); + fputs(" connbytes direction", stdout); print_direction(sinfo); } @@ -163,18 +163,18 @@ static void connbytes_save(const void *ip, const struct xt_entry_match *match) const struct xt_connbytes_info *sinfo = (const void *)match->data; if (sinfo->count.from > sinfo->count.to) - printf("! --connbytes %llu:%llu ", + printf(" ! --connbytes %llu:%llu", (unsigned long long)sinfo->count.to, (unsigned long long)sinfo->count.from); else - printf("--connbytes %llu:%llu ", + printf(" --connbytes %llu:%llu", (unsigned long long)sinfo->count.from, (unsigned long long)sinfo->count.to); - fputs("--connbytes-mode ", stdout); + fputs(" --connbytes-mode", stdout); print_mode(sinfo); - fputs("--connbytes-dir ", stdout); + fputs(" --connbytes-dir", stdout); print_direction(sinfo); } |