[nft PATCH v2] rule: delete extra space in rule indentation

[nft PATCH v2] rule: delete extra space in rule indentation

[Arturo Borrero Gonzalez]

Annoying extra space in rule indentation:

Example before this patch:

table ip6 test_table {
	chain test_chain {
		 counter tcp dport { 22, 80, 443} accept # handle 1
		^
	}
}

Example after this patch:

table ip6 test_table {
	chain test_chain {
		counter tcp dport { 22, 80, 443} accept # handle 1
	}
}

Signed-off-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
---
v2: include examples in patch description.

 src/rule.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/rule.c b/src/rule.c
index 8d76fd0..9403c1e 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -237,11 +237,11 @@ void rule_print(const struct rule *rule)
 	const struct stmt *stmt;
 
 	list_for_each_entry(stmt, &rule->stmts, list) {
-		printf(" ");
 		stmt->ops->print(stmt);
+		printf(" ");
 	}
 	if (handle_output > 0)
-		printf(" # handle %" PRIu64, rule->handle.handle);
+		printf("# handle %" PRIu64, rule->handle.handle);
 }
 
 struct scope *scope_init(struct scope *scope, const struct scope *parent)

Re: [nft PATCH v2] rule: delete extra space in rule indentation

[Pablo Neira Ayuso]

On Wed, Mar 18, 2015 at 11:43:24AM +0100, Arturo Borrero Gonzalez wrote:
> Annoying extra space in rule indentation:
> 
> Example before this patch:
> 
> table ip6 test_table {
> 	chain test_chain {
> 		 counter tcp dport { 22, 80, 443} accept # handle 1
> 		^
> 	}
> }
> 
> Example after this patch:
> 
> table ip6 test_table {
> 	chain test_chain {
> 		counter tcp dport { 22, 80, 443} accept # handle 1
> 	}
> }

Applied, thanks.

Re: [nft PATCH v2] rule: delete extra space in rule indentation

[Patrick McHardy]

On 18.03, Pablo Neira Ayuso wrote:
> On Wed, Mar 18, 2015 at 11:43:24AM +0100, Arturo Borrero Gonzalez wrote:
> > Annoying extra space in rule indentation:
> > 
> > Example before this patch:
> > 
> > table ip6 test_table {
> > 	chain test_chain {
> > 		 counter tcp dport { 22, 80, 443} accept # handle 1
> > 		^
> > 	}
> > }
> > 
> > Example after this patch:
> > 
> > table ip6 test_table {
> > 	chain test_chain {
> > 		counter tcp dport { 22, 80, 443} accept # handle 1
> > 	}
> > }
> 
> Applied, thanks.

We now have misaligned output, f.i.

         type filter hook output priority 0; policy accept;
        ip daddr @test counter packets 14 bytes 1176

Arturo, please check the remaining print functions and adjust them
accordingly.