iptables: spaces, spaces.

netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* iptables: spaces, spaces.
@ 2011-02-16  2:18 Jan Engelhardt
  2011-02-16  2:18 ` [PATCH 1/3] ip6tables: spacing fixes for -o argument Jan Engelhardt
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Jan Engelhardt @ 2011-02-16  2:18 UTC (permalink / raw)
  To: kaber; +Cc: netfilter-devel


The following changes since commit af3d73ec867debb5e38c6c6fde66f05093714fec:

  iptables: fix segfault target option parsing (2011-02-11 01:46:45 +0100)

are available in the git repository at:
  git://dev.medozas.de/iptables master

Jan Engelhardt (3):
      ip6tables: spacing fixes for -o argument
      libxt_devgroup: option whitespace update following v1.4.10-49-g7386635
      extensions: fix indent of vtable

 extensions/libip6t_LOG.c    |   22 +++++++++++-----------
 extensions/libipt_LOG.c     |   22 +++++++++++-----------
 extensions/libipt_ecn.c     |   22 +++++++++++-----------
 extensions/libxt_devgroup.c |   14 +++++++-------
 extensions/libxt_recent.c   |   24 ++++++++++++------------
 ip6tables.c                 |    2 +-
 6 files changed, 53 insertions(+), 53 deletions(-)

The last one is for an upcoming patchset proposal of mine, so I thought
I might just include that here already.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 1/3] ip6tables: spacing fixes for -o argument
  2011-02-16  2:18 iptables: spaces, spaces Jan Engelhardt
@ 2011-02-16  2:18 ` Jan Engelhardt
  2011-02-16  2:18 ` [PATCH 2/3] libxt_devgroup: option whitespace update following v1.4.10-49-g7386635 Jan Engelhardt
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Jan Engelhardt @ 2011-02-16  2:18 UTC (permalink / raw)
  To: kaber; +Cc: netfilter-devel

For aesthetic consistency, put a space after -o.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 ip6tables.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ip6tables.c b/ip6tables.c
index 9f0b892..06f570b 100644
--- a/ip6tables.c
+++ b/ip6tables.c
@@ -962,7 +962,7 @@ print_iface(char letter, const char *iface, const unsigned char *mask,
 	if (mask[0] == 0)
 		return;
 
-	printf("%s -%c", invert ? " !" : "", letter);
+	printf("%s -%c ", invert ? " !" : "", letter);
 
 	for (i = 0; i < IFNAMSIZ; i++) {
 		if (mask[i] != 0) {
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH 2/3] libxt_devgroup: option whitespace update following v1.4.10-49-g7386635
  2011-02-16  2:18 iptables: spaces, spaces Jan Engelhardt
  2011-02-16  2:18 ` [PATCH 1/3] ip6tables: spacing fixes for -o argument Jan Engelhardt
@ 2011-02-16  2:18 ` Jan Engelhardt
  2011-02-16  2:18 ` [PATCH 3/3] extensions: fix indent of vtable Jan Engelhardt
  2011-02-16 13:23 ` iptables: spaces, spaces Patrick McHardy
  3 siblings, 0 replies; 5+ messages in thread
From: Jan Engelhardt @ 2011-02-16  2:18 UTC (permalink / raw)
  To: kaber; +Cc: netfilter-devel

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 extensions/libxt_devgroup.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/extensions/libxt_devgroup.c b/extensions/libxt_devgroup.c
index 893a2fa..2624868 100644
--- a/extensions/libxt_devgroup.c
+++ b/extensions/libxt_devgroup.c
@@ -225,14 +225,14 @@ print_devgroup(unsigned int id, unsigned int mask, int numeric)
 	const char *name = NULL;
 
 	if (mask != 0xffffffff)
-		printf("0x%x/0x%x ", id, mask);
+		printf("0x%x/0x%x", id, mask);
 	else {
 		if (numeric == 0)
 			name = devgroup_id2name(id);
 		if (name)
-			printf("%s ", name);
+			printf("%s", name);
 		else
-			printf("0x%x ", id);
+			printf("0x%x", id);
 	}
 }
 
@@ -241,15 +241,15 @@ static void devgroup_show(const char *pfx, const struct xt_devgroup_info *info,
 {
 	if (info->flags & XT_DEVGROUP_MATCH_SRC) {
 		if (info->flags & XT_DEVGROUP_INVERT_SRC)
-			printf("! ");
-		printf("%ssrc-group ", pfx);
+			printf(" !");
+		printf(" %ssrc-group ", pfx);
 		print_devgroup(info->src_group, info->src_mask, numeric);
 	}
 
 	if (info->flags & XT_DEVGROUP_MATCH_DST) {
 		if (info->flags & XT_DEVGROUP_INVERT_DST)
-			printf("! ");
-		printf("%sdst-group ", pfx);
+			printf(" !");
+		printf(" %sdst-group ", pfx);
 		print_devgroup(info->src_group, info->src_mask, numeric);
 	}
 }
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH 3/3] extensions: fix indent of vtable
  2011-02-16  2:18 iptables: spaces, spaces Jan Engelhardt
  2011-02-16  2:18 ` [PATCH 1/3] ip6tables: spacing fixes for -o argument Jan Engelhardt
  2011-02-16  2:18 ` [PATCH 2/3] libxt_devgroup: option whitespace update following v1.4.10-49-g7386635 Jan Engelhardt
@ 2011-02-16  2:18 ` Jan Engelhardt
  2011-02-16 13:23 ` iptables: spaces, spaces Patrick McHardy
  3 siblings, 0 replies; 5+ messages in thread
From: Jan Engelhardt @ 2011-02-16  2:18 UTC (permalink / raw)
  To: kaber; +Cc: netfilter-devel

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
 extensions/libip6t_LOG.c  |   22 +++++++++++-----------
 extensions/libipt_LOG.c   |   22 +++++++++++-----------
 extensions/libipt_ecn.c   |   22 +++++++++++-----------
 extensions/libxt_recent.c |   24 ++++++++++++------------
 4 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/extensions/libip6t_LOG.c b/extensions/libip6t_LOG.c
index af53705..e9c738f 100644
--- a/extensions/libip6t_LOG.c
+++ b/extensions/libip6t_LOG.c
@@ -257,17 +257,17 @@ static void LOG_save(const void *ip, const struct xt_entry_target *target)
 }
 
 static struct xtables_target log_tg6_reg = {
-    .name          = "LOG",
-    .version       = XTABLES_VERSION,
-    .family        = NFPROTO_IPV6,
-    .size          = XT_ALIGN(sizeof(struct ip6t_log_info)),
-    .userspacesize = XT_ALIGN(sizeof(struct ip6t_log_info)),
-    .help          = LOG_help,
-    .init          = LOG_init,
-    .parse         = LOG_parse,
-    .print         = LOG_print,
-    .save          = LOG_save,
-    .extra_opts    = LOG_opts,
+	.name          = "LOG",
+	.version       = XTABLES_VERSION,
+	.family        = NFPROTO_IPV6,
+	.size          = XT_ALIGN(sizeof(struct ip6t_log_info)),
+	.userspacesize = XT_ALIGN(sizeof(struct ip6t_log_info)),
+	.help          = LOG_help,
+	.init          = LOG_init,
+	.parse         = LOG_parse,
+	.print         = LOG_print,
+	.save          = LOG_save,
+	.extra_opts    = LOG_opts,
 };
 
 void _init(void)
diff --git a/extensions/libipt_LOG.c b/extensions/libipt_LOG.c
index 233bd9a..ba6af04 100644
--- a/extensions/libipt_LOG.c
+++ b/extensions/libipt_LOG.c
@@ -259,17 +259,17 @@ static void LOG_save(const void *ip, const struct xt_entry_target *target)
 }
 
 static struct xtables_target log_tg_reg = {
-    .name          = "LOG",
-    .version       = XTABLES_VERSION,
-    .family        = NFPROTO_IPV4,
-    .size          = XT_ALIGN(sizeof(struct ipt_log_info)),
-    .userspacesize = XT_ALIGN(sizeof(struct ipt_log_info)),
-    .help          = LOG_help,
-    .init          = LOG_init,
-    .parse         = LOG_parse,
-    .print         = LOG_print,
-    .save          = LOG_save,
-    .extra_opts    = LOG_opts,
+	.name          = "LOG",
+	.version       = XTABLES_VERSION,
+	.family        = NFPROTO_IPV4,
+	.size          = XT_ALIGN(sizeof(struct ipt_log_info)),
+	.userspacesize = XT_ALIGN(sizeof(struct ipt_log_info)),
+	.help          = LOG_help,
+	.init          = LOG_init,
+	.parse         = LOG_parse,
+	.print         = LOG_print,
+	.save          = LOG_save,
+	.extra_opts    = LOG_opts,
 };
 
 void _init(void)
diff --git a/extensions/libipt_ecn.c b/extensions/libipt_ecn.c
index 81d7b58..d6b521f 100644
--- a/extensions/libipt_ecn.c
+++ b/extensions/libipt_ecn.c
@@ -138,17 +138,17 @@ static void ecn_save(const void *ip, const struct xt_entry_match *match)
 }
 
 static struct xtables_match ecn_mt_reg = {
-    .name          = "ecn",
-    .version       = XTABLES_VERSION,
-    .family        = NFPROTO_IPV4,
-    .size          = XT_ALIGN(sizeof(struct ipt_ecn_info)),
-    .userspacesize = XT_ALIGN(sizeof(struct ipt_ecn_info)),
-    .help          = ecn_help,
-    .parse         = ecn_parse,
-    .final_check   = ecn_check,
-    .print         = ecn_print,
-    .save          = ecn_save,
-    .extra_opts    = ecn_opts,
+	.name          = "ecn",
+	.version       = XTABLES_VERSION,
+	.family        = NFPROTO_IPV4,
+	.size          = XT_ALIGN(sizeof(struct ipt_ecn_info)),
+	.userspacesize = XT_ALIGN(sizeof(struct ipt_ecn_info)),
+	.help          = ecn_help,
+	.parse         = ecn_parse,
+	.final_check   = ecn_check,
+	.print         = ecn_print,
+	.save          = ecn_save,
+	.extra_opts    = ecn_opts,
 };
 
 void _init(void)
diff --git a/extensions/libxt_recent.c b/extensions/libxt_recent.c
index e4a7f4d..f8a5a18 100644
--- a/extensions/libxt_recent.c
+++ b/extensions/libxt_recent.c
@@ -211,18 +211,18 @@ static void recent_save(const void *ip, const struct xt_entry_match *match)
 }
 
 static struct xtables_match recent_mt_reg = {
-    .name          = "recent",
-    .version       = XTABLES_VERSION,
-    .family        = NFPROTO_UNSPEC,
-    .size          = XT_ALIGN(sizeof(struct xt_recent_mtinfo)),
-    .userspacesize = XT_ALIGN(sizeof(struct xt_recent_mtinfo)),
-    .help          = recent_help,
-    .init          = recent_init,
-    .parse         = recent_parse,
-    .final_check   = recent_check,
-    .print         = recent_print,
-    .save          = recent_save,
-    .extra_opts    = recent_opts,
+	.name          = "recent",
+	.version       = XTABLES_VERSION,
+	.family        = NFPROTO_UNSPEC,
+	.size          = XT_ALIGN(sizeof(struct xt_recent_mtinfo)),
+	.userspacesize = XT_ALIGN(sizeof(struct xt_recent_mtinfo)),
+	.help          = recent_help,
+	.init          = recent_init,
+	.parse         = recent_parse,
+	.final_check   = recent_check,
+	.print         = recent_print,
+	.save          = recent_save,
+	.extra_opts    = recent_opts,
 };
 
 void _init(void)
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: iptables: spaces, spaces.
  2011-02-16  2:18 iptables: spaces, spaces Jan Engelhardt
                   ` (2 preceding siblings ...)
  2011-02-16  2:18 ` [PATCH 3/3] extensions: fix indent of vtable Jan Engelhardt
@ 2011-02-16 13:23 ` Patrick McHardy
  3 siblings, 0 replies; 5+ messages in thread
From: Patrick McHardy @ 2011-02-16 13:23 UTC (permalink / raw)
  To: Jan Engelhardt; +Cc: netfilter-devel

On 16.02.2011 03:18, Jan Engelhardt wrote:
> The following changes since commit af3d73ec867debb5e38c6c6fde66f05093714fec:
> 
>   iptables: fix segfault target option parsing (2011-02-11 01:46:45 +0100)
> 
> are available in the git repository at:
>   git://dev.medozas.de/iptables master
> 
> Jan Engelhardt (3):
>       ip6tables: spacing fixes for -o argument
>       libxt_devgroup: option whitespace update following v1.4.10-49-g7386635
>       extensions: fix indent of vtable

Pulled, thanks Jan.

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2011-02-16 13:23 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-16  2:18 iptables: spaces, spaces Jan Engelhardt
2011-02-16  2:18 ` [PATCH 1/3] ip6tables: spacing fixes for -o argument Jan Engelhardt
2011-02-16  2:18 ` [PATCH 2/3] libxt_devgroup: option whitespace update following v1.4.10-49-g7386635 Jan Engelhardt
2011-02-16  2:18 ` [PATCH 3/3] extensions: fix indent of vtable Jan Engelhardt
2011-02-16 13:23 ` iptables: spaces, spaces Patrick McHardy

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).