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: dhcp add vendor class indentifier option 60
[elogind.git]
/
src
/
udev
/
udevadm-monitor.c
diff --git
a/src/udev/udevadm-monitor.c
b/src/udev/udevadm-monitor.c
index 6022e8db82fe8289174aeff310acbad62cb26e73..a54aa82c73fd614c2e668bea492a3fed6acbf1b7 100644
(file)
--- a/
src/udev/udevadm-monitor.c
+++ b/
src/udev/udevadm-monitor.c
@@
-48,9
+48,9
@@
static void print_device(struct udev_device *device, const char *source, int pro
struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);
struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);
- printf("%-6s[%
llu.%06u
] %-8s %s (%s)\n",
+ printf("%-6s[%
"PRI_TIME".%06ld
] %-8s %s (%s)\n",
source,
source,
-
(unsigned long long) ts.tv_sec, (unsigned int)
ts.tv_nsec/1000,
+
ts.tv_sec,
ts.tv_nsec/1000,
udev_device_get_action(device),
udev_device_get_devpath(device),
udev_device_get_subsystem(device));
udev_device_get_action(device),
udev_device_get_devpath(device),
udev_device_get_subsystem(device));
@@
-194,7
+194,7
@@
static int adm_monitor(struct udev *udev, int argc, char *argv[])
return 2;
}
return 2;
}
- mem
set(&ep_udev, 0
, sizeof(struct epoll_event));
+ mem
zero(&ep_udev
, sizeof(struct epoll_event));
ep_udev.events = EPOLLIN;
ep_udev.data.fd = fd_udev;
if (epoll_ctl(fd_ep, EPOLL_CTL_ADD, fd_udev, &ep_udev) < 0) {
ep_udev.events = EPOLLIN;
ep_udev.data.fd = fd_udev;
if (epoll_ctl(fd_ep, EPOLL_CTL_ADD, fd_udev, &ep_udev) < 0) {
@@
-228,7
+228,7
@@
static int adm_monitor(struct udev *udev, int argc, char *argv[])
return 4;
}
return 4;
}
- mem
set(&ep_kernel, 0
, sizeof(struct epoll_event));
+ mem
zero(&ep_kernel
, sizeof(struct epoll_event));
ep_kernel.events = EPOLLIN;
ep_kernel.data.fd = fd_kernel;
if (epoll_ctl(fd_ep, EPOLL_CTL_ADD, fd_kernel, &ep_kernel) < 0) {
ep_kernel.events = EPOLLIN;
ep_kernel.data.fd = fd_kernel;
if (epoll_ctl(fd_ep, EPOLL_CTL_ADD, fd_kernel, &ep_kernel) < 0) {