SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libudev-monitor: use initialization

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2015-03-15 17:26:58 -04:00
parent 4b16233e59
commit 81b9fe5440
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libudev/libudev-monitor.c
+16 -17
View File
@@ -694,13 +694,20 @@ retry:
int udev_monitor_send_device(struct udev_monitor *udev_monitor,
struct udev_monitor *destination, struct udev_device *udev_device)
{
const char *buf;
ssize_t blen;
ssize_t count;
struct msghdr smsg;
struct iovec iov[2];
const char *val;
struct udev_monitor_netlink_header nlh;
const char *buf, *val;
ssize_t blen, count;
struct udev_monitor_netlink_header nlh = {
.prefix = "libudev",
.magic = htonl(UDEV_MONITOR_MAGIC),
.header_size = sizeof nlh,
};
struct iovec iov[2] = {
{ .iov_base = &nlh, .iov_len = sizeof nlh },
};
struct msghdr smsg = {
.msg_iov = iov,
.msg_iovlen = 2,
};
struct udev_list_entry *list_entry;
uint64_t tag_bloom_bits;
@@ -708,18 +715,13 @@ int udev_monitor_send_device(struct udev_monitor *udev_monitor,
if (blen < 32)
return -EINVAL;
/* add versioned header */
memzero(&nlh, sizeof(struct udev_monitor_netlink_header));
memcpy(nlh.prefix, "libudev", 8);
nlh.magic = htonl(UDEV_MONITOR_MAGIC);
nlh.header_size = sizeof(struct udev_monitor_netlink_header);
/* fill in versioned header */
val = udev_device_get_subsystem(udev_device);
nlh.filter_subsystem_hash = htonl(util_string_hash32(val));
val = udev_device_get_devtype(udev_device);
if (val != NULL)
nlh.filter_devtype_hash = htonl(util_string_hash32(val));
iov[0].iov_base = &nlh;
iov[0].iov_len = sizeof(struct udev_monitor_netlink_header);
/* add tag bloom filter */
tag_bloom_bits = 0;
@@ -736,9 +738,6 @@ int udev_monitor_send_device(struct udev_monitor *udev_monitor,
iov[1].iov_base = (char *)buf;
iov[1].iov_len = blen;
memzero(&smsg, sizeof(struct msghdr));
smsg.msg_iov = iov;
smsg.msg_iovlen = 2;
/*
* Use custom address for target, or the default one.
*