fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-04 02:30:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

platform/trivial: reorder code

Browse source
This commit is contained in:
Thomas Haller 2018-07-15 14:21:04 +02:00
parent 5fd4ca8a5b
commit e9cf8b196d
1 changed files with 36 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
src/platform/nm-netlink.c
View file

@ -259,20 +259,6 @@ nlmsg_reserve (struct nl_msg *n, size_t len, int pad)
/*****************************************************************************/
static int
get_default_page_size (void)
{
static int val = 0;
int v;
if (G_UNLIKELY (val == 0)) {
v = getpagesize ();
g_assert (v > 0);
val = v;
}
return val;
}
struct nlattr *
nla_reserve (struct nl_msg *msg, int attrtype, int attrlen)
{
@ -298,6 +284,22 @@ nla_reserve (struct nl_msg *msg, int attrtype, int attrlen)
return nla;
}
/*****************************************************************************/
static int
get_default_page_size (void)
{
static int val = 0;
int v;
if (G_UNLIKELY (val == 0)) {
v = getpagesize ();
g_assert (v > 0);
val = v;
}
return val;
}
struct nl_msg *
nlmsg_alloc_size (size_t len)
{
@ -354,6 +356,24 @@ nlmsg_alloc_simple (int nlmsgtype, int flags)
return nm;
}
void nlmsg_free (struct nl_msg *msg)
{
if (!msg)
return;
if (msg->nm_refcnt < 1)
g_return_if_reached ();
msg->nm_refcnt--;
if (msg->nm_refcnt <= 0) {
g_free (msg->nm_nlh);
g_slice_free (struct nl_msg, msg);
}
}
/*****************************************************************************/
int
nlmsg_append (struct nl_msg *n, void *data, size_t len, int pad)
{
@ -367,6 +387,8 @@ nlmsg_append (struct nl_msg *n, void *data, size_t len, int pad)
return 0;
}
/*****************************************************************************/
int
nlmsg_parse (struct nlmsghdr *nlh, int hdrlen, struct nlattr *tb[],
int maxtype, const struct nla_policy *policy)
@ -620,22 +642,6 @@ errout:
/*****************************************************************************/
void nlmsg_free (struct nl_msg *msg)
{
if (!msg)
return;
if (msg->nm_refcnt < 1)
g_return_if_reached ();
msg->nm_refcnt--;
if (msg->nm_refcnt <= 0) {
g_free (msg->nm_nlh);
g_slice_free (struct nl_msg, msg);
}
}
int
nlmsg_get_proto (struct nl_msg *msg)
{