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_TOS.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_TOS.c')
| -rw-r--r-- | extensions/libxt_TOS.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/extensions/libxt_TOS.c b/extensions/libxt_TOS.c index 29bc6937..58ff2fc7 100644 --- a/extensions/libxt_TOS.c +++ b/extensions/libxt_TOS.c @@ -163,9 +163,9 @@ static void tos_tg_print_v0(const void *ip, { const struct ipt_tos_target_info *info = (const void *)target->data; - printf("TOS set "); + printf(" TOS set "); if (numeric || !tos_try_print_symbolic("", info->tos, 0xFF)) - printf("0x%02x ", info->tos); + printf("0x%02x", info->tos); } static void tos_tg_print(const void *ip, const struct xt_entry_target *target, @@ -174,21 +174,21 @@ static void tos_tg_print(const void *ip, const struct xt_entry_target *target, const struct xt_tos_target_info *info = (const void *)target->data; if (numeric) - printf("TOS set 0x%02x/0x%02x ", + printf(" TOS set 0x%02x/0x%02x", info->tos_value, info->tos_mask); - else if (tos_try_print_symbolic("TOS set ", + else if (tos_try_print_symbolic(" TOS set", info->tos_value, info->tos_mask)) /* already printed by call */ return; else if (info->tos_value == 0) - printf("TOS and 0x%02x ", + printf(" TOS and 0x%02x", (unsigned int)(uint8_t)~info->tos_mask); else if (info->tos_value == info->tos_mask) - printf("TOS or 0x%02x ", info->tos_value); + printf(" TOS or 0x%02x", info->tos_value); else if (info->tos_mask == 0) - printf("TOS xor 0x%02x ", info->tos_value); + printf(" TOS xor 0x%02x", info->tos_value); else - printf("TOS set 0x%02x/0x%02x ", + printf(" TOS set 0x%02x/0x%02x", info->tos_value, info->tos_mask); } @@ -196,14 +196,14 @@ static void tos_tg_save_v0(const void *ip, const struct xt_entry_target *target) { const struct ipt_tos_target_info *info = (const void *)target->data; - printf("--set-tos 0x%02x ", info->tos); + printf(" --set-tos 0x%02x", info->tos); } static void tos_tg_save(const void *ip, const struct xt_entry_target *target) { const struct xt_tos_target_info *info = (const void *)target->data; - printf("--set-tos 0x%02x/0x%02x ", info->tos_value, info->tos_mask); + printf(" --set-tos 0x%02x/0x%02x", info->tos_value, info->tos_mask); } static struct xtables_target tos_tg_reg[] = { |