chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
f436aa1
)
sd-rtnl: read_message - don't set group if not needed
author
Tom Gundersen
<teg@jklm.no>
Fri, 13 Mar 2015 15:15:03 +0000
(16:15 +0100)
committer
Tom Gundersen
<teg@jklm.no>
Fri, 13 Mar 2015 15:15:03 +0000
(16:15 +0100)
src/libsystemd/sd-rtnl/rtnl-message.c
patch
|
blob
|
history
diff --git
a/src/libsystemd/sd-rtnl/rtnl-message.c
b/src/libsystemd/sd-rtnl/rtnl-message.c
index d24769b4b99905b05094d782dff6fe48bb1ed31d..5a719003ac354fc83cc968e0c5e0b0e4e65aa6b9 100644
(file)
--- a/
src/libsystemd/sd-rtnl/rtnl-message.c
+++ b/
src/libsystemd/sd-rtnl/rtnl-message.c
@@
-1474,7
+1474,7
@@
static int socket_recv_message(int fd, struct iovec *iov, uint32_t *_group, bool
return 0;
}
return 0;
}
- if (group)
+ if (
_
group)
*_group = group;
return r;
*_group = group;
return r;
@@
-1500,7
+1500,7
@@
int socket_read_message(sd_rtnl *rtnl) {
assert(rtnl->rbuffer_allocated >= sizeof(struct nlmsghdr));
/* read nothing, just get the pending message size */
assert(rtnl->rbuffer_allocated >= sizeof(struct nlmsghdr));
/* read nothing, just get the pending message size */
- r = socket_recv_message(rtnl->fd, &iov,
&group
, true);
+ r = socket_recv_message(rtnl->fd, &iov,
NULL
, true);
if (r <= 0)
return r;
else
if (r <= 0)
return r;
else