chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
resolved: don't read DHCP leases
[elogind.git]
/
src
/
libudev
/
libudev-device.c
diff --git
a/src/libudev/libudev-device.c
b/src/libudev/libudev-device.c
index 06fadf6341913b0a112dfd14207dfe8495f3682d..3a64f24fb89f91b24725ea801710a7e2c2d138f3 100644
(file)
--- a/
src/libudev/libudev-device.c
+++ b/
src/libudev/libudev-device.c
@@
-647,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;
@@
-810,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);
@@
-1341,7
+1341,7
@@
void udev_device_set_usec_initialized(struct udev_device *udev_device, usec_t us
char num[32];
udev_device->usec_initialized = usec_initialized;
char num[32];
udev_device->usec_initialized = usec_initialized;
- snprintf(num, sizeof(num),
"%llu", (unsigned long long)
usec_initialized);
+ snprintf(num, sizeof(num),
USEC_FMT,
usec_initialized);
udev_device_add_property(udev_device, "USEC_INITIALIZED", num);
}
udev_device_add_property(udev_device, "USEC_INITIALIZED", num);
}