colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform: cleanup event_handler_recvmsg() (code-style)

Browse Source
This commit is contained in:
Thomas Haller
2015-12-13 09:59:10 +01:00
parent 2f6b5d4125
commit 3e2d0d6968
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/platform/nm-linux-platform.c
View File

@@ -5434,24 +5434,24 @@ event_handler_recvmsgs (NMPlatform *platform)
struct ucred *creds = NULL; struct ucred *creds = NULL;
continue_reading: continue_reading:
n = nl_recv(sk, &nla, &buf, &creds); n = nl_recv (sk, &nla, &buf, &creds);
if (n <= 0) if (n <= 0)
return n; return n;
hdr = (struct nlmsghdr *) buf; hdr = (struct nlmsghdr *) buf;
while (nlmsg_ok(hdr, n)) { while (nlmsg_ok (hdr, n)) {
nlmsg_free(msg); nlmsg_free (msg);
msg = nlmsg_convert(hdr); msg = nlmsg_convert (hdr);
if (!msg) { if (!msg) {
err = -NLE_NOMEM; err = -NLE_NOMEM;
goto out; goto out;
} }
nlmsg_set_proto(msg, NETLINK_ROUTE); nlmsg_set_proto (msg, NETLINK_ROUTE);
nlmsg_set_src(msg, &nla); nlmsg_set_src (msg, &nla);
if (creds) if (creds)
nlmsg_set_creds(msg, creds); nlmsg_set_creds (msg, creds);
nrecv++; nrecv++;
@@ -5497,9 +5497,9 @@ continue_reading:
goto out; goto out;
} else if (hdr->nlmsg_type == NLMSG_ERROR) { } else if (hdr->nlmsg_type == NLMSG_ERROR) {
/* Message carries a nlmsgerr */ /* Message carries a nlmsgerr */
struct nlmsgerr *e = nlmsg_data(hdr); struct nlmsgerr *e = nlmsg_data (hdr);
if (hdr->nlmsg_len < nlmsg_size(sizeof(*e))) { if (hdr->nlmsg_len < nlmsg_size (sizeof (*e))) {
/* Truncated error message, the default action /* Truncated error message, the default action
* is to stop parsing. The user may overrule * is to stop parsing. The user may overrule
* this action by returning NL_SKIP or * this action by returning NL_SKIP or
@@ -5518,12 +5518,12 @@ continue_reading:
} }
skip: skip:
err = 0; err = 0;
hdr = nlmsg_next(hdr, &n); hdr = nlmsg_next (hdr, &n);
} }
nlmsg_free(msg); nlmsg_free (msg);
free(buf); free (buf);
free(creds); free (creds);
buf = NULL; buf = NULL;
msg = NULL; msg = NULL;
creds = NULL; creds = NULL;
@@ -5535,9 +5535,9 @@ skip:
stop: stop:
err = 0; err = 0;
out: out:
nlmsg_free(msg); nlmsg_free (msg);
free(buf); free (buf);
free(creds); free (creds);
if (interrupted) if (interrupted)
err = -NLE_DUMP_INTR; err = -NLE_DUMP_INTR;