lkml.org 
[lkml]   [2020]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH ghak25 v2 1/9] netfilter: normalize x_table function declarations
Date
Git context diffs were being produced with unhelpful declaration types
in the place of function names to help identify the funciton in which
changes were made.

Normalize x_table function declarations so that git context diff
function labels work as expected.

Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
---
net/netfilter/x_tables.c | 43 ++++++++++++++++++-------------------------
1 file changed, 18 insertions(+), 25 deletions(-)

diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
index ce70c2576bb2..0094853ab42a 100644
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
@@ -77,8 +77,7 @@ int xt_register_target(struct xt_target *target)
}
EXPORT_SYMBOL(xt_register_target);

-void
-xt_unregister_target(struct xt_target *target)
+void xt_unregister_target(struct xt_target *target)
{
u_int8_t af = target->family;

@@ -88,8 +87,7 @@ int xt_register_target(struct xt_target *target)
}
EXPORT_SYMBOL(xt_unregister_target);

-int
-xt_register_targets(struct xt_target *target, unsigned int n)
+int xt_register_targets(struct xt_target *target, unsigned int n)
{
unsigned int i;
int err = 0;
@@ -108,8 +106,7 @@ int xt_register_target(struct xt_target *target)
}
EXPORT_SYMBOL(xt_register_targets);

-void
-xt_unregister_targets(struct xt_target *target, unsigned int n)
+void xt_unregister_targets(struct xt_target *target, unsigned int n)
{
while (n-- > 0)
xt_unregister_target(&target[n]);
@@ -127,8 +124,7 @@ int xt_register_match(struct xt_match *match)
}
EXPORT_SYMBOL(xt_register_match);

-void
-xt_unregister_match(struct xt_match *match)
+void xt_unregister_match(struct xt_match *match)
{
u_int8_t af = match->family;

@@ -138,8 +134,7 @@ int xt_register_match(struct xt_match *match)
}
EXPORT_SYMBOL(xt_unregister_match);

-int
-xt_register_matches(struct xt_match *match, unsigned int n)
+int xt_register_matches(struct xt_match *match, unsigned int n)
{
unsigned int i;
int err = 0;
@@ -158,8 +153,7 @@ int xt_register_match(struct xt_match *match)
}
EXPORT_SYMBOL(xt_register_matches);

-void
-xt_unregister_matches(struct xt_match *match, unsigned int n)
+void xt_unregister_matches(struct xt_match *match, unsigned int n)
{
while (n-- > 0)
xt_unregister_match(&match[n]);
@@ -204,8 +198,8 @@ struct xt_match *xt_find_match(u8 af, const char *name, u8 revision)
}
EXPORT_SYMBOL(xt_find_match);

-struct xt_match *
-xt_request_find_match(uint8_t nfproto, const char *name, uint8_t revision)
+struct xt_match *xt_request_find_match(u8 nfproto, const char *name,
+ u8 revision)
{
struct xt_match *match;

@@ -391,8 +385,8 @@ int xt_find_revision(u8 af, const char *name, u8 revision, int target,
}
EXPORT_SYMBOL_GPL(xt_find_revision);

-static char *
-textify_hooks(char *buf, size_t size, unsigned int mask, uint8_t nfproto)
+static char *textify_hooks(char *buf, size_t size, unsigned int mask,
+ uint8_t nfproto)
{
static const char *const inetbr_names[] = {
"PREROUTING", "INPUT", "FORWARD",
@@ -1349,11 +1343,10 @@ struct xt_counters *xt_counters_alloc(unsigned int counters)
}
EXPORT_SYMBOL(xt_counters_alloc);

-struct xt_table_info *
-xt_replace_table(struct xt_table *table,
- unsigned int num_counters,
- struct xt_table_info *newinfo,
- int *error)
+struct xt_table_info *xt_replace_table(struct xt_table *table,
+ unsigned int num_counters,
+ struct xt_table_info *newinfo,
+ int *error)
{
struct xt_table_info *private;
unsigned int cpu;
@@ -1542,7 +1535,7 @@ enum {
};

static void *xt_mttg_seq_next(struct seq_file *seq, void *v, loff_t *ppos,
- bool is_target)
+ bool is_target)
{
static const uint8_t next_class[] = {
[MTTG_TRAV_NFP_UNSPEC] = MTTG_TRAV_NFP_SPEC,
@@ -1583,7 +1576,7 @@ static void *xt_mttg_seq_next(struct seq_file *seq, void *v, loff_t *ppos,
}

static void *xt_mttg_seq_start(struct seq_file *seq, loff_t *pos,
- bool is_target)
+ bool is_target)
{
struct nf_mttg_trav *trav = seq->private;
unsigned int j;
@@ -1692,8 +1685,8 @@ static int xt_target_seq_show(struct seq_file *seq, void *v)
* This function will create the nf_hook_ops that the x_table needs
* to hand to xt_hook_link_net().
*/
-struct nf_hook_ops *
-xt_hook_ops_alloc(const struct xt_table *table, nf_hookfn *fn)
+struct nf_hook_ops *xt_hook_ops_alloc(const struct xt_table *table,
+ nf_hookfn *fn)
{
unsigned int hook_mask = table->valid_hooks;
uint8_t i, num_hooks = hweight32(hook_mask);
--
1.8.3.1
\
 
 \ /
  Last update: 2020-01-06 19:55    [W:0.121 / U:10.856 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site