chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: reorder bonding and bridging
[elogind.git]
/
src
/
libudev
/
libudev-device.c
diff --git
a/src/libudev/libudev-device.c
b/src/libudev/libudev-device.c
index 9558ac36d2a4fb445e1c06b037ddf75dbe8d16d5..9f80f56d4206b9b5e90156fb44c80615c88900ae 100644
(file)
--- a/
src/libudev/libudev-device.c
+++ b/
src/libudev/libudev-device.c
@@
-538,6
+538,8
@@
int udev_device_read_db(struct udev_device *udev_device, const char *dbfile)
udev_dbg(udev_device->udev, "no db file to read %s: %m\n", dbfile);
return -errno;
}
udev_dbg(udev_device->udev, "no db file to read %s: %m\n", dbfile);
return -errno;
}
+
+ /* devices with a database entry are initialized */
udev_device->is_initialized = true;
while (fgets(line, sizeof(line), f)) {
udev_device->is_initialized = true;
while (fgets(line, sizeof(line), f)) {
@@
-645,7
+647,7
@@
struct udev_device *udev_device_new(struct udev *udev)
if (udev == NULL)
return NULL;
if (udev == NULL)
return NULL;
- udev_device =
calloc(1, sizeof(struct udev_device)
);
+ udev_device =
new0(struct udev_device, 1
);
if (udev_device == NULL)
return NULL;
udev_device->refcount = 1;
if (udev_device == NULL)
return NULL;
udev_device->refcount = 1;
@@
-808,7
+810,7
@@
_public_ struct udev_device *udev_device_new_from_device_id(struct udev *udev, c
sk = socket(PF_INET, SOCK_DGRAM, 0);
if (sk < 0)
return NULL;
sk = socket(PF_INET, SOCK_DGRAM, 0);
if (sk < 0)
return NULL;
- mem
set(&ifr, 0x00
, sizeof(struct ifreq));
+ mem
zero(&ifr
, sizeof(struct ifreq));
ifr.ifr_ifindex = ifindex;
if (ioctl(sk, SIOCGIFNAME, &ifr) != 0) {
close(sk);
ifr.ifr_ifindex = ifindex;
if (ioctl(sk, SIOCGIFNAME, &ifr) != 0) {
close(sk);