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, 7 insertions, 7 deletions

diff --git a/extensions/libipt_realm.c b/extensions/libipt_realm.c
index a5ec6d8c..a2505706 100644
--- a/extensions/libipt_realm.c
+++ b/extensions/libipt_realm.c
@@ -190,14 +190,14 @@ print_realm(unsigned long id, unsigned long mask, int numeric)
 	const char* name = NULL;
 
 	if (mask != 0xffffffff)
-		printf("0x%lx/0x%lx ", id, mask);
+		printf(" 0x%lx/0x%lx", id, mask);
 	else {
 		if (numeric == 0)
 			name = realm_id2name(id);
 		if (name)
-			printf("%s ", name);
+			printf(" %s", name);
 		else
-			printf("0x%lx ", id);
+			printf(" 0x%lx", id);
 	}
 }
 
@@ -207,9 +207,9 @@ static void realm_print(const void *ip, const struct xt_entry_match *match,
 	const struct ipt_realm_info *ri = (const void *)match->data;
 
 	if (ri->invert)
-		printf("! ");
+		printf(" !");
 
-	printf("realm ");
+	printf(" realm");
 	print_realm(ri->id, ri->mask, numeric);
 }
 
@@ -218,9 +218,9 @@ static void realm_save(const void *ip, const struct xt_entry_match *match)
 	const struct ipt_realm_info *ri = (const void *)match->data;
 
 	if (ri->invert)
-		printf("! ");
+		printf(" !");
 
-	printf("--realm ");
+	printf(" --realm");
 	print_realm(ri->id, ri->mask, 0);
 }