summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2014-12-22 17:45:48 +0100
committerPatrick McHardy <kaber@trash.net>2015-01-11 08:00:34 +0000
commit1fe725530c084733ab0a58b74093c8b78741463e (patch)
tree30002b2a0ba91aa9108e49ae7f50ff7a8345be0a
parent28905e7f524cade8aac92107cc33ee33b1ce304b (diff)
netlink: style fixes
We include an empty line between variable definitions and code. Signed-off-by: Patrick McHardy <kaber@trash.net>
-rw-r--r--src/netlink.c30
1 files changed, 18 insertions, 12 deletions
diff --git a/src/netlink.c b/src/netlink.c
index ceb1d3f0..cb22c304 100644
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -48,10 +48,11 @@ const struct location netlink_location = {
static struct mnl_socket *nfsock_open(void)
{
- struct mnl_socket *s = mnl_socket_open(NETLINK_NETFILTER);
+ struct mnl_socket *s;
+
+ s = mnl_socket_open(NETLINK_NETFILTER);
if (s == NULL)
netlink_open_error();
-
return s;
}
@@ -1480,10 +1481,11 @@ struct nft_ruleset *netlink_dump_ruleset(struct netlink_ctx *ctx,
static struct nft_table *netlink_table_alloc(const struct nlmsghdr *nlh)
{
- struct nft_table *nlt = nft_table_alloc();
+ struct nft_table *nlt;
+
+ nlt = nft_table_alloc();
if (nlt == NULL)
memory_allocation_error();
-
if (nft_table_nlmsg_parse(nlh, nlt) < 0)
netlink_abi_error();
@@ -1492,10 +1494,11 @@ static struct nft_table *netlink_table_alloc(const struct nlmsghdr *nlh)
static struct nft_chain *netlink_chain_alloc(const struct nlmsghdr *nlh)
{
- struct nft_chain *nlc = nft_chain_alloc();
+ struct nft_chain *nlc;
+
+ nlc = nft_chain_alloc();
if (nlc == NULL)
memory_allocation_error();
-
if (nft_chain_nlmsg_parse(nlh, nlc) < 0)
netlink_abi_error();
@@ -1504,10 +1507,11 @@ static struct nft_chain *netlink_chain_alloc(const struct nlmsghdr *nlh)
static struct nft_set *netlink_set_alloc(const struct nlmsghdr *nlh)
{
- struct nft_set *nls = nft_set_alloc();
+ struct nft_set *nls;
+
+ nls = nft_set_alloc();
if (nls == NULL)
memory_allocation_error();
-
if (nft_set_nlmsg_parse(nlh, nls) < 0)
netlink_abi_error();
@@ -1516,10 +1520,11 @@ static struct nft_set *netlink_set_alloc(const struct nlmsghdr *nlh)
static struct nft_set *netlink_setelem_alloc(const struct nlmsghdr *nlh)
{
- struct nft_set *nls = nft_set_alloc();
+ struct nft_set *nls;
+
+ nls = nft_set_alloc();
if (nls == NULL)
memory_allocation_error();
-
if (nft_set_elems_nlmsg_parse(nlh, nls) < 0)
netlink_abi_error();
@@ -1528,10 +1533,11 @@ static struct nft_set *netlink_setelem_alloc(const struct nlmsghdr *nlh)
static struct nft_rule *netlink_rule_alloc(const struct nlmsghdr *nlh)
{
- struct nft_rule *nlr = nft_rule_alloc();
+ struct nft_rule *nlr;
+
+ nlr = nft_rule_alloc();
if (nlr == NULL)
memory_allocation_error();
-
if (nft_rule_nlmsg_parse(nlh, nlr) < 0)
netlink_abi_error();