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>

1 files changed, 6 insertions, 6 deletions

diff --git a/extensions/libxt_NFQUEUE.c b/extensions/libxt_NFQUEUE.c
index 6c448425..7f2aab16 100644
--- a/extensions/libxt_NFQUEUE.c
+++ b/extensions/libxt_NFQUEUE.c
@@ -142,7 +142,7 @@ static void NFQUEUE_print(const void *ip,
 {
 	const struct xt_NFQ_info *tinfo =
 		(const struct xt_NFQ_info *)target->data;
-	printf("NFQUEUE num %u", tinfo->queuenum);
+	printf(" NFQUEUE num %u", tinfo->queuenum);
 }
 
 static void NFQUEUE_print_v1(const void *ip,
@@ -153,9 +153,9 @@ static void NFQUEUE_print_v1(const void *ip,
 
 	if (last > 1) {
 		last += tinfo->queuenum - 1;
-		printf("NFQUEUE balance %u:%u", tinfo->queuenum, last);
+		printf(" NFQUEUE balance %u:%u", tinfo->queuenum, last);
 	} else {
-		printf("NFQUEUE num %u", tinfo->queuenum);
+		printf(" NFQUEUE num %u", tinfo->queuenum);
 	}
 }
 
@@ -174,7 +174,7 @@ static void NFQUEUE_save(const void *ip, const struct xt_entry_target *target)
 	const struct xt_NFQ_info *tinfo =
 		(const struct xt_NFQ_info *)target->data;
 
-	printf("--queue-num %u ", tinfo->queuenum);
+	printf(" --queue-num %u", tinfo->queuenum);
 }
 
 static void NFQUEUE_save_v1(const void *ip, const struct xt_entry_target *target)
@@ -184,9 +184,9 @@ static void NFQUEUE_save_v1(const void *ip, const struct xt_entry_target *target
 
 	if (last > 1) {
 		last += tinfo->queuenum - 1;
-		printf("--queue-balance %u:%u ", tinfo->queuenum, last);
+		printf(" --queue-balance %u:%u", tinfo->queuenum, last);
 	} else {
-		printf("--queue-num %u ", tinfo->queuenum);
+		printf(" --queue-num %u", tinfo->queuenum);
 	}
 }